Mon Aug 29 23:14:40 UTC 2011

7 files changed, 67 insertions, 117 deletions

diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index 9d233d726..b263ff58b 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 125144 2011-05-25 19:01:27Z foutrelis $
+# $Id: PKGBUILD 136389 2011-08-28 17:30:33Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
-pkgver=3.7.9
-pkgrel=4
+pkgver=3.7.10
+pkgrel=1
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
 arch=('i686' 'x86_64')
-depends=('claws-mail>=3.7.8')
+depends=('claws-mail>=3.7.10')
 makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
              'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13'
-             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra')
+             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
 optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
             'perl: for perl plugin'
             'libnotify: for notification plugin'
@@ -24,17 +24,16 @@ optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
             'libytnef: for tnef_parse plugin'
             'libwebkit: for the fancy webkit html plugin'
             'libsoup-gnome: for the fancy webkit html plugin'
-            'python2: for python plugin')
+            'python2: for python plugin'
+	    'libgdata: for gdata plugin')
 conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
            'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
            'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
            'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
 options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
-        claws-mail-notification-0.26-libnotify-0.7.patch)
-md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
-         'a02be84594ebd28b18811ccc358509be')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
+md5sums=('fe782b2d4762c9727e22c1bb7979f7d6')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
@@ -46,9 +45,6 @@ build() {
     [[ $dir != geolocation_plugin-* ]] && (
       cd $dir
 
-      [[ $dir == notification_plugin-* ]] &&
-        patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
-
       ./configure --prefix=/usr --disable-static
       make
     )
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 2138dbbb9..2b68bab55 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135774 2011-08-18 15:03:56Z andyrtr $
+# $Id: PKGBUILD 136387 2011-08-28 17:30:31Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
-pkgver=3.7.9
-pkgrel=5
+pkgver=3.7.10
+pkgrel=1
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -14,21 +14,17 @@ makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
 optdepends=('python2:           needed for some tools'
             'perl:              needed for some tools'
             'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering'
-            'html2ps:		AUR pkg - adds support for printing html mails together with html plugins')
+            'bogofilter:        adds support for spamfiltering')
 replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
-        claws-notify-crash.patch)
-md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3'
-         '9a2903449f679344b5f5f51c91825b45')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fcf58dcff52f0908ff3bc368d820408b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np0 -i $srcdir/claws-notify-crash.patch
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
 
   ./configure --prefix=/usr --disable-static \
diff --git a/extra/claws-mail/claws-mail.install b/extra/claws-mail/claws-mail.install
index 648480c3b..a6ae1eae6 100644
--- a/extra/claws-mail/claws-mail.install
+++ b/extra/claws-mail/claws-mail.install
@@ -1,13 +1,16 @@
 post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_remove() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index a8f50513e..972663291 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 136033 2011-08-21 23:13:31Z andrea $
+# $Id: PKGBUILD 136393 2011-08-28 23:22:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: Giacomo Rizzo <alt@free-os.it>
 
 pkgname=gpsd
-pkgver=3.0
-pkgrel=3
+pkgver=3.1
+pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://gpsd.berlios.de"
@@ -20,7 +20,7 @@ options=('!libtool' '!buildflags')
 install="${pkgname}.install"
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'gpsd' 'gpsd.conf.d')
-md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
+md5sums=('f280b914c19da3a91aa5e67d83d35033'
          '1f3402f8e33a7032b9ae6dfd077234f7'
          '3e963df3f9f7ef3572ecc648ae829315')
 
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 0398930ec..9e26b0c80 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=git20110824
-_commit=c5f1957540effcc5ffa840970aec7f8906c1548d
+pkgver=git20110828
+_commit=d248768561b8d11e76482fb0f685d7b78dd8c140
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('1fece6742fbeceffaabdc6c9bbdc9e36')
+md5sums=('9cc7ab53a3c48209869d6e5ca8dbe6df')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index 571001868..d82b64caf 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123347 2011-05-10 13:55:24Z ibiru $
+# $Id: PKGBUILD 136391 2011-08-28 17:53:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libnotify
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="Desktop notification library"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('LGPL')
 depends=('gdk-pixbuf2')
 makedepends=('gtk3' 'gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e3c58345112672c2cbb05a67512ff6c7028892df7a34746e2162fe76d9877019')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 8e51af587..cb9c48fb8 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136362 2011-08-27 15:46:49Z tpowa $
+# $Id: PKGBUILD 136372 2011-08-28 07:39:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,12 +8,11 @@ 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=6
+pkgrel=7
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
-'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'python2')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
@@ -25,37 +24,27 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
 
 build() {
   cd ${srcdir}/${pkgbase}-${_realver}/source3
-  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 \
+  ./configure --prefix=/usr \
               --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-logfilebase=/var/log/samba \
-              --sysconfdir=/etc \
-              --with-dnsupdate \
+              --with-fhs \
               --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,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} 
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
+              --enable-external-libtdb
+  make
 }
 
 package_smbclient () {
@@ -64,23 +53,9 @@ 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 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
+  for i in libnetapi* libwbclient* libsmbclient*;do
+      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
   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/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
-  ln -sf /usr/lib/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
@@ -102,56 +77,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' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
-optdepends=('python2: for python bindings')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
-  ../buildtools/bin/waf install --destdir=${pkgdir}
-  # fix permission on include files
-  chmod 644 ${pkgdir}/usr/include/*.h
-  # remove wrong var directory
-  rm -rf ${pkgdir}/usr/var
-  # create missing directories
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
-  mkdir -p ${pkgdir}/var/{lib,cache}/samba
-  mkdir -p ${pkgdir}/var/nmbd
-  mkdir -p ${pkgdir}/lib/security
+  make DESTDIR=${pkgdir} install
+  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
   mkdir -p ${pkgdir}/etc/samba
-  # install config files
-  install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
-  install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/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 ${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
+  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
   # 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
-  # run various install scripts
-  script/./installman.sh ${pkgdir}/usr/share/man . C
-  script/./installmo.sh ${pkgdir}/usr/share locale .
-  script/./installdat.sh ${pkgdir}/usr/lib samba .
-  chmod 755 script/./installmsg.sh
-  script/./installmsg.sh ${pkgdir}/usr/lib samba .
-  script/./installswat.sh ${pkgdir}/usr/share/samba swat .
+  # 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 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
-  # move libs to correct place
-  mv ${pkgdir}/usr/lib/pam*.so ${pkgdir}/lib/security
-  mv ${pkgdir}/usr/lib/libnss* ${pkgdir}/lib/
-  ln -sf /lib/libnss_wins.so.2 ${pkgdir}/lib/libnss_wins.so
-  ln -sf /lib/libnss_winbind.so.2 ${pkgdir}/lib/libnss_winbind.so
-  mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
-  for i in libndr-krb5pac.* libsmbconf.*  libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do
+  for i in libnetapi* libwbclient* libsmbclient*;do
       rm -f ${pkgdir}/usr/lib/$i
   done
   for bin in net \
@@ -159,7 +115,6 @@ optdepends=('python2: for python bindings')
       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 \
@@ -174,10 +129,10 @@ optdepends=('python2: for python bindings')
   # 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')