Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/gnustep-base/PKGBUILD
	community-testing/gtranslator/PKGBUILD
	community-testing/parrot/PKGBUILD
	community/chmsee/PKGBUILD
	core/lvm2/PKGBUILD
	extra/php/PKGBUILD
	extra/samba/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	staging/php/PKGBUILD
	staging/php/php-fpm.conf.in.patch
	staging/php/php.ini.patch
	testing/cairo/PKGBUILD
	testing/eog-plugins/PKGBUILD
	testing/eog/PKGBUILD
	testing/gedit/PKGBUILD
	testing/gjs/PKGBUILD
	testing/glib2/PKGBUILD
	testing/gnome-documents/PKGBUILD
	testing/gnome-shell/PKGBUILD
	testing/gobject-introspection/PKGBUILD
	testing/libpeas/PKGBUILD
	testing/mutter/PKGBUILD
	testing/openssl/PKGBUILD
	testing/pygobject/PKGBUILD
	testing/python/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/ruby/PKGBUILD
	testing/ruby/ruby.install
	testing/sushi/PKGBUILD
	testing/totem/PKGBUILD

18 files changed, 154 insertions, 61 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index a437fa806..f0ad1d7bc 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156552 2012-04-20 19:21:46Z andrea $
+# $Id: PKGBUILD 157224 2012-04-26 06:42:14Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -22,8 +22,8 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.4.0
-pkgrel=3
+pkgver=2.4.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -33,18 +33,10 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
              'libwpd' 'libwpg' 'pstoedit' 'glew'
              'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
 groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'do-not-build-hancomword.patch'
-        'fix-docx-support.patch')
-md5sums=('a45b9141c6bb750569e8f6554197dd50'
-         'cc1a5fba43426003909751035d093362'
-         'b694e3af26a31c36488d869f9331090c')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('a4da7e1181e1539850a4fcae466d7d75')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -p1 -i "${srcdir}"/do-not-build-hancomword.patch
-  patch -p1 -i "${srcdir}"/fix-docx-support.patch
-
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index 0a6eca6d7..24a1e1c99 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 154271 2012-03-25 09:27:30Z tpowa $
+# $Id: PKGBUILD 157241 2012-04-26 13:40:50Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capi4hylafax
 pkgver=010300
-pkgrel=6
+pkgrel=7
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
 arch=(i686 x86_64 'mips64el')
 url="ftp://ftp.avm.de/tools"
 license=('GPL')
 depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
 source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
-	config.faxCAPI capi4hylafax.rc)
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
-         '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07')
+	config.faxCAPI 
+	capi4hylafax.rc
+	c2faxrecv.service
+	capi4hylafax.conf)
+
 install=capi4hylafax.install
 backup=(var/spool/hylafax/etc/config.faxCAPI)
 
@@ -42,8 +43,8 @@ package() {
   chown 10 "$pkgdir"/var/spool/hylafax
   chgrp 14 "$pkgdir"/var/spool/hylafax
 # adding udev rule
-  mkdir -p "$pkgdir"/lib/udev/rules.d
-cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
+  mkdir -p "$pkgdir"/usr/lib/udev/rules.d
+cat << EOF >> "$pkgdir"/usr/lib/udev/rules.d/53-capi4hylafax.rules
 # CAPI devices
 SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
 SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
@@ -52,4 +53,12 @@ EOF
 # fix c2faxadd
   sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
   echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
+# add systemd files
+  install -D -m644 $srcdir/c2faxrecv.service $pkgdir/usr/lib/systemd/system/c2faxrecv.service
+  install -D -m644 $srcdir/capi4hylafax.conf $pkgdir/usr/lib/modules-load.d/capi4hylafax.conf
 }
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         '1fe40c58289fa3ba625ce6fe2fdb3d07'
+         'a12164b2694490bfedb0cc861692e240'
+         '7c41d4fa5c5ef7b1372813341fd0d02b')
diff --git a/extra/capi4hylafax/c2faxrecv.service b/extra/capi4hylafax/c2faxrecv.service
new file mode 100644
index 000000000..5e73e29e7
--- /dev/null
+++ b/extra/capi4hylafax/c2faxrecv.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=CAPI to fax receive
+Requires=faxq.service
+After=faxq.service
+
+[Service]
+ExecStart=/usr/bin/c2faxrecv
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/capi4hylafax/capi4hylafax.conf b/extra/capi4hylafax/capi4hylafax.conf
new file mode 100644
index 000000000..9c145eb55
--- /dev/null
+++ b/extra/capi4hylafax/capi4hylafax.conf
@@ -0,0 +1 @@
+capi
\ No newline at end of file
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index ee95019de..8ca86f3c1 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148782 2012-02-05 11:50:17Z ibiru $
+# $Id: PKGBUILD 157237 2012-04-26 13:06:28Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64' 'mips64el')
 install='hylafax.install'
@@ -18,13 +18,17 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz
         hylafax.cron.daily 
         config.local
         configure-6.0.5.patch 
