Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/mplayer2/PKGBUILD
	community/pcmanfm/PKGBUILD
	extra/liblrdf/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/sqlite/PKGBUILD
	kde-unstable/libkgapi/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	multilib/lib32-sqlite3/PKGBUILD

7 files changed, 74 insertions, 25 deletions

diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index e58947f8d..3a6390613 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144989 2011-12-13 15:25:38Z tomegun $
+# $Id: PKGBUILD 160065 2012-05-29 18:46:25Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.05.2
-pkgrel=2
+pkgver=2012.06.11
+pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=182' 'udev<=183' 'iproute2'
+depends=('glibc' 'bash' 'grep' 'coreutils' 'systemd-tools' 'iproute2'
          'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
@@ -23,11 +23,11 @@ makedepends=(asciidoc)
 install=initscripts.install
 source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
         'wireless.conf.d')
-md5sums=('2b845c1c6660b32720aa12aa5f9649be'
-         '027576534885b8d5dded9be546057b12')
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
+md5sums=('886fba51e5ec348f64604ac91c13548e'
+         '027576534885b8d5dded9be546057b12')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index ac7ab36e8..f8c0edc6a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -11,7 +11,7 @@ _kernelname=-LIBRE-LTS
 _basekernel=3.0
 _sublevel=34
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.32 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.34 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         '9c4fed22ad8ea99a54d20c22a63ad3d7')
+         '1a107ca509aec77af60fe8e9612c9fae')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 55ed9e496..ba3511bcf 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -8,8 +8,10 @@ post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if command -v mkinitcpio 2>&1 > /dev/null; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 
   # compat symlinks for the official kernels only
   if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -51,8 +53,10 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if command -v mkinitcpio 2>&1 > /dev/null; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 }
 
 post_remove() {
diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch
new file mode 100644
index 000000000..5c3245669
--- /dev/null
+++ b/libre/linux-libre/3.4.2-rpc_pipefs.patch
@@ -0,0 +1,34 @@
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 0404047..21fde99 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head,
+ 		msg->errno = err;
+ 		destroy_msg(msg);
+ 	} while (!list_empty(head));
+-	wake_up(waitq);
++
++	if (waitq)
++		wake_up(waitq);
+ }
+ 
+ static void
+@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work)
+ 	}
+ 	dentry = dget(pipe->dentry);
+ 	spin_unlock(&pipe->lock);
+-	if (dentry) {
+-		rpc_purge_list(&RPC_I(dentry->d_inode)->waitq,
+-			       &free_list, destroy_msg, -ETIMEDOUT);
+-		dput(dentry);
+-	}
++	rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL,
++			&free_list, destroy_msg, -ETIMEDOUT);
++	dput(dentry);
+ }
+ 
+ ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg,
+-- 
+1.7.7.6
+
+  
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index a5a55e621..573992b77 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -14,8 +14,8 @@ _kernelname=-LIBRE
 _basekernel=3.4
 _sublevel=2
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
-pkgrel=1
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,6 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
+        '3.4.2-rpc_pipefs.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          'ea827952923c8a926c0831ad3f124190'
@@ -43,7 +44,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         'f70a4bf0ee00d8be680cfbd65459836d')
+         '0851216ee7ac3aad76438bb937314fd1'
+         '972b3b460764780ee48f031a043a9c09')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -60,6 +62,11 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
+  # fix nfs4 regression
+  patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch"
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
   # Some chips detect a ghost TV output
   # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
   # Arch Linux bug report: FS#19234
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 584f0f645..2f2944e2b 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,14 +2,16 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.4.2-1-LIBRE
+KERNEL_VERSION=3.4.2-2-LIBRE
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if command -v mkinitcpio 2>&1 > /dev/null; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 
   # compat symlinks for the official kernels only
   if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -51,8 +53,10 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if command -v mkinitcpio 2>&1 > /dev/null; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 }
 
 post_remove() {
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index 41b7cc5ce..1166cd2d0 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: N30N <archlinux@alunamation.com>
 
 pkgname=unarchiver
-pkgver=3.1
-pkgrel=2
+pkgver=3.2
+pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
@@ -13,9 +13,9 @@ makedepends=('gcc-objc')
 source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip"
         "native_obj_exceptions.patch"
         "libz.patch")
-sha1sums=('a8a28e3372a8811689c39871f5de86c64c8c466c'
-          'b8024026607dc2de758479b73d8b01ca6f692b59'
-          '003d114a0ba9a919af602881ef5e04cdba2e4c50')
+md5sums=('a23d7fbfe1f66b0950a359f206df5c8d'
+         '4fa4ecc6e4ba14d3b6952d064e728511'
+         '665d01bf93191cc6f57dc80d8c1d3d5a')
 
 build() {
   cd "$srcdir/The Unarchiver"