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

Conflicts:
	community-testing/packagekit/PKGBUILD
	community/bird/PKGBUILD
	community/camlp5/PKGBUILD
	community/exim/PKGBUILD
	community/ibus-table-extraphrase/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/torcs/PKGBUILD
	core/db/PKGBUILD
	core/iproute2/PKGBUILD
	core/libsasl/PKGBUILD
	core/openldap/PKGBUILD
	core/pam/PKGBUILD
	core/util-linux/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/php/PKGBUILD
	extra/postfix/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/redland/PKGBUILD
	extra/subversion/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/transmission/PKGBUILD
	extra/windowmaker/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-openssl/PKGBUILD

9 files changed, 128 insertions, 49 deletions

diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index 50a11313d..a9f751bca 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142177 2011-11-05 16:31:54Z stephane $
+# $Id: PKGBUILD 146445 2012-01-11 15:20:54Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=db
-pkgver=5.2.36
-pkgrel=2.1
+pkgver=5.3.15
+pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
@@ -14,7 +14,7 @@ depends=('gcc-libs' 'sh')
 options=('!libtool')
 install=db.install
 source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('1a7997e5bcdf504a439f90d9eaed63864806ed5f')
+sha1sums=('7683b632a01ff3543c379a120809a942ec457738')
 
 build() {
   cd "${srcdir}/$pkgname-${pkgver}/build_unix"
@@ -26,7 +26,7 @@ build() {
 package() {
   cd "${srcdir}/$pkgname-${pkgver}/build_unix"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/docs
+  rm -r "${pkgdir}"/usr/docs
   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
     "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD
index f02d49f08..3babe36a6 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142294 2011-11-08 00:38:03Z dreisner $
+# $Id: PKGBUILD 146434 2012-01-11 04:50:27Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=ed
-pkgver=1.5
-pkgrel=4
+pkgver=1.6
+pkgrel=1
 pkgdesc="A POSIX-compliant line-oriented text editor"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,10 +12,10 @@ url="http://www.gnu.org/software/ed/ed.html"
 depends=('glibc' 'sh')
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e66c03d7e4c67b025d5b6093ec678267')
+md5sums=('9a78593decccaa889523aa4bb555ed4b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/ \
               --mandir=/usr/share/man \
@@ -27,15 +27,11 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
+  make -C "$pkgname-$pkgver" check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make "DESTDIR=$pkgdir" install
+  make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install
 
   # nuke info pages
   rm -r "$pkgdir/usr/share/info"
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 3b0996dd0..84c10eeab 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 142382 2011-11-08 22:05:14Z ronald $
+# $Id: PKGBUILD 146447 2012-01-11 15:20:57Z stephane $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=2.6.39
-pkgrel=2.1
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('perl')
+depends=('glibc' 'db')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -18,17 +18,17 @@ replaces=('iproute')
 options=('!makeflags')
 backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
-source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz
-	'iproute2-fhs.patch')
-sha1sums=('9044ad0b4a34a377a54197724373330294d743c7'
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+	iproute2-fhs.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
           '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 
 build() {
-  cd $srcdir/iproute2-${pkgver}
-  
+  cd $srcdir/$pkgname-$pkgver
+
   # set correct fhs structure
-  patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
   ./configure
 
@@ -36,16 +36,16 @@ build() {
 }
 
 package() {
-  cd $srcdir/iproute2-${pkgver}
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # allow loopback to be started before /usr is mounted, this may not be supported in the future
-  mkdir -p ${pkgdir}/sbin
-  mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
-  ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+  mkdir -p "$pkgdir/sbin"
+  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
 
   # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
-  install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
+  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
 }
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index e04b555db..19065a8a0 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140271 2011-10-11 21:27:38Z jgc $
+# $Id: PKGBUILD 146449 2012-01-11 15:21:04Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-# This package spans multiple repositories. 
+# This package spans multiple repositories.
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
 #pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=8.1
+pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
+url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index d1ecd66c0..32a6acafe 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145244 2011-12-19 22:50:32Z eric $
+# $Id: PKGBUILD 146451 2012-01-11 15:21:08Z stephane $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.28
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 778b58e6e..a1d698271 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141297 2011-10-28 10:57:26Z tpowa $
+# $Id: PKGBUILD 146453 2012-01-11 15:21:11Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.5
-pkgrel=1.1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index a9abd4e12..7a1ee277e 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145797 2012-01-01 18:30:05Z dreisner $
+# $Id: PKGBUILD 146455 2012-01-11 15:21:16Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.14.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -19,7 +19,7 @@ perlbin.csh
 provides.pl
 0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
 install=perl.install
-options=('!makeflags' '!purge')
+options=('makeflags' '!purge')
 md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
@@ -57,7 +57,8 @@ build() {
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make test
+  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
+#  make test
 }
 
 package() {
diff --git a/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
new file mode 100644
index 000000000..993650b2c
--- /dev/null
+++ b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
@@ -0,0 +1,77 @@
+From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d@falconindy.com>
+Date: Sun, 11 Dec 2011 13:58:05 -0500
+Subject: [PATCH] findmnt: support alternative location of fstab
+
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/findmnt.8 |    6 ++++--
+ misc-utils/findmnt.c |    9 +++++----
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
+index 24e3a52..7f3dc6c 100644
+--- a/misc-utils/findmnt.8
++++ b/misc-utils/findmnt.8
+@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default.
+ .SH OPTIONS
+ .IP "\fB\-h, \-\-help\fP"
+ Print help and exit.
+-.IP "\fB\-s, \-\-fstab\fP"
++.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP"
+ Search in
+ .IR /etc/fstab
+ and
+ .IR /etc/fstab.d .
+-The output is in the list format (see --list).
++The output is in the list format (see --list). Optionally, search the file
++specified by
++.IR fstab .
+ .IP "\fB\-m, \-\-mtab\fP"
+ Search in
+ .IR /etc/mtab .
+diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
+index 4577dc6..5502a87 100644
+--- a/misc-utils/findmnt.c
++++ b/misc-utils/findmnt.c
+@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
+ 
+ 	fprintf(out, _(
+ 	"\nOptions:\n"
+-	" -s, --fstab            search in static table of filesystems\n"
++	" -s, --fstab[=<fstab>]  search in static table of filesystems\n"
+ 	" -m, --mtab             search in table of mounted filesystems\n"
+ 	" -k, --kernel           search in kernel table of mounted\n"
+         "                          filesystems (default)\n\n"));
+@@ -839,7 +839,7 @@ int main(int argc, char *argv[])
+ 	    { "direction",    1, 0, 'd' },
+ 	    { "evaluate",     0, 0, 'e' },
+ 	    { "first-only",   0, 0, 'f' },
+-	    { "fstab",        0, 0, 's' },
++	    { "fstab",        2, 0, 's' },
+ 	    { "help",         0, 0, 'h' },
+ 	    { "invert",       0, 0, 'i' },
+ 	    { "kernel",       0, 0, 'k' },
+@@ -872,7 +872,8 @@ int main(int argc, char *argv[])
+ 	tt_flags |= TT_FL_TREE;
+ 
+ 	while ((c = getopt_long(argc, argv,
+-				"acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) {
++				"acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:",
++				longopts, NULL)) != -1) {
+ 		switch(c) {
+ 		case 'a':
+ 			tt_flags |= TT_FL_ASCII;
+@@ -938,7 +939,7 @@ int main(int argc, char *argv[])
+ 		case 's':		/* fstab */
+ 			if (tabfile)
+ 				errx_mutually_exclusive("--{fstab,mtab,kernel}");
+-			tabfile = _PATH_MNTTAB;
++			tabfile = optarg ? optarg : _PATH_MNTTAB;
+ 			tt_flags &= ~TT_FL_TREE;
+ 			break;
+ 		case 'k':		/* kernel (mountinfo) */
+-- 
+1.7.8.1
+
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index c732a46ae..2ce762a71 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141022 2011-10-21 21:39:17Z tomegun $
+# $Id: PKGBUILD 146393 2012-01-10 11:39:59Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.20.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,8 @@ provides=('linux32' "util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
 #source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2
+	0001-findmnt-support-alternative-location-of-fstab.patch)
 optdepends=('perl: for chkdupexe support')
 
 build() {
@@ -25,6 +26,9 @@ build() {
   # hardware clock
   sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
 
+  # backport patch needed for usr support in initramfs
+  patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch
+
   ./configure --enable-arch\
               --enable-write\
               --enable-raw\
@@ -42,4 +46,5 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('079b37517fd4e002a2e6e992e8b4e361')
+md5sums=('079b37517fd4e002a2e6e992e8b4e361'
+         '823e2d87885b81f245b8c368e28f8cab')