Sat Aug 27 23:14:39 UTC 2011

12 files changed, 192 insertions, 91 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 812aeeaa0..b298f17e3 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $
+# $Id: PKGBUILD 136347 2011-08-26 22:11:46Z allan $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=4
+pkgrel=5
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index f1663ceb2..889033fb9 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,40 +1,43 @@
-# $Id: PKGBUILD 111081 2011-02-23 22:48:06Z paul $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 136349 2011-08-27 02:25:00Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.57
+pkgver=2.58
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('glibc' 'bash')
+depends=('glibc' 'bash' 'dbus-core')
 makedepends=('libcap>=2.16')
 backup=('etc/dnsmasq.conf')
 install=
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 
         'rc.dnsmasq')
-md5sums=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('14c5c81debb324adc261db971730f4c6'
+         'e956eee1ec24212a3254d2b168187495')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Build
-  make || return 1
+  # link against dbus
+  echo '#define HAVE_DBUS' >> src/config.h
 
-  # Install
-  install -d $pkgdir/etc/rc.d || return 1
-  make PREFIX=/usr DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -D -m755 \
-    $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1
-  install -D -m644 \
-    dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1
+  make PREFIX=/usr DESTDIR="$pkgdir" install
 
-  # Make the Required Directories for DHCP Server Default Directories
-  install -d $pkgdir/var/db || return 1
-  install -d $pkgdir/var/lib/misc || return 1
+  install -dm755 "$pkgdir"/var/{db,lib/misc}
+  install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
+  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
+  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
 }
 
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/kdeedu-marble/gpsd3.patch b/extra/kdeedu-marble/gpsd3.patch
new file mode 100644
index 000000000..e11859b0b
--- /dev/null
+++ b/extra/kdeedu-marble/gpsd3.patch
@@ -0,0 +1,42 @@
+diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig	2011-05-20 15:34:41.000000000 -0500
++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp	2011-08-24 13:38:37.050200241 -0500
+@@ -20,6 +20,9 @@ using namespace Marble;
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+     : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++      m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+       m_timer( 0 )
+ {
+     m_oldLocale = setlocale( LC_NUMERIC, NULL );
+@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    gps_data_t* data;
++#else
+     gps_data_t* data = m_gpsd.open();
++#endif
+     if ( data ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    if ( m_gpsd.waiting(0) ) {
++#else
+     if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++        gps_data_t* data = m_gpsd.read();
++#else
+         gps_data_t* data = m_gpsd.poll();
++#endif
+         if ( data && data->set & PACKET_SET ) {
+             emit gpsdInfo( *data );
+         }
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index 533c343aa..e8e5ccdb1 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 110362 2011-02-19 03:39:03Z allan $
+# $Id: PKGBUILD 136323 2011-08-26 10:46:24Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kexec-tools
 pkgver=2.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=('i686' 'x86_64')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
 source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2"
-        'kexec' 'kexec.conf.d')
+        'kexec-tools-2.0.0-purgatory-makefile.patch'
+        'kexec' 
+        'kexec.conf.d')
 depends=('gawk')
 makedepends=('zlib' 'xz')
 backup=('etc/conf.d/kexec')
 license=('GPL2')
 md5sums=('35d05fed1c97008ac34c5bfb929295eb'
-         '15599234f174ddc4d2611f32effec6ab'
-         'b9ddfb9fbcc7e4e7e7294fe94fa60aeb')
+         'b96f47c29757fcadfbc50ea6ea22f839'
+         'be059a103e5989519d22fca99f860a64'
+         '9ca7e31d2c5c66c436a9a2baf20ad9b2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   export LDFLAGS+=" -static"
+  patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/kexec-tools/kexec b/extra/kexec-tools/kexec
index bef5b5ef3..c2e9a78a8 100755
--- a/extra/kexec-tools/kexec
+++ b/extra/kexec-tools/kexec
@@ -7,19 +7,19 @@
 
 case "$1" in
   start)
