Fri Jul 22 23:13:01 UTC 2011

23 files changed, 547 insertions, 116 deletions

diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
index 8bc5854a3..c5ffb4711 100644
--- a/extra/archboot/PKGBUILD
+++ b/extra/archboot/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 130388 2011-07-06 10:05:42Z tpowa $
+# $Id: PKGBUILD 132074 2011-07-19 20:24:15Z eric $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=archboot
 pkgver=2011.06
-pkgrel=1
+pkgrel=2
+_sourcerel=1
 pkgdesc="Advanced, modular arch boot/install image creation utility"
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
 url="http://www.archlinux.org/"
-depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1')
+license=('GPL')
+depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1')
 optdepends=('grub2-bios: for grub2 support'
             'grub2-efi-i386: for grub2 support'
             'grub2-efi-x86_64: for grub2 support'
             'efibootmgr: for grub2 support'
 )
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
 backup=('etc/archboot/allinone.conf'
         'etc/archboot/allinone-lts.conf'
         'etc/archboot/default.conf'
@@ -31,18 +31,22 @@ backup=('etc/archboot/allinone.conf'
         'etc/archboot/presets/pxelinux-ftp'
 )
 install=archboot.install
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$_sourcerel.tar.bz2 vmware-detect.c)
+md5sums=('eac77ae13bf2e6b5a92317b9885c69dd'
+         '7e2b03463747cb22ab388e79a09fa0cb')
 
 ### to bump the depends list use this:
 #for i in $(grep ^depends= PKGBUILD | sed  -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done
 
-build()
+build() 
 {
-  cd $srcdir/$pkgname-$pkgver-$pkgrel
-  mv * $pkgdir/
-  # vmware-detect
-  cd $startdir/src
+  cd "$srcdir"
   gcc -o vmware-detect vmware-detect.c
-  install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
 }
-md5sums=('eac77ae13bf2e6b5a92317b9885c69dd'
-         '7e2b03463747cb22ab388e79a09fa0cb')
+
+package() 
+{
+  cd "$srcdir/$pkgname-$pkgver-$_sourcerel"
+  mv * "$pkgdir/"
+  install -D -m 755 "$srcdir/vmware-detect" "$pkgdir/usr/bin/vmware-detect"
+}
diff --git a/extra/esound/PKGBUILD b/extra/esound/PKGBUILD
index 70c636201..b6d035b22 100644
--- a/extra/esound/PKGBUILD
+++ b/extra/esound/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 19660 2008-11-28 20:33:47Z jgc $
+# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=esound
 pkgver=0.2.41
-pkgrel=1
+pkgrel=2
 pkgdesc="Enlightened Sound Daemon"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('audiofile' 'tcp_wrappers' 'alsa-lib>=1.0.18')
+depends=('audiofile' 'alsa-lib>=1.0.18')
 url="http://www.tux.org/~ricdude/EsounD.html"
 provides=("esd=${pkgver}")
 replaces=('esd')
@@ -22,13 +22,17 @@ md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" || return 1
+  patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-              --with-audiofile --with-libwrap \
-	      --enable-alsa --disable-artstest || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --with-audiofile --without-libwrap \
+              --enable-alsa --disable-artstest
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" || return 1
+  install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd"
 }
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 3d0399d93..d0398bd9d 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130871 2011-07-08 15:15:27Z ibiru $
+# $Id: PKGBUILD 132112 2011-07-20 12:08:11Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-disk-utility
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="GNOME libraries and applications for dealing with storage devices"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,17 +12,14 @@ depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicol
 makedepends=('gtk-doc' 'intltool')
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-freeze.patch
-        add-support-for-DeviceAutomountHint.patch)
-sha256sums=('94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb'
-            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526'
-            '1e2f8d2d8ea121d21ff2b2a1e208c0fd4af603a4ed0d024ad326a991ebc7a613')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+       fix-freeze.patch)
+sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
+            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix-freeze.patch"
-  patch -Np1 -i "${srcdir}/add-support-for-DeviceAutomountHint.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-disk-utility \
       --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 1e814b88a..6f4fe2870 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 128504 2011-06-24 07:05:04Z andyrtr $
