Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/collectd/PKGBUILD
	community/exim/PKGBUILD
	community/nsd/PKGBUILD
	extra/phonon-vlc/PKGBUILD

14 files changed, 103 insertions, 39 deletions

diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index ff840454c..0fcba3316 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ options=('!libtool')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/2.4/$pkgname-$pkgver.tar.xz
         banshee-recent-gpod.patch)
-md5sums=('a719717d02ed26cccf4e6432edd48a31'
+md5sums=('18d77594e524ff5e51c5cca5c6b31a34'
          'e988bb83e1a49e5f0da5958e8af6508e')
 
 build() {
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index 4a92dc4bd..fca527229 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150841 2012-02-23 12:31:37Z ibiru $
+# $Id: PKGBUILD 160663 2012-06-03 10:40:04Z bisson $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -8,7 +8,7 @@ pkgname=hddtemp
 pkgver=0.3.beta15.46
 _origver=0.3-beta15
 _patchver=46
-pkgrel=2
+pkgrel=3
 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.guzu.net/linux/hddtemp.php"
@@ -17,10 +17,11 @@ depends=('glibc')
 backup=('etc/conf.d/hddtemp')
 source=(http://www.guzu.net/files/hddtemp-${_origver}.tar.bz2
         http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_${_origver}-${_patchver}.diff.gz
-        'hddtemp' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch')
+        'hddtemp' 'hddtemp.service' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch')
 md5sums=('8b829339e1ae9df701684ec239021bb8'
          '040437845e28771c560b4bb40e41f933'
          'b7ebb86dfeef3bc4577ed1040307e36b'
+         'b6767bdbb03b6cdbc1995418cafdb1e1'
          'fdca5c43900406f0be76534ef2a5a697'
          '526ef28549dd0da7e38d32cfc8523592')
 options=('!libtool')
@@ -42,5 +43,6 @@ package() {
   install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \
     "$pkgdir/usr/share/${pkgname}/hddtemp.db"
   install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp"
+  install -D -m644 "$srcdir/hddtemp.service" "$pkgdir/usr/lib/systemd/system/hddtemp.service"
   install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp"
 }
diff --git a/extra/hddtemp/hddtemp.service b/extra/hddtemp/hddtemp.service
new file mode 100644
index 000000000..bc56d16b0
--- /dev/null
+++ b/extra/hddtemp/hddtemp.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hard drive temperature monitor daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/hddtemp 
+ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index e4596b429..140fc4c99 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156577 2012-04-21 07:39:14Z giovanni $
+# $Id: PKGBUILD 160650 2012-06-03 07:59:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.9
+pkgver=1.40.10
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('243aa6d549888c265616f2a082777a56')
+md5sums=('7181a363af41e0f476dd81f36b105a8e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index 097a7b584..f30ccee91 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153833 2012-03-19 19:50:28Z andyrtr $
+# $Id: PKGBUILD 160686 2012-06-03 18:36:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
-pkgver=2.12
+pkgver=2.13
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,9 @@ url="http://www.gnu.org/software/libtasn1/"
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=libtasn1.install
-source=(ftp://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('b73539aee5444efb5e606b94bdf3ec5bfedb8620'
-          'c260eae1003b4195b3a1065252b69e95ae482661')
+source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha1sums=('89120584bfedd244dab92df99e955a174c481851'
+          '2f9ce2aef6c1bd78f462e95de531b2b61f59d13c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index b7e742885..ff7843613 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158554 2012-05-04 23:23:19Z giovanni $
+# $Id: PKGBUILD 160652 2012-06-03 08:11:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -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=('0ff7c7f7c50e506d494ff84baa10a77d'
+md5sums=('9f59b5d71969cbb2671702cd2a7a5a11'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mono-upnp/PKGBUILD b/extra/mono-upnp/PKGBUILD
index 02b0d806b..c819c4cd2 100644
--- a/extra/mono-upnp/PKGBUILD
+++ b/extra/mono-upnp/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 154079 2012-03-22 17:57:25Z daniel $
+# $Id: PKGBUILD 160690 2012-06-03 19:15:39Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=mono-upnp
-pkgver=0.1.1
+pkgver=0.1.2
 pkgrel=1
 pkgdesc="UPNP binding for Mono/.NET"
 arch=('i686' 'x86_64')
 url="https://github.com/mono/mono-upnp"
 license=('MIT')
 depends=('gtk-sharp-2' 'mono-addins' 'taglib-sharp')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('35b3e2ab07407eed018a5b24c22241aa')
+source=(https://github.com/downloads/mono/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('9fd681bc1fee67db8a54f5da1a3805dc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh --help
   
   sed -i 's/nunit/mono-nunit/' configure tests/*/Makefile.in
   ./configure --prefix=/usr
-
   make
 }
 
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 98dcae31c..4267a8111 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150669 2012-02-19 23:09:39Z andrea $
+# $Id: PKGBUILD 160656 2012-06-03 09:29:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 pkgdesc="Phonon VLC backend"
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 1c8aab14e..35d7fa342 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160385 2012-06-01 13:01:31Z tpowa $
+# $Id: PKGBUILD 160692 2012-06-03 19:17:38Z tpowa $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://slim.berlios.de/'
@@ -57,7 +57,7 @@ package() {
 }
 md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
          'd8ea9c4dee2811524b67f4f666311a1f'
-         'ebfff3417058619a1328284ae0e2f48e'
+         'd33edc74724c6ca00445767ce38fc732'
          '43da096480bf72c3ccec8ad8400f34f0'
          '7c0bf1fb6292537e2c63ec04f8532079'
          'ae4b237d472ec5d373e30080aa0ff804'
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
index 4a6b53d0f..2a875d9e3 100644
--- a/extra/slim/pam.d
+++ b/extra/slim/pam.d
@@ -7,3 +7,4 @@ password        required        pam_unix.so
 session         required        pam_limits.so
 session         required        pam_unix.so
 session         optional        pam_loginuid.so
+session	        optional	pam_systemd.so
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index f02d0c14c..3f4864051 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 153239 2012-03-12 11:49:26Z giovanni $
+# $Id: PKGBUILD 160665 2012-06-03 10:41:33Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://smb4k.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'docbook-xsl')
+makedepends=('cmake' 'automoc4')
 install=smb4k.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('c4b515e482ef7a7a834a3b660e1ee4d0')
+md5sums=('e1c895044faaf18d90ea4b564412455e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 241dee6e1..f1265c490 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156376 2012-04-17 19:41:18Z eric $
+# $Id: PKGBUILD 160646 2012-06-03 04:02:31Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
@@ -17,11 +17,14 @@ optdepends=('libao: for ao plugin'
             'wavpack: for wavpack plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        sox_default_audio_driver_fallback.patch)
+sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
+          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
diff --git a/extra/sox/sox_default_audio_driver_fallback.patch b/extra/sox/sox_default_audio_driver_fallback.patch
new file mode 100644
index 000000000..9f9060e17
--- /dev/null
+++ b/extra/sox/sox_default_audio_driver_fallback.patch
@@ -0,0 +1,51 @@
+--- src/sox.c.old	2012-05-06 22:45:45.380564154 -0400
++++ src/sox.c	2012-05-06 22:47:11.948248987 -0400
+@@ -2538,20 +2538,38 @@
+   return name? from_env? from_env : name : NULL;
+ }
+ 
++static char const * try_device(char const * name)
++{
++  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
++  if (handler) {
++    sox_format_t format, * ft = &format;
++    memset(ft, 0, sizeof(*ft));
++    ft->filename = (char *)device_name(name);
++    ft->priv = lsx_calloc(1, handler->priv_size);
++    if (handler->startwrite(ft) == SOX_SUCCESS) {
++      handler->stopwrite(ft);
++      free(ft->priv);
++      return name;
++    }
++    free(ft->priv);
++  }
++  return NULL;
++}
++
+ static char const * set_default_device(file_t * f)
+ {
+   /* Default audio driver type in order of preference: */
+   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
+-  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio";
+-  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio";
+-  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa";
+-  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio";
+-  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio";
+-  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
+-  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau";
+-  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) /*!rec*/
+-    f->filetype = "ao";
+-
++  if (!f->filetype) f->filetype = try_device("coreaudio");
++  if (!f->filetype) f->filetype = try_device("pulseaudio");
++  if (!f->filetype) f->filetype = try_device("alsa");
++  if (!f->filetype) f->filetype = try_device("waveaudio");
++  if (!f->filetype) f->filetype = try_device("sndio");
++  if (!f->filetype) f->filetype = try_device("oss");
++  if (!f->filetype) f->filetype = try_device("sunau");
++  if (!f->filetype && file_count) /*!rec*/
++    f->filetype = try_device("ao");
++ 
+   if (!f->filetype) {
+     lsx_fail("Sorry, there is no default audio device configured");
+     exit(1);
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 83610e431..087d46185 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160581 2012-06-02 10:29:09Z bluewind $
+# $Id: PKGBUILD 160654 2012-06-03 08:20:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.3.7
-pkgrel=2
+pkgver=0.3.8
+pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('62bb5002b2ba9e5816dfeededc3fa276')
+md5sums=('c07047eca33c176df25e94964bdec7bf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"