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

Conflicts:
	community-testing/libvirt/PKGBUILD
	community/opendkim/opendkim.rc
	core/nfs-utils/blkmapd.service
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-libssh2/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	testing/php/PKGBUILD
	testing/xorg-server/PKGBUILD
	~fauno/notmuch/PKGBUILD

7 files changed, 74 insertions, 59 deletions

diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 6f4deb508..c2d6bf252 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,18 +1,15 @@
-# $Id: PKGBUILD 155426 2012-04-03 14:17:30Z stephane $
+# $Id: PKGBUILD 160188 2012-05-30 11:50:04Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
 license=('custom')
 depends=('e2fsprogs' 'libldap' 'keyutils')
 makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
 backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
         krb5-1.10.1-gcc47.patch
@@ -57,7 +54,10 @@ build() {
 
 package() {
    cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
+   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
+
+   # Fix FS#29889
+   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
 
    # Sample KDC config file
    install -dm 755 "${pkgdir}"/var/lib/krb5kdc
@@ -68,9 +68,7 @@ package() {
    install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
 
    install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc      "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kpropd   "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d
 
    install -dm 755 "${pkgdir}"/usr/share/aclocal
    install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index ee82195e3..bc4bfca94 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159240 2012-05-18 16:47:23Z tpowa $
+# $Id: PKGBUILD 160025 2012-05-28 10:25:39Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
-pkgver=3.2.4
-pkgrel=1
+pkgver=3.2.5
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -21,12 +21,12 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm.service
         disable-werror.patch)
 replaces=('raidtools')
-md5sums=('c25007b981e0f5362eacdad385ff0e15'
+md5sums=('83ba4a6249ae24677e915e44c9cfcc58'
          '8333d405f550317c2bacd5510bf1cb60'
          '00cbed931db4f15b6ce49e3e7d433966'
-         '9b01e96b6c3c218fb61628c9281fe688'
+         '609d10888727710cb20db7ac3e096116'
          'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '2318b99701dba9b01a6891c62be7bc1c'
+         'd1d8e9eb81ce9347de74f3c84a9db09e'
          'aafb5f9ac8437a284cbf948b9b13b179'
          '4ad87b74a4bc9a34621280abe0e0c3e4')
 
diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install
index b53258676..cf6159e40 100644
--- a/core/mdadm/mdadm_install
+++ b/core/mdadm/mdadm_install
@@ -1,45 +1,45 @@
-# vim: set ft=sh:
-
-build()
-{
-    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-    BINARIES=""
-    FILES=""
-    SCRIPT="mdadm"
+#!/bin/bash
+
+build() {
+    add_checked_modules -f 'dm-' 'drivers/md/*'
+
     # check if a custom mdadm.conf exists
     if grep -q ^ARRAY /etc/mdadm.conf; then
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
     add_binary "/sbin/mdassemble"
+
+    add_runscript
 }
 
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for any raid root device,
-  and assembles the raid device when run.
-
-  If arrays are defined in /etc/mdadm.conf, the file will be used instead
-  of command line assembling.
-  
-  Command Line Setup:
-  - for raid arrays with persistent superblocks:
-    md=<md device no.>,dev0,dev1,...,devn
-    md=<md device no.>,uuid
-  - for partitionable raid arrays with persistent superblocks:
-    md=d<md device no.>,dev0,dev1,...,devn
-    md=d<md device no.>,uuid
-
-  Parameters:
-  - <md device no.> = the number of the md device: 
-    0 means md0, 1 means md1, ...
-  - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
-                   or 0900878d:f95f6057:c39a36e9:55efa60a
-  Examples:
-  - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
-    This will setup 2 md partitionable arrays.
-  - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
-    This will setup 2 md arrays with persistent superblocks.
+help() {
+  cat <<HELPEOF
+This hook loads the necessary modules for any raid root device,
+and assembles the raid device when run.
+
+If arrays are defined in /etc/mdadm.conf, the file will be used instead
+of command line assembling.
+
+Command Line Setup:
+- for raid arrays with persistent superblocks:
+  md=<md device no.>,dev0,dev1,...,devn
+  md=<md device no.>,uuid
+- for partitionable raid arrays with persistent superblocks:
+  md=d<md device no.>,dev0,dev1,...,devn
+  md=d<md device no.>,uuid
+
+Parameters:
+- <md device no.> = the number of the md device: 
+  0 means md0, 1 means md1, ...
+- <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
+                 or 0900878d:f95f6057:c39a36e9:55efa60a
+Examples:
+- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
+  This will setup 2 md partitionable arrays.
+- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
+  This will setup 2 md arrays with persistent superblocks.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install
index be653fc74..f6f5de4ad 100644
--- a/core/mdadm/mdadm_udev_install
+++ b/core/mdadm/mdadm_udev_install
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 build() {
-    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")"
+    add_checked_modules -f 'dm-' 'drivers/md/*'
 
     # check if a custom mdadm.conf exists
     if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then
@@ -15,7 +15,9 @@ build() {
 
 help() {
   cat <<HELPEOF
-  This hook loads raid arrays with udev.
+This hook loads the necessary modules for a RAID array and uses incremental
+assembly via udev at runtime to create the devices. This hook with NOT work
+without the udev hook included on the image.
 HELPEOF
 }
 
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index cfd4a0bb5..3494f0287 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157236 2012-04-26 13:06:19Z tpowa $
+# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,8 +6,8 @@
 # Contributor: Marco Lima <cipparello gmail com>
 
 pkgname=nfs-utils
-pkgver=1.2.5
-pkgrel=4
+pkgver=1.2.6
+pkgrel=1
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nfs.sourceforge.net'
@@ -34,9 +34,10 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	nfsd.service
 	var-lib-nfs-rpc_pipefs.mount
 	proc-fs-nfsd.mount
+	blkmapd.service
 	nfs-utils.conf)
 install=nfs-utils.install
-md5sums=('8395ac770720b83c5c469f88306d7765'
+md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
          'dd0d65fc6e8f422fa12520813098264b'
          'f73f197a16b02c3e248488ec35c4cf43'
          'e619f18354ff958ed624d05d08853d8f'
@@ -48,13 +49,14 @@ md5sums=('8395ac770720b83c5c469f88306d7765'
          '7674106eaaa4c149bccd4f05fe3604e9'
          '4f4827dfc93008dfadd0a530ad0872b2'
          '38855936dc55a5afe37d84edc0f11066'
-         '8d888de677a217c5e5f7244a2e3a2d3a'
+         '965311784d49a7d126d512cadbe91deb'
          'e05705d9ccccaeaeb1ecaee20adc05bc'
          'd7df7bc311fd95c5b80017dd1741570d'
          '2e72ee082cba5d3ec6f51d2a105664da'
          '5d33d2e754fd37280365b287603bac90'
          '1cd65909fa0983047f3f06a3ab352401'
          '02a34835aa077146a90eb7d191e612d0'
+         '8ffc2ebe932d29efe17d6f3f23d5b975'
          '8ac484023d786766d287ccbe878ae4ba')
 
 build() {
@@ -74,6 +76,8 @@ build() {
 
 package() {
   cd $srcdir/${pkgname}-${pkgver}
+  # fix make install
+  mkdir -p $pkgdir/sbin
   make DESTDIR=$pkgdir install
 
   # support python2 (FS#25120)
@@ -91,7 +95,7 @@ package() {
   install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
   # systemd files
   for i in ${srcdir}/*.{service,mount}; do
-    install -D -m 644 $i "$pkgdir/"usr/lib/systemd/system/$(basename $i)
+    install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
   done
   install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
   # directories
diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service
new file mode 100644
index 000000000..16cb68bbb
--- /dev/null
+++ b/core/nfs-utils/blkmapd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=pNFS block layout mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/blkmapd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service
index 917e1b444..edd8c851d 100644
--- a/core/nfs-utils/rpc-mountd.service
+++ b/core/nfs-utils/rpc-mountd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=NFSv2/3 Mount Daemon
+Description=NFS Mount Daemon
 After=rpcbind.service nfsd.service
 Requires=rpcbind.service nfsd.service