-      stat_busy "Enabled loading kernel for Kexec into running kernel on reboot"
+      stat_busy "Enabling kexec on reboot"
       add_daemon kexec
       stat_done
   ;;
   
   stop|load)
     if [ "$RUNLEVEL" = "6" -o "$1" = "load" ]; then
-      stat_busy "Loading kernel for Kexec into running kernel"
+      stat_busy "Loading kexec kernel"
       [ -f "$KPATH" ] || stat_fail
       [ -f "$INITRD" ] && _INITRD="--initrd=$INITRD"
       /sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1
     else
-      stat_busy "Skipping loading kernel for Kexec into running kernel"
+      stat_busy "Disabling kexec on reboot"
     fi
     if [ $? -eq 0 ] ; then
       rm_daemon kexec
@@ -30,7 +30,7 @@ case "$1" in
   ;;
 
   unload)
-    stat_busy "Unloading Kexec kernel from running kernel"
+    stat_busy "Unloading kexec kernel"
     /sbin/kexec -u
     if [ $? -eq 0 ] ; then
       stat_done
diff --git a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
new file mode 100644
index 000000000..0c029c8f4
--- /dev/null
+++ b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
@@ -0,0 +1,20 @@
+diff -up kexec-tools-2.0.0/purgatory/Makefile.orig kexec-tools-2.0.0/purgatory/Makefile
+--- kexec-tools-2.0.0/purgatory/Makefile.orig	2011-03-10 11:39:22.100799291 -0500
++++ kexec-tools-2.0.0/purgatory/Makefile	2011-03-10 11:39:36.422736886 -0500
+@@ -55,14 +55,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO
+ 			-I$(srcdir)/util_lib/include \
+ 			-I$(shell $(CC) -print-file-name=include)
+ $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
+-			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
++			-nostartfiles -nostdlib -nodefaultlibs \
+ 			-e purgatory_start -r
+ 
+ $(PURGATORY): $(PURGATORY_OBJS)
+ 	$(MKDIR) -p $(@D)
+ 	$(CC) $(LDFLAGS) -o $@ $^
+ 
+-#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
++#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
+ 
+ echo::
+ 	@echo "PURGATORY_SRCS $(PURGATORY_SRCS)"
diff --git a/extra/kexec-tools/kexec.conf.d b/extra/kexec-tools/kexec.conf.d
index 17b10d228..991a7a27d 100644
--- a/extra/kexec-tools/kexec.conf.d
+++ b/extra/kexec-tools/kexec.conf.d
@@ -3,7 +3,7 @@
 #
 
 # Path to kernel, default to stock arch kernel
-KPATH="/boot/vmlinuz26"
+KPATH="/boot/vmlinuz-linux"
 
 # Root partition
 # The default attempts to autodetect
@@ -13,4 +13,4 @@ ROOTPART="$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' /etc/fstab)"
 KPARAM="ro"
 
 # Path to initrd image, default to stock arch kernel
-INITRD="/boot/kernel26.img"
+INITRD="/boot/initramfs-linux.img"
diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD
index 71baf5bdc..6aecd3c33 100644
--- a/extra/pinentry/PKGBUILD
+++ b/extra/pinentry/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $
+# $Id: PKGBUILD 136330 2011-08-26 13:04:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pinentry
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnupg.org/aegypten2"
 depends=('ncurses' 'libcap>=2.16')
-makedepends=('gtk' 'qt3' 'gtk2' 'qt')
-optdepends=('gtk: for gtk backend'
-            'gtk2: for gtk2 backend'
-            'qt3: for qt3 backend'
+makedepends=('gtk2' 'qt')
+optdepends=('gtk2: for gtk2 backend'
             'qt: for qt4 backend')  
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
         gtk2-pinentry-segfault.patch)