+# $Id: PKGBUILD 130900 2011-07-08 17:01:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
 pkgver=2.12.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
 md5sums=(4b48aa3119f549d30d550bf4162c721b'')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # Nettle is the default crypto back end. Use --with-libgcrypt to use the libgcrypt back end.
-  # we stay with libgcrypt for now. nettle would need to be moved from AUR to extra.
   ./configure --prefix=/usr \
 	--with-zlib \
-	--with-libgcrypt \
 	--disable-static \
 	--disable-guile
   make
@@ -29,7 +26,7 @@ build() {
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   #make check # passes all  || /bin/true
-  make check || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html
+  make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html
 }
 
 package() {
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 95dbb9933..05bfa4ef9 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $
+# $Id: PKGBUILD 132127 2011-07-20 16:03:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'xulrunner')
 source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('a7d70cb446c38213e554d4bdfb926f63')
+md5sums=('16017dc91f7216e0631b759db1eebecb')
 
 build() {
   _javaver=6
diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index 5d518186f..71d3ac492 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 131990 2011-07-18 19:11:01Z ibiru $
+# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=js
 pkgver=1.8.5
-pkgrel=2
+pkgrel=3
 pkgdesc="JavaScript interpreter and libraries"
 arch=(i686 x86_64)
 url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
@@ -20,8 +20,6 @@ build() {
 
   patch -Np0 -i $srcdir/js185-destdir.patch
 
-  export CXXFLAGS="$CXXFLAGS -DJS_C_STRINGS_ARE_UTF8"
-
   ./configure --prefix=/usr --with-system-nspr \
      --enable-threadsafe
 
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index 074e59069..a9f065c4e 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123211 2011-05-09 10:15:03Z jgc $
+# $Id: PKGBUILD 132150 2011-07-21 11:38:25Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.14.2
-pkgrel=2
+pkgrel=3
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD
index b639ea6e0..faa1c8340 100644
--- a/extra/libmpdclient/PKGBUILD
+++ b/extra/libmpdclient/PKGBUILD
@@ -1,25 +1,29 @@
 # $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libmpdclient
-pkgver=2.4
+pkgver=2.5
 pkgrel=1
-pkgdesc='An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages'
+pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages'
 arch=('i686' 'x86_64')
 url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
-license=('GPL2')
-depends=('glibc')
+license=('custom')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fe240e56eb5cae082ea4894a810c1fdadc3d03a1')
+source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr
+	./configure --prefix=/usr --disable-static
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+	
+	cd "${pkgdir}"
+	install -d usr/share/licenses/libmpdclient
+	ln -s ../../doc/libmpdclient/COPYING usr/share/licenses/libmpdclient/COPYING
 }
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 2d61cac2e..54248034e 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130378 2011-07-06 07:48:11Z andrea $
+# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -6,11 +6,11 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.14
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
-makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib')
+makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
@@ -31,7 +31,6 @@ build() {
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMANUFACTURER="Arch Linux" \
     -DSYSCONFDIR=/etc/mysql \
     -DMYSQL_DATADIR=/var/lib/mysql \
     -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
@@ -51,7 +50,7 @@ build() {
     -DWITH_READLINE=ON \
     -DWITH_ZLIB=system \
     -DWITH_SSL=system \
-    -DWITH_LIBWRAP=ON \
+    -DWITH_LIBWRAP=OFF \
     -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
     -DWITH_EXTRA_CHARSETS=complex \
     -DWITH_EMBEDDED_SERVER=ON \
@@ -67,7 +66,7 @@ build() {
 
 package_libmysqlclient(){
   pkgdesc="MySQL client libraries"
-  depends=('openssl' 'gcc-libs' 'tcp_wrappers')
+  depends=('openssl')
   
   cd "${srcdir}"/build
   for dir in include libmysql libmysqld libservices; do
@@ -105,6 +104,7 @@ package_mysql(){
   install=mysql.install
   depends=('mysql-clients' 'net-tools')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
+  options=('emptydirs')
 
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 42faa88a3..a1f72cb01 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,34 +1,39 @@
-# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $
+# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64')
 url="http://www.net-snmp.org/"
 license=('custom')
-depends=('openssl' 'tcp_wrappers' 'libnl')
+depends=('openssl' 'libnl')
 makedepends=('setuptools')
 optdepends=('perl-term-readkey: for snmpcheck application' 
             'perl-tk: for snmpcheck and tkmib applications'
-	    'python2: for the python modules')
+            'python2: for the python modules')
 provides=('ucd-snmp')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	'snmpd.rc')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'snmpd.rc')
 md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
          '9f0d13676ba1fae1eb7eb178edd85b43')
-sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility --enable-ipv6 --with-libwrap --with-python-modules \
-    --with-default-snmp-version="3" --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" --with-logfile="/var/log/snmpd.log" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --enable-ucd-snmp-compatibility \
+    --enable-ipv6 \
+    --with-python-modules \
+    --with-default-snmp-version="3" \
+    --with-sys-contact="root@localhost" \
+    --with-sys-location="Unknown" \
+    --with-logfile="/var/log/snmpd.log" \
     --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
     --with-persistent-directory="/var/net-snmp" \
     PYTHONPROG=/usr/bin/python2
@@ -39,5 +44,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
   install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
new file mode 100644
index 000000000..085e98f5d
--- /dev/null
+++ b/extra/nettle/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 130897 2011-07-08 16:53:06Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: bender02 at gmx dot com
+
+pkgname=nettle
+pkgver=2.1
+pkgrel=1
+pkgdesc="A low-level cryptographic library"
+arch=('i686' 'x86_64')
+url="http://www.lysator.liu.se/~nisse/nettle/"
+license=('GPL2')
+install=$pkgname.install
+depends=('gmp')
+source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
+md5sums=('2bfaf16234a5d8deb96cd23f53a682bb')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libdir=/usr/lib \
+	--enable-shared \
+	--disable-static # <-- seems not working now
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+  
+  # remove static libs
+  rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a
+}
diff --git a/extra/nettle/nettle.install b/extra/nettle/nettle.install
new file mode 100644
index 000000000..3d19b5f19
--- /dev/null
+++ b/extra/nettle/nettle.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(nettle.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 6b490bb32..32ce42ce0 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126852 2011-06-08 05:53:21Z andyrtr $
+# $Id: PKGBUILD 132227 2011-07-21 17:20:32Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 #_date=20100715
 _javaver=6
-_icedteaver=1.10.2
+_icedteaver=1.10.3
 _openjdk_version=b22
 _openjdk_date=28_feb_2011
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -32,7 +32,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
 	openjdk6.profile
 	openjdk6.profile.csh)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('83041b2d0de66cb5289813cc6f05af11'
+md5sums=('0a1301785e9826d7c87ed7e8b10a6985'
          '2d2bbbb0f9b81f1fec41ec730da8a933'
          'ef7a8b3624ea904bf584bc46d79b5e75'
          '91adfd41e6f001add4f92ae31216b1e3'
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index cf88fa2f0..79bb209a4 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -1,25 +1,40 @@
-# $Id: PKGBUILD 122880 2011-05-07 02:23:54Z eric $
+# $Id: PKGBUILD 131802 2011-07-15 11:55:43Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=quota-tools
-pkgver=3.17
-pkgrel=2
+pkgver=4.00_pre1 
+pkgrel=1
 pkgdesc="Tools to manage kernel-level quotas in Linux"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/linuxquota/"
 license=('GPL' 'BSD')
-depends=('e2fsprogs' 'tcp_wrappers')
+depends=('e2fsprogs')
 backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz LICENSE)
-md5sums=('cb3e98a039c0cf98e7c1ad4b50a5bda7'
-         'dd792440e684043e4e4ef80963d0237b')
-sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762'
-          '57297bdc9e638c500506169bbbe12eb89bcf7d07')
+source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver/_/-}.tar.gz LICENSE \
+        quotaon.diff system_inodes.diff repquota.diff nulls.diff)
+md5sums=('ef9d66e8a968ecffd2d9df648fa8ada2'
+         'dd792440e684043e4e4ef80963d0237b'
+         '9ac7ca4746de1ad057baee21474b7906'
+         '92d9f2a4b3e5e3adf2977051391785a7'
+         'd1d70d4167e53d1414079b4391f1cfb8'
+         '094bce5226c4fd1c383bd0b75405ee2c')
+sha1sums=('adf29b49dab449078eb6ffdfe8af51fe85419e28'
+          '57297bdc9e638c500506169bbbe12eb89bcf7d07'
+          '2304f03cddd06d8791167f621683f7ef54610673'
+          'e2a33f1f95a3ff8c741a2067058e898f6054af09'
+          '8b00e7c4f7af2188ad49a50a616c1d71eee20459'
+          '0527f761aa869f5d9e463ceab4a3bf82881d05c2')
 
 build() {
   cd "${srcdir}/${pkgname}"
+  patch -p1 -i "${srcdir}/quotaon.diff"
+  patch -p1 -i "${srcdir}/system_inodes.diff"
+  patch -p1 -i "${srcdir}/repquota.diff"
+  patch -p1 -i "${srcdir}/nulls.diff"
   ./configure --prefix=/usr --sysconfdir=/etc
+  sed -i -e 's/#define HOSTS_ACCESS 1//' -e 's/HOSTS_ACCESS//' config.h
+  sed -i 's/-lwrap//' Makefile
   make
 }
 