-        hylafax-libtiff4.patch)
+        hylafax-libtiff4.patch
+        faxq.service
+        hfaxd.service)
 md5sums=('eb9ac942354ad708e20e4583cec6615f'
          '6602288a405324d8c8e3c5eac2bf19fd'
          '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a'
+         '60f2a7e62c256ead4e9238cb31b35b90'
          '51d9f639bb76e5e39cdc8e2ac07e208d'
-         '3d239c186f24720e945508d349b069b1')
+         '3d239c186f24720e945508d349b069b1'
+         '9c8916a753106795fc3f40268889f645'
+         'a0b5a008b7fbf1943d167e0d5eb32341')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -48,6 +52,9 @@ package () {
   	"$pkgdir"/var/spool/hylafax/bin/notify.awk
   # fix permission on /var/lock
   chmod 1777 "$pkgdir"/var/lock
+  # add systemd files
+  install -D -m644 $srcdir/hfaxd.service $pkgdir/usr/lib/systemd/system/hfaxd.service
+  install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service
 
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
diff --git a/extra/hylafax/config.local b/extra/hylafax/config.local
index 0d8e2bcd8..4ea0f3500 100644
--- a/extra/hylafax/config.local
+++ b/extra/hylafax/config.local
@@ -250,24 +250,24 @@ SYSUID="root"				# user ID for system installs
 # based on whether or not they are capable of processing scripts
 # included in the distribution (e.g AWK and SCRIPT_SH, SED).
 #
-#AWK="/bin/awk"				# pathname of suitable awk program
+AWK="/usr/bin/awk"				# pathname of suitable awk program
 #CAT="/bin/cat"				# pathname of suitable cat program
 #CHGRP="/etc/chgrp"			# pathname of suitable chgrp program
 #CHMOD="/etc/chmod"			# pathname of suitable chmod program
 #CHOWN="/etc/chown"			# pathname of suitable chown program
-#CMP="/bin/cmp"				# pathname of suitable cmp program
-#COL="/bin/col"				# pathname of suitable col program
+CMP="/usr/bin/cmp"				# pathname of suitable cmp program
+COL="/usr/bin/col"				# pathname of suitable col program
 #CP="/bin/cp"				# pathname of suitable cp program
 #ECHO="/bin/echo"			# pathname of suitable echo program
-#GREP="/bin/grep"			# pathname of suitable grep program
+GREP="/usr/bin/grep"			# pathname of suitable grep program
 #LN="/bin/ln"				# pathname of suitable ln program
 #LN_S="-s"				# option to ${LN} to create symlink
 #MAN="/usr/bin/man"			# pathname of suitable man program
 #MKDIR="/bin/mkdir"			# pathname of suitable mkdir program
-#MKFIFO="/bin/mkfifo"			# pathname of suitable mkfifo program
+MKFIFO="/usr/bin/mkfifo"			# pathname of suitable mkfifo program
 #MV="/bin/mv"				# pathname of suitable mv program
 #MV_F="-f"				# option to ${MV} to force operation
 #RMCMD="/bin/rm"			# pathname of suitable rm program
 #SED="/bin/sed"				# pathname of suitable sed program
 #SCRIPT_SH="/bin/sh"			# pathname of suitable shell
-#SORT="/bin/sort"			# pathname of suitable sort program
+SORT="/usr/bin/sort"			# pathname of suitable sort program
diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service
new file mode 100644
index 000000000..1fef20a6d
--- /dev/null
+++ b/extra/hylafax/faxq.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hyla FAX queue manager
+
+[Service]
+ExecStart=/usr/sbin/faxq
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/hylafax/hfaxd.service b/extra/hylafax/hfaxd.service
new file mode 100644
index 000000000..d5d96c34d
--- /dev/null
+++ b/extra/hylafax/hfaxd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hyla FAX client-server
+
+[Service]
+ExecStart=/usr/lib/fax/hfaxd -i hylafax
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 66ecfa5f9..29fee72cf 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156579 2012-04-21 07:48:29Z giovanni $
+# $Id: PKGBUILD 157227 2012-04-26 08:49:24Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.04.21
+pkgver=2012.04.26
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('2e06ec6343be2c8355ce9fd3289f7c87')
+md5sums=('4c7202e0611951998325b0e41ae63041')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index bade1768f..3e1eb0d52 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157026 2012-04-23 09:27:54Z ibiru $
+# $Id: PKGBUILD 157229 2012-04-26 10:12:29Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,22 +21,22 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.10
+pkgver=5.3.11
 _suhosinver=5.3.9-0.9.10
-pkgrel=5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
 makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
-             'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
+             'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'pcre_info.patch')
-md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
+        'logrotate.d.php-fpm' 'suhosin.patch')
+md5sums=('94709f6e7c920cbe26e19fa991d9975d'
          'c099b3d7eac95018ababd41ded7f3066'
          'c15d18f846be1d69144a5d0056ee6506'
          'ffc338e8ce2a990f6f2a486355bbab65'
@@ -44,7 +44,7 @@ md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
          'b01be5f816988fcee7e78225836e5e27'
          '740ec5fe2ecfd9d7febd4081c90ec65b'
          '07c4e412909ac65a44ec90e7a2c4bade'
-         '8d3806bbb19e390f9b32ccf21611d937')
+         '07ca7da608553b4cb92797e655eb94f1')
 
 build() {
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
@@ -135,12 +135,13 @@ build() {
 	PEAR_INSTALLDIR=/usr/share/pear
 	export PEAR_INSTALLDIR
 
-	cd ${srcdir}/${pkgbase}-${pkgver}
+	# fix the suhosin patch
+	patch -i ${srcdir}/suhosin.patch
 
-	patch -p1 -i ${srcdir}/pcre_info.patch
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+	patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
 
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
@@ -349,8 +350,8 @@ package_php-snmp() {
 }
 
 package_php-sqlite() {
-	depends=('php' 'sqlite3')
-	pkgdesc='sqlite3 module for PHP'
+	depends=('php' 'sqlite')
+	pkgdesc='sqlite module for PHP'
 	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
 	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
 }
diff --git a/extra/php/suhosin.patch b/extra/php/suhosin.patch
new file mode 100644
index 000000000..e5db52d40
--- /dev/null
+++ b/extra/php/suhosin.patch
@@ -0,0 +1,13 @@
+--- suhosin-patch-5.3.9-0.9.10.patch	2012-04-01 11:55:46.699676255 +0200

++++ suhosin-patch-5.3.9-0.9.10.patch	2012-04-01 11:56:19.322146479 +0200

+@@ -4515,8 +4515,8 @@

+ +#define SUHOSIN_PATCH 1

+ +EOF

+  

+-   echo $ac_n "checking for declared timezone""... $ac_c" 1>&6

+- echo "configure:19377: checking for declared timezone" >&5

++   echo "$as_me:$LINENO: checking for declared timezone" >&5

++ echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6

+ @@ -115830,7 +115833,7 @@

+         php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \

+         strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \

diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index ac97b50e3..bb764ac67 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 148898 2012-02-05 11:54:47Z ibiru $
+# $Id: PKGBUILD 157263 2012-04-26 20:32:45Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
-pkgver=1.0
-pkgrel=3
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse')
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse')
 makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu-kvm.install
@@ -35,7 +35,8 @@ build()
     cd "${srcdir}/"
     git clone git://git.seabios.org/seabios.git
     cd seabios
-    find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+    #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+    sed -i -e 's/python/python2/g' Makefile
     make clean
     make
 }
@@ -69,5 +70,5 @@ package()
       esac
     done
 }
-md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e'
+md5sums=('f23711fb9f3c70f802829b109ba9aa27'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index f91daf3fa..b064a7ab3 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156039 2012-04-11 21:03:20Z tpowa $
+# $Id: PKGBUILD 157239 2012-04-26 13:06:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,7 +8,7 @@ pkgver=3.6.4
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.4
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
@@ -17,7 +17,11 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
         swat.xinetd
         samba.pam
-        samba.conf.d)
+        samba.conf.d
+        smbd.service
+        nmbd.service
+        winbindd.service
+        smbd.conf)
 ### UNINSTALL dmapi package before building!!!
 
 build() {
@@ -144,10 +148,19 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   rm -f ${pkgdir}/usr/include/libsmbclient.h
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
+  # install systemd files
+  for i in smbd nmbd winbindd; do
+  install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service
+  done
+  install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf 
 }
 md5sums=('d8e070e2a3b12f202f347e4427469bc2'
          'dfc6f9018c556b9783c7140de183727f'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828')
+         'f2f2e348acd1ccb566e95fa8a561b828'
+         '389cc4fa3b459360feaa1b3d93274693'
+         'ea6a1251be979cb30c6098a28b270d2d'
+         '455f106ce7a4f983975b3a686eaa85e5'
+         '6956c4f9989bec8f313de7d9343b6ba1')
diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service
new file mode 100644
index 000000000..6e22ef2fb
--- /dev/null
+++ b/extra/samba/nmbd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Samba NetBIOS name server
+
+[Service]
+ExecStart=/usr/sbin/nmbd -F
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/samba/smbd.conf b/extra/samba/smbd.conf
new file mode 100644
index 000000000..b745bb85b
--- /dev/null
+++ b/extra/samba/smbd.conf
@@ -0,0 +1 @@
+D /var/run/samba 0755 root root -
diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service
new file mode 100644
index 000000000..beb9bfad7
--- /dev/null
+++ b/extra/samba/smbd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Samba SMB/CIFS server
+
+[Service]
+ExecStart=/usr/sbin/smbd -F
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service
new file mode 100644
index 000000000..509c89628
--- /dev/null
+++ b/extra/samba/winbindd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Samba Winbind daemon
+
+[Service]
+ExecStart=/usr/sbin/winbindd -F
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index 660efcecc..c1d81d333 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 149972 2012-02-11 23:31:30Z allan $
+# $Id: PKGBUILD 157248 2012-04-26 14:30:56Z pierre $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.4
-pkgrel=3
+pkgver=2.0.5
+pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swig.org/"
 license=('custom')
 depends=('zlib' 'pcre')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('ace563563a8f6f367ba82236e5bea240adea0d94')
+sha1sums=('dfe3c89da775a0f98a8d884df1c658073c8a9087')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"