@@ -19,22 +17,21 @@ install=pinentry.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
   for file in qt4/*.moc; do
        /usr/bin/moc ${file/.moc/.h} > ${file}
    done
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
-	--enable-pinentry-gtk \
+        --disable-pinentry-gtk \
+        --disable-pinentry-qt \
 	--enable-pinentry-gtk2 \
-        --enable-pinentry-qt \
         --enable-pinentry-qt4 \
 	--enable-fallback-curses
   make 
   make DESTDIR=${pkgdir} install 
-  rm ${pkgdir}/usr/share/info/dir 
-  rm ${pkgdir}/usr/bin/pinentry 
-  ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
+  #rm ${pkgdir}/usr/share/info/dir 
+  #rm ${pkgdir}/usr/bin/pinentry 
+  #ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
 }
 md5sums=('81f99904daee5331eb6738408bb024b6'
          'bd9888fafc56464b2c4deaad5b8edb07')
diff --git a/extra/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD
index 38ad5c1fc..7d4cb1baa 100644
--- a/extra/progsreiserfs/PKGBUILD
+++ b/extra/progsreiserfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 107514 2011-01-26 12:57:49Z tpowa $
+# $Id: PKGBUILD 136335 2011-08-26 15:07:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=progsreiserfs
 pkgver=0.3.0.5
-pkgrel=6
+pkgrel=7
 pkgdesc="library for accessing and manipulating reiserfs partitions"
 arch=(i686 x86_64)
 url="http://www.namesys.com"
@@ -12,11 +12,13 @@ depends=('e2fsprogs')
 options=('!libtool')
 source=(#ftp://ftp.namesys.com/pub/libreiserfs/${pkgname}-${pkgver}.tar.gz
 	ftp://ftp.archlinux.org/other/progsreiserfs/${pkgname}-${pkgver}.tar.gz
+        fix-underquoted-definition.patch
 	)
 md5sums=('d822579bbd4a29a1be5e4490869d9bee')
 
 build()        {
         cd ${srcdir}/${pkgname}-${pkgver}
+        patch -Np0 -i ../fix-underquoted-definition.patch
         ./configure --prefix=/usr --mandir=/usr/share/man 
         make
 }
@@ -28,3 +30,5 @@ package() {
         rm -r ${pkgdir}/usr/sbin
 	rm -r ${pkgdir}/usr/share/man/
 }
+md5sums=('d822579bbd4a29a1be5e4490869d9bee'
+         '4c47c1f136d01f60cb73f84116edbcc2')
diff --git a/extra/progsreiserfs/fix-underquoted-definition.patch b/extra/progsreiserfs/fix-underquoted-definition.patch
new file mode 100644
index 000000000..7d8eb7c0c
--- /dev/null
+++ b/extra/progsreiserfs/fix-underquoted-definition.patch
@@ -0,0 +1,11 @@
+--- progsreiserfs.m4~	2011-08-26 17:02:36.263433559 +0200
++++ progsreiserfs.m4	2011-08-26 17:02:36.263433559 +0200
+@@ -10,7 +10,7 @@
+ dnl Adds the required libraries to $REISERFS_LIBS and does an
+ dnl AC_SUBST(REISERFS_LIBS)
+ 
+-AC_DEFUN(AC_CHECK_LIBREISERFS,
++AC_DEFUN([AC_CHECK_LIBREISERFS],
+ [
+ 
+ dnl save LIBS
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 15c90887a..26af8f5e3 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135597 2011-08-16 14:39:28Z tpowa $
+# $Id: PKGBUILD 136328 2011-08-26 12:41:22Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,11 +8,12 @@ pkgver=3.6.0
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=1
+pkgrel=4
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'python2')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
@@ -24,27 +25,36 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
 
 build() {
   cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
+  sed -i "s/env python/env python2/g" ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  # everything needs to be specified :/
+  ../buildtools/bin/waf configure --prefix=/usr \
+              --with-privatedir=/etc/samba/private \
               --libdir=/usr/lib/ \
+              --with-modulesdir=/usr/lib/samba \
+              --with-swatdir=/usr/share/samba/swat \
               --localstatedir=/var \
               --with-configdir=/etc/samba \
               --with-lockdir=/var/cache/samba \
+              --with-cachedir=/var/cache/samba \
+              --with-statedir=/var/cache/samba \
               --with-piddir=/var/run/samba \
-              --with-fhs \
+              --with-logfilebase=/var/log/samba \
+              --sysconfdir=/etc \
               --with-pam \
               --with-pam_smbpass \
               --with-pammodulesdir=/lib/security \
               --with-ads \
               --with-acl-support \
-              --with-cifsmount \
-              --with-libsmbclient \
               --with-syslog \
-              --enable-external-libtalloc \
-              --disable-dnssd \
               --disable-avahi \
-              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
-              --enable-external-libtdb
-  make
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+              --disable-rpath \
+              --disable-rpath-private-install \
+              --disable-rpath-install
+  #fix the shitty build system!
+   sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' bin/default/source3/include/config.h
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
 }
 
 package_smbclient () {
@@ -53,9 +63,23 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  for i in libnetapi* libwbclient* libsmbclient*;do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libwinbind-client.so; do
+    install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i
   done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+    install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+    ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+    install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+    ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
+    ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
+  done
+  install -m644 -D bin/shared/private/libtevent.so.0 ${pkgdir}/usr/lib/libtevent.so.0.9.11
+  ln -sf /usr/lib/libtevent.so.0.9.11  ${pkgdir}/usr/lib/libtevent.so.0
   install -m755 script/smbtar ${pkgdir}/usr/bin/
   mkdir -p ${pkgdir}/usr/lib/cups/backend
   ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
@@ -77,37 +101,37 @@ backup=(etc/logrotate.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+optdepends=('python2: for python bindings')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install
+  ../buildtools/bin/waf install --destdir=${pkgdir}
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
-  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
-  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
-  install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
+  install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
+  install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba
   mkdir -p ${pkgdir}/etc/samba
   cat ../examples/smb.conf.default | \
     sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
-  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
-  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
-  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
+  install -D -m644 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+  install -D -m644 ${startdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat
+  install -D -m644 ${startdir}/samba.pam ${pkgdir}/etc/pam.d/samba
   # spool directory
   install -d -m1777 ${pkgdir}/var/spool/samba
   sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
   # fix logrotate
   sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
-  # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
   # remove conflict files of smbclient
   for man in libsmbclient smbspool \
       mount.cifs net cifs.upcall; do
       rm -f ${pkgdir}/usr/share/man/man8/${man}.8
   done
-  for i in libnetapi* libwbclient* libsmbclient*;do
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0 libwinbind-client.so; do
+      rm -f ${pkgdir}/usr/lib/samba/$i
+  done
+  mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
+  for i in libndr-krb5pac.* libsmbconf.*  libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do
       rm -f ${pkgdir}/usr/lib/$i
   done
   for bin in net \
@@ -115,6 +139,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
       smbcquotas smbget smbspool smbtar smbtree; do
       rm -f ${pkgdir}/usr/bin/$bin
   done
+  rm -r ${pkgdir}/usr/lib/libsmb
   rm -f ${pkgdir}/usr/sbin/cifs.upcall
   rm -f ${pkgdir}/usr/include/netapi.h
   for man in rpcclient smbcacls smbclient smbcquotas \
@@ -129,10 +154,10 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05'
-         'a3da19515a234c703876cf850c44e996'
-         '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828'
-         'c6a38a8c8fa24979e6217aed533358ea')
+md5sums=(e297e0ea7923c7de8d7c1d8fd0ec0a05
+         a3da19515a234c703876cf850c44e996
+         5697da77590ec092cc8a883bae06093c
+         a4bbfa39fee95bba2e7ad6b535fae7e6
+         96f82c38f3f540b53f3e5144900acf17
+         f2f2e348acd1ccb566e95fa8a561b828
+         c6a38a8c8fa24979e6217aed533358ea)
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 2175233cf..68017ee1a 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 133589 2011-07-29 19:10:42Z giovanni $
+# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
-pkgver=1.0.3
-pkgrel=6
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
+depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        01-mkfs-tempdir.patch)
-sha256sums=('d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
   #fix location for bash_completion helper
@@ -30,6 +27,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/var/run"
 }