diff --git a/extra/quota-tools/nulls.diff b/extra/quota-tools/nulls.diff
new file mode 100644
index 000000000..97c5bc482
--- /dev/null
+++ b/extra/quota-tools/nulls.diff
@@ -0,0 +1,20 @@
+#Description: Avoid memory corruption of NULL address
+#Author: Petr Pisar
+
+--- quota/quotasys.c	2010-02-18 09:44:11.000000000 +0100
++++ quota-tools/quotasys.c	2010-05-05 08:02:53.000000000 +0200
+@@ -746,9 +746,12 @@
+ 	kernel_qfmt_num = 0;
+ 	if (!stat("/proc/fs/xfs/stat", &st))
+ 		kernel_qfmt[kernel_qfmt_num++] = QF_XFS;
+-	else
+-		if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS))
++	else {
++		fs_quota_stat_t dummy;
++
++		if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS))
+ 			kernel_qfmt[kernel_qfmt_num++] = QF_XFS;
++	}
+ 	/* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */
+ 	if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) {
+ 		kernel_iface = IFACE_GENERIC;
diff --git a/extra/quota-tools/quotaon.diff b/extra/quota-tools/quotaon.diff
new file mode 100644
index 000000000..6a43cee6c
--- /dev/null
+++ b/extra/quota-tools/quotaon.diff
@@ -0,0 +1,216 @@
+# Description: Fix quotaon to work with XFS and print all informational messages only in verbose mode
+# Author: Jan Kara
+
+diff -u quota/quotaon.c quota-tools/quotaon.c
+--- quota/quotaon.c	2010-07-28 11:14:02.000000000 +0200
++++ quota-tools/quotaon.c	2010-06-15 10:11:30.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <getopt.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <stdarg.h>
+ 
+ #include "quotaon.h"
+ #include "quota.h"
+@@ -145,6 +146,19 @@
+ 	}
+ }
+ 
++int pinfo(char *fmt, ...)
++{
++	va_list arg;
++	int ret;
++
++	if (!(flags & FL_VERBOSE))
++		return 0;
++	va_start(arg, fmt);
++	ret = vprintf(fmt, arg);
++	va_end(arg);
++	return ret;
++}
++
+ /*
+  *	Enable/disable rsquash on given filesystem
+  */
+@@ -171,10 +185,10 @@
+ 		errstr(_("set root_squash on %s: %s\n"), quotadev, strerror(errno));
+ 		return 1;
+ 	}
+-	if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_OFF))
+-		printf(_("%s: %s root_squash turned off\n"), quotadev, type2name(type));
+-	else if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_ON))
+-		printf(_("%s: %s root_squash turned on\n"), quotadev, type2name(type));
++	if (flags & STATEFLAG_OFF)
++		pinfo(_("%s: %s root_squash turned off\n"), quotadev, type2name(type));
++	else if (flags & STATEFLAG_ON)
++		pinfo(_("%s: %s root_squash turned on\n"), quotadev, type2name(type));
+ #endif
+ 	return 0;
+ }
+@@ -195,8 +209,7 @@
+ 			errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno));
+ 			return 1;
+ 		}
+-		if (flags & STATEFLAG_VERBOSE)
+-			printf(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type));
++		pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type));
+ 		return 0;
+ 	}
+ 	if (kernel_iface == IFACE_GENERIC) {
+@@ -218,8 +231,7 @@
+ 			errstr(_("Quota format not supported in kernel.\n"));
+ 		return 1;
+ 	}
+-	if (flags & STATEFLAG_VERBOSE)
+-		printf(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type));
++	pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type));
+ 	return 0;
+ }
+ 
+@@ -268,8 +280,6 @@
+ 	int sflags, ret = 0;
+ 
+ 	sflags = flags & FL_OFF ? STATEFLAG_OFF : STATEFLAG_ON;
+-	if (flags & FL_VERBOSE)
+-		sflags |= STATEFLAG_VERBOSE;
+ 	if (flags & FL_ALL)
+ 		sflags |= STATEFLAG_ALL;
+ 
+@@ -281,10 +291,7 @@
+ 			errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n"));
+ 			return 1;
+ 		}
+-		if ((flags & FL_OFF && (kern_quota_on(mnt->mnt_fsname, USRQUOTA, QF_XFS) != -1
+-		    || kern_quota_on(mnt->mnt_fsname, GRPQUOTA, QF_XFS) != -1))
+-		    || (!(flags & FL_OFF) && kern_quota_on(mnt->mnt_fsname, type, QF_XFS) == -1))
+-			ret = xfs_newstate(mnt, type, extra, sflags);
++		ret = xfs_newstate(mnt, type, extra, sflags);
+ 	}
+ 	else if (meta_qf_fstype(mnt->mnt_type)) {
+ 		if (!hasquota(mnt, type, 0))
+@@ -376,7 +383,7 @@
+ 	while ((mnt = get_next_mount())) {
+ 		if (nfs_fstype(mnt->mnt_type)) {
+ 			if (!(flags & FL_ALL))
+-				fprintf(stderr, "%s: Quota cannot be turned on on NFS filesystem\n", mnt->mnt_fsname);
++				errstr(_("%s: Quota cannot be turned on on NFS filesystem\n"), mnt->mnt_fsname);
+ 			continue;
+ 		}
+ 
+diff -u quota/quotaon.h quota-tools/quotaon.h
+--- quota/quotaon.h	2010-02-18 09:44:11.000000000 +0100
++++ quota-tools/quotaon.h	2010-06-12 12:06:08.000000000 +0200
+@@ -13,7 +13,7 @@
+ #define STATEFLAG_ON		0x01
+ #define STATEFLAG_OFF		0x02
+ #define STATEFLAG_ALL		0x04
+-#define STATEFLAG_VERBOSE	0x08
+ 
+ typedef int (newstate_t) (struct mntent * mnt, int type, char *file, int flags);
+ extern int xfs_newstate(struct mntent *mnt, int type, char *file, int flags);
++extern int pinfo(char *fmt, ...);
+diff -u quota/quotaon_xfs.c quota-tools/quotaon_xfs.c
+--- quota/quotaon_xfs.c	2010-07-26 18:48:24.000000000 +0200
++++ quota-tools/quotaon_xfs.c	2010-06-15 10:11:30.000000000 +0200
+@@ -59,8 +59,8 @@
+ 			    return 1;
+ 		    case Q_XFS_QUOTAON:
+ 			    if (roothack) {
+-				    printf(_("Enabling %s quota on root filesystem"
+-					     " (reboot to take effect)\n"), type2name(type));
++				    pinfo(_("Enabling %s quota on root filesystem"
++					    " (reboot to take effect)\n"), type2name(type));
+ 				    return 1;
+ 			    }
+ 			    errstr(_("Enable XFS %s quota accounting during mount\n"),
+@@ -79,12 +79,12 @@
+ 			    return -1;
+ 		    case Q_XFS_QUOTAON:
+ 			    if (roothack) {
+-				    printf(_("Enabling %s quota on root filesystem"
+-					     " (reboot to take effect)\n"), type2name(type));
++				    pinfo(_("Enabling %s quota on root filesystem"
++					    " (reboot to take effect)\n"), type2name(type));
+ 				    return 1;
+ 			    }
+ 			    if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) {
+-				    printf(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev);
++				    pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev);
+ 				    return 1;
+ 			    }
+ 			    errstr(_("Already accounting %s quota on %s\n"),
+@@ -92,7 +92,7 @@
+ 			    return -1;
+ 		    case Q_XFS_QUOTAOFF:
+ 			    if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) {
+-				    printf(_("Disabling %s quota accounting on %s\n"),
++				    pinfo(_("Disabling %s quota accounting on %s\n"),
+ 					   type2name(type), dev);
+ 			    	    return 1;
+ 			    }
+@@ -121,9 +121,9 @@
+ 				    return -1;
+ 			    }
+ 			    if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT)
+-			    	    acctstr = _("and accounting ");
+-			    printf(_("Disabling %s quota enforcement %son %s\n"),
+-				   type2name(type), acctstr, dev);
++		    		    acctstr = _("and accounting ");
++			    pinfo(_("Disabling %s quota enforcement %son %s\n"),
++				  type2name(type), acctstr, dev);
+ 			    return 1;
+ 		  }
+ 		  break;
+@@ -146,10 +146,10 @@
+ 		errstr(_("quotactl on %s: %s\n"), dev, strerror(errno));
+ 		return 1;
+ 	}
+-	if ((flags & STATEFLAG_VERBOSE) && qoff)
+-		printf(_("%s: %s quotas turned off\n"), dev, type2name(type));
+-	else if ((flags & STATEFLAG_VERBOSE) && !qoff)
+-		printf(_("%s: %s quotas turned on\n"), dev, type2name(type));
++	if (qoff)
++		pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type));
++	else
++		pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type));
+ 	return 0;
+ }
+ 
+@@ -168,8 +168,7 @@
+ 		return 1;
+ 	}
+ 
+-	if (flags & STATEFLAG_VERBOSE)
+-		printf(_("%s: deleted %s quota blocks\n"), dev, type2name(type));
++	pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type));
+ 	return 0;
+ }
+ 
+@@ -208,16 +207,12 @@
+ 	}
+ #endif /* XFS_ROOTHACK */
+ 
+-	if (xarg == NULL) {	/* both acct & enfd on/off */
+-		xopts |= (type == USRQUOTA) ?
+-			(XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) :
+-			(XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD);
++	if (xarg == NULL) {	/* only enfd on/off */
++		xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD :
++			XFS_QUOTA_GDQ_ENFD;
+ 		err = xfs_onoff((char *)dev, type, flags, roothack, xopts);
+ 	}
+ 	else if (strcmp(xarg, "account") == 0) {
+-		/* only useful if we want root accounting only */
+-		if (!roothack || !(flags & STATEFLAG_ON))
+-			goto done;
+ 		xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ACCT : XFS_QUOTA_GDQ_ACCT;
+ 		err = xfs_onoff((char *)dev, type, flags, roothack, xopts);
+ 	}
+@@ -231,7 +226,6 @@
+ 	}
+ 	else
+ 		die(1, _("Invalid argument \"%s\"\n"), xarg);
+-      done:
+ 	free((char *)dev);
+ 	return err;
+ }
diff --git a/extra/quota-tools/repquota.diff b/extra/quota-tools/repquota.diff
new file mode 100644
index 000000000..3d79497d9
--- /dev/null
+++ b/extra/quota-tools/repquota.diff
@@ -0,0 +1,91 @@
+# Description: fix repquota to get latest quota info header
+# Author: Jan Kara
+
+diff -u quota/quotaio.c quota-tools/quotaio.c
+--- quota/quotaio.c	2010-07-28 11:14:02.000000000 +0200
++++ quota-tools/quotaio.c	2010-05-28 09:05:21.000000000 +0200
+@@ -147,6 +147,15 @@
+ 		}
+ 	}
+ 	if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) {	/* Need to open file? */
++		if (QIO_ENABLED(h)) {	/* Kernel uses same file? */
++			unsigned int cmd =
++				(kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC;
++			if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev,
++				     0, NULL) < 0) {
++				die(4, _("Cannot sync quotas on device %s: %s\n"),
++				    h->qh_quotadev, strerror(errno));
++			}
++		}
+ 		/* We still need to open file for operations like 'repquota' */
+ 		if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) {
+ 			errstr(_("Cannot open quotafile %s: %s\n"),
+diff -u quota/quotaio_v1.c quota-tools/quotaio_v1.c
+--- quota/quotaio_v1.c	2010-07-26 18:48:24.000000000 +0200
++++ quota-tools/quotaio_v1.c	2010-05-28 09:05:23.000000000 +0200
+@@ -348,11 +348,6 @@
+ 	struct dquot *dquot = get_empty_dquot();
+ 	qid_t id = 0;
+ 
+-	if (QIO_ENABLED(h))	/* Kernel uses same file? */
+-		if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type),
+-			     h->qh_quotadev, 0, NULL) < 0)
+-			die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev,
+-			    strerror(errno));
+ 	memset(dquot, 0, sizeof(*dquot));
+ 	dquot->dq_h = h;
+ 	lseek(h->qh_fd, 0, SEEK_SET);
+diff -u quota/quotaio_v2.c quota-tools/quotaio_v2.c
+--- quota/quotaio_v2.c	2010-02-18 09:44:11.000000000 +0100
++++ quota-tools/quotaio_v2.c	2010-05-28 09:05:23.000000000 +0200
+@@ -484,11 +484,6 @@
+ 
+ static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *))
+ {
+-	if (QIO_ENABLED(h))	/* Kernel uses same file? */
+-		if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type),
+-			     h->qh_quotadev, 0, NULL) < 0)
+-			die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev,
+-			    strerror(errno));
+ 	return qtree_scan_dquots(h, process_dquot);
+ }
+ 
+diff -u quota/quotasys.c quota-tools/quotasys.c
+--- quota/quotasys.c	2010-07-28 11:14:02.000000000 +0200
++++ quota-tools/quotasys.c	2010-06-15 10:11:30.000000000 +0200
+@@ -861,22 +861,23 @@
+ 	if (kernel_iface == IFACE_GENERIC) {
+ 		int actfmt;
+ 
+-		if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0)
+-			return -1;
+-		actfmt = kern2utilfmt(actfmt);
+-		if (actfmt < 0)
+-			return -1;
+-		return actfmt;
++		if (quotactl(QCMD(Q_GETFMT, type), dev, 0,
++			     (void *)&actfmt) >= 0) {
++			actfmt = kern2utilfmt(actfmt);
++			if (actfmt >= 0)
++				return actfmt;
++		}
++	} else {
++		if ((fmt == -1 || fmt == QF_VFSV0) &&
++		    v2_kern_quota_on(dev, type))	/* VFSv0 quota format */
++			return QF_VFSV0;
++		if ((fmt == -1 || fmt == QF_VFSOLD) &&
++		    v1_kern_quota_on(dev, type))	/* Old quota format */
++			return QF_VFSOLD;
+ 	}
+-	if ((fmt == -1 || fmt == QF_VFSV0) &&
+-	    v2_kern_quota_on(dev, type))	/* VFSv0 quota format */
+-		return QF_VFSV0;
+ 	if ((fmt == -1 || fmt == QF_XFS) &&
+ 	    xfs_kern_quota_on(dev, type))	/* XFS quota format */
+ 		return QF_XFS;
+-	if ((fmt == -1 || fmt == QF_VFSOLD) &&
+-	    v1_kern_quota_on(dev, type))	/* Old quota format */
+-		return QF_VFSOLD;
+ 	return -1;
+ }
+ 
diff --git a/extra/quota-tools/system_inodes.diff b/extra/quota-tools/system_inodes.diff
new file mode 100644
index 000000000..94f4d66da
--- /dev/null
+++ b/extra/quota-tools/system_inodes.diff
@@ -0,0 +1,18 @@
+# Description: Do not count system inodes into quota for ext[234]
+# Author: Jan Kara
+
+--- quota/quotacheck.c	2010-02-18 09:44:10.000000000 +0100
++++ quota-tools//quotacheck.c	2010-05-22 16:47:53.000000000 +0200
+@@ -455,8 +455,10 @@
+ 		return -1;
+ 	}
+ 
+-	while ((long)i_num) {
+-		if (inode.i_links_count) {
++	while (i_num) {
++		if ((i_num == EXT2_ROOT_INO ||
++		     i_num >= EXT2_FIRST_INO(fs->super)) &&
++		    inode.i_links_count) {
+ 			debug(FL_DEBUG, _("Found i_num %ld, blocks %ld\n"), (long)i_num, (long)inode.i_blocks);
+ 			if (flags & FL_VERBOSE)
+ 				blit(NULL);
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 8c95ca2d4..2395df342 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $
+# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
-depends=('libpng' 'libxml2' 'pango' 'tcp_wrappers')
+depends=('libpng' 'libxml2' 'pango')
 makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
@@ -26,7 +26,7 @@ build() {
   ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl
+    --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
   make
 }
 
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 1d1af26d0..458009ce3 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $
+# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
 pkgver=1.7.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('readline' 'openssl' 'tcp_wrappers')
-source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz")
+depends=('readline' 'openssl')
+source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
+		--disable-libwrap # only required while base/base-devel uses tcp_wrappers
 
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 33d44dae7..72034141e 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 42756 2009-06-18 19:44:52Z tpowa $
+# $Id: PKGBUILD 131856 2011-07-16 06:36:05Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Jose Javier  <jojapa@terra.es>
 pkgname=tftp-hpa
-pkgver=5.0
-pkgrel=3
+pkgver=5.1
+pkgrel=1
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/software/network/tftp/"
 license=('BSD')
-depends=('tcp_wrappers' 'readline>=6.0.00')
+depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
 backup=('etc/conf.d/tftpd')
 source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE)
-md5sums=('1ae813a94670f0d8c294aafa9f5ecf65' 'a974d02526f19222146c8e3d3b598871'\
-         '414a79dc891bced056d99a9bb790fc9e' '6ce21e27b6fdc1a1adf85c81e42aeecf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make INSTALLROOT="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers 
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}" 
+  make INSTALLROOT="${pkgdir}" install
   install -d "${pkgdir}/etc/rc.d"
   install -d "${pkgdir}/var/tftpboot"
-  install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" || return 1
-  install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" || return 1
+  install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
+  install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
   rm "${pkgdir}/usr/share/man/man8/tftpd.8"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+md5sums=('d086b1bd6e5ed6375ad407e273afccdf'
+         '83fbb6f52205d95951a3c059e5351ca2'
+         '414a79dc891bced056d99a9bb790fc9e'
+         '6ce21e27b6fdc1a1adf85c81e42aeecf')
diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc
index b21f87f5c..0222d1693 100755
--- a/extra/tftp-hpa/tftpd.rc
+++ b/extra/tftp-hpa/tftpd.rc
@@ -14,7 +14,7 @@ case "$1" in
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      add_daemon in.tftpd
+      add_daemon tftpd
       stat_done
     fi
     ;;
@@ -24,7 +24,7 @@ case "$1" in
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm_daemon in.tftpd
+      rm_daemon tftpd
       stat_done
     fi
     ;;
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
index df6037c93..c35fe02de 100644
--- a/extra/vsftpd/PKGBUILD
+++ b/extra/vsftpd/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 130325 2011-07-05 09:57:35Z andrea $
+# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
 url="https://security.appspot.com/vsftpd.html"
 license=('GPL2')
-depends=('tcp_wrappers' 'openssl')
+depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
 source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz"
@@ -25,7 +25,6 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # build-time config
   sed \
-    -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
     -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
     -i builddefs.h
   make CFLAGS="${CFLAGS}"