Wed Jun 5 00:33:46 PDT 2013

17 files changed, 155 insertions, 68 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index d68ded83b..fc02817fe 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,19 +1,25 @@
-# $Id: PKGBUILD 184360 2013-05-06 19:36:35Z foutrelis $
+# $Id: PKGBUILD 187176 2013-06-04 19:44:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
+# Contributor: Anatol Pomozov <anatol@google.com>
 
 pkgname=amule
-pkgver=10802
-pkgrel=2
+pkgver=10803
+pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('46bbfbfba0af431b6baa0c30bd35600c')
+install=amule.install
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
+        'amuled.systemd'
+        'amuleweb.systemd')
+md5sums=('febf14f5b1185f25acde64f61b78ed38'
+         '59772c41860e238f1c822feb8ca8d47f'
+         '05975c5d94bfc41fddb894d98b1115d5')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
@@ -40,5 +46,8 @@ build() {
 package() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
-  make DESTDIR=${pkgdir}/ install
+  make DESTDIR=${pkgdir} install
+
+  install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
+  install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
 }
diff --git a/extra/amule/amule.install b/extra/amule/amule.install
new file mode 100644
index 000000000..397f68bf2
--- /dev/null
+++ b/extra/amule/amule.install
@@ -0,0 +1,34 @@
+post_install() {
+  post_upgrade
+  passwd -l amule &>/dev/null
+
+  # Generate a random password for amuled<->amuleweb communication
+  ec_password=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
+  encripted_ec_password=$(echo -n $ec_password | md5sum | cut -d ' ' -f 1)
+  # Create a config file
+  sudo -u amule mkdir -p /var/lib/amule/.aMule
+  echo "[ExternalConnect]
+AcceptExternalConnections=1
+ECPassword=$encripted_ec_password" > /var/lib/amule/.aMule/amule.conf
+
+  sudo -u amule /usr/bin/amuleweb --write-config --password=$ec_password --admin-pass=amule
+
+  echo "A new password for extarnal configuration is generated: $ec_password"
+  echo "Please follow https://wiki.archlinux.org/index.php/AMule how to setup"
+  echo "external connection (e.g. using amule-gui tool)."
+  echo "amuleweb can be started as 'systemctl start amuleweb'."
+  echo "Password for amuleweb: amule"
+}
+
+post_upgrade() {
+  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
+  getent group amule >/dev/null || groupadd amule
+  getent passwd amule >/dev/null || useradd -c 'aMule Client' -g amule -b '/var/lib' -m -s /bin/false amule
+}
+
+post_remove(){
+  /usr/bin/systemctl stop amuled.service amuleweb.service
+
+  getent passwd amule >/dev/null && userdel amule
+  getent group amule >/dev/null && groupdel amule
+}
diff --git a/extra/amule/amuled.systemd b/extra/amule/amuled.systemd
new file mode 100644
index 000000000..e1878dfd9
--- /dev/null
+++ b/extra/amule/amuled.systemd
@@ -0,0 +1,11 @@
+[Unit]
+Description=aMule Daemon
+After=network.target
+
+# This assumes that a user 'amule' exists, with a writeable home directory
+[Service]
+User=amule
+ExecStart=/usr/bin/amuled
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/amule/amuleweb.systemd b/extra/amule/amuleweb.systemd
new file mode 100644
index 000000000..1799f4ae8
--- /dev/null
+++ b/extra/amule/amuleweb.systemd
@@ -0,0 +1,13 @@
+[Unit]
+Description=aMule Webserver
+Requires=amuled.service
+
+[Service]
+User=amule
+ExecStart=/usr/bin/amuleweb --quiet
+# If amuled still starting then amuleweb exits, restart until amuleweb is up 
+Restart=on-success
+RestartSec=3s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index fec6a9ddc..db8bd541f 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183337 2013-04-21 22:08:38Z heftig $
+# $Id: PKGBUILD 187111 2013-06-04 04:29:06Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
 pkgname=caribou
-pkgver=0.4.10
+pkgver=0.4.11
 pkgrel=1
 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=(intltool docbook-xsl gtk2)
 install=caribou.install
 options=(!libtool !emptydirs)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865')
+sha256sums=('e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9')
 
 build() {
   cd $pkgname-$pkgver
@@ -25,6 +25,10 @@ build() {
     --disable-gtk2-module \
     --disable-static \
     --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 052ba4a6e..1972b6636 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183369 2013-04-21 22:09:32Z heftig $
+# $Id: PKGBUILD 187115 2013-06-04 04:38:37Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82'
+sha256sums=('8095fcfa014931773e9d231dff76c6924f43abfbe4c5525cf07fd2d7f8e1f770'
             '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
@@ -26,6 +26,10 @@ build() {
     --disable-desktop-update \
     --disable-icon-update \
     --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 8edc2dff2..ed78c95e7 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $
+# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.1.11
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -11,14 +11,20 @@ license=('GPL3' 'LGPL2.1')
 url="http://www.gnutls.org/"
 install=gnutls.install
 options=('!libtool' '!zipman')
-depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 makedepends=('valgrind' 'strace' 'datefudge')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88'
-         'SKIP')
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}
+        check_fix.diff)
+md5sums=('c220b50736f61292ed8722d5132b6a3e'
+         'SKIP'
+         '53ae2a58a401d9e6d052910670da8b07')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # fix i686 test suite failure
+  patch -Np1 -i ${srcdir}/check_fix.diff
+  
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -30,6 +36,7 @@ build() {
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -k check
+  #make -j1 check
 }
 
 package() {
diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff
new file mode 100644
index 000000000..f7c7e32c3
--- /dev/null
+++ b/extra/gnutls/check_fix.diff
@@ -0,0 +1,34 @@
+From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 2 Jun 2013 12:10:06 +0200
+Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems.
+
+---
+ tests/cert-tests/pem-decoding |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
+index fe769ec..f8c6372 100755
+--- a/tests/cert-tests/pem-decoding
++++ b/tests/cert-tests/pem-decoding
+@@ -61,7 +61,9 @@ if test "$rc" != "0"; then
+   exit $rc
+ fi
+ 
+-diff $srcdir/complex-cert.pem tmp-pem.pem
++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2
++diff tmp1 tmp2
+ rc=$?
+ 
+ if test "$rc" != "0"; then
+@@ -69,6 +71,6 @@ if test "$rc" != "0"; then
+   exit $rc
+ fi
+ 
+-rm -f tmp-pem.pem
++rm -f tmp-pem.pem tmp1 tmp2
+ 
+ exit 0
+-- 
+1.7.1
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index 3d242f810..c2b5dadb1 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Martin Striz <ms@poruba.net>
 
 pkgname=irqbalance
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="IRQ balancing daemon for SMP systems"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/irqbalance"
@@ -12,7 +12,7 @@ depends=(glib2 numactl libcap-ng)
 makedepends=(pkgconfig)
 source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
         irqbalance.service)
-md5sums=('b6403fa067c96adce448a48c9993654d'
+md5sums=('b73b1a5a9e1c3c428ae39024c711e41e'
          'a97ad17dc7df98b81acb500b27f931e5')
 
 build() {
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index 7f42658d7..b2a2c93e6 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178618 2013-02-25 20:45:01Z andyrtr $
+# $Id: PKGBUILD 187152 2013-06-04 16:06:29Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
-pkgver=1.5.0
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86')
+sha256sums=('53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa')
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
diff --git a/extra/libx11/xorg.csh b/extra/libx11/xorg.csh
deleted file mode 100644
index 39d5a9715..000000000
--- a/extra/libx11/xorg.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-setenv XDG_DATA_HOME ${HOME}/.local/share
-setenv XDG_CONFIG_HOME ${HOME}/.config
-setenv XDG_CACHE_HOME ${HOME}/.cache
-
-if (! ($?XDG_DATA_DIRS) ) then
-  	setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/
-else
-	setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS}
-endif
-
-if (! ($?XDG_CONFIG_DIRS) ) then
-	setenv XDG_CONFIG_DIRS /etc/xdg
-else
-	setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS}
-endif
diff --git a/extra/libx11/xorg.sh b/extra/libx11/xorg.sh
deleted file mode 100644
index 4fc02e322..000000000
--- a/extra/libx11/xorg.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_CACHE_HOME=$HOME/.cache
-
-if [ -z $XDG_DATA_DIRS ]; then
-	export XDG_DATA_DIRS=/usr/local/share/:/usr/share/
-else
-	export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS
-fi
-
-if [ -z $XDG_CONFIG_DIRS ]; then
-	export XDG_CONFIG_DIRS=/etc/xdg
-else
-	export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS
-fi
diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD
index a320c8109..f325ea772 100644
--- a/extra/libxml2/PKGBUILD
+++ b/extra/libxml2/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 185108 2013-05-11 07:24:50Z bpiotrowski $
+# $Id: PKGBUILD 187170 2013-06-04 17:39:43Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libxml2
 pkgver=2.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
-license=('custom')
-depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz')
+license=('MIT')
+depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2')
 options=('!libtool')
 url="http://www.xmlsoft.org/"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index e46ff579f..37bfa9dff 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $
+# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('db34e6085b71c33ba250e689b1535101'
+md5sums=('55f6ea5982cf87836113376174826e8c'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 9dad6a619..6bfa13777 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187069 2013-06-03 11:16:51Z allan $
+# $Id: PKGBUILD 187156 2013-06-04 16:15:46Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.10.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
diff --git a/extra/postfix/install b/extra/postfix/install
index 7230359fc..c7e06b07e 100644
--- a/extra/postfix/install
+++ b/extra/postfix/install
@@ -1,5 +1,5 @@
 post_upgrade() {
-	/usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix upgrade-package
+	/usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package
 	chown postfix var/lib/postfix
 }
 
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 1688fdf7d..8f84439a8 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185261 2013-05-12 16:27:13Z giovanni $
+# $Id: PKGBUILD 187179 2013-06-04 21:40:01Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
 pkgver=5.0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64')
 url="http://www.linux.it/~md/software/"
@@ -17,7 +17,7 @@ md5sums=('8f873c1c51592ee419b2a46b0a3c8432')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1
+  make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 HAVE_ICONV=1
 }
 
 package() {