Wed Feb 29 03:34:34 UTC 2012

3 files changed, 43 insertions, 7 deletions

diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
index eb544af43..5533afa39 100644
--- a/testing/libarchive/PKGBUILD
+++ b/testing/libarchive/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 151123 2012-02-25 01:41:48Z dreisner $
+# $Id: PKGBUILD 151513 2012-02-27 05:06:31Z dreisner $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=libarchive
 pkgver=3.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
-options=('!libtool')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
 source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
         'interpret-non-posix-zips.patch'
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
index db0001a93..9b871e433 100644
--- a/testing/util-linux/PKGBUILD
+++ b/testing/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151117 2012-02-25 00:42:27Z tomegun $
+# $Id: PKGBUILD 151587 2012-02-27 18:50:38Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.21
-pkgrel=2
+pkgrel=3
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -18,7 +18,8 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${
 	libmount-canonicalize-all-paths-from-fs-tab.patch
 	lib-canonicalize-always-remove-tailing-slash.patch
 	libmount-canonicalize-targets-from-fstab-on-mount-a.patch
-	mount-new-cleanup-mount-a-return-codes.patch)
+	mount-new-cleanup-mount-a-return-codes.patch
+	libmount-use-mount.-type-s-for-NFS-only.patch)
 optdepends=('perl: for chkdupexe support')
 
 build() {
@@ -31,6 +32,7 @@ build() {
   patch -p1 -i ../lib-canonicalize-always-remove-tailing-slash.patch
   patch -p1 -i ../libmount-canonicalize-targets-from-fstab-on-mount-a.patch
   patch -p1 -i ../mount-new-cleanup-mount-a-return-codes.patch 
+  patch -p1 -i ../libmount-use-mount.-type-s-for-NFS-only.patch
 
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
@@ -58,4 +60,5 @@ md5sums=('208aa058f4117759d2939d1be7d662fc'
          'c4011222a19b020d9b8465c3c7e443f6'
          '8c1bf7b10e22e2b835441e6ae2d804d6'
          '7b92423c588ed35229a9a166349c29a9'
-         'c483ab2d52609b5857d096b256a5075c')
+         'c483ab2d52609b5857d096b256a5075c'
+         'e31037773db7f3244b71db434f60e6f0')
diff --git a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch b/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch
new file mode 100644
index 000000000..9041ab742
--- /dev/null
+++ b/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch
@@ -0,0 +1,34 @@
+From 9bf9690114b7432144caf815e149e35640bc3ad0 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 27 Feb 2012 16:43:12 +0100
+Subject: [PATCH] libmount: use mount.<type> -s for NFS only
+
+Unfortunately, it seems that for example mount.cifs don't care about
+the API, so we need exception like the original mount(8).
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libmount/src/context_mount.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
+index 8cbc25b..a0c5951 100644
+--- a/libmount/src/context_mount.c
++++ b/libmount/src/context_mount.c
+@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt)
+ 		args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */
+ 		args[i++] = mnt_fs_get_target(cxt->fs);	/* 3 */
+ 
+-		if (mnt_context_is_sloppy(cxt))
++		/*
++		 * TODO: remove the exception for "nfs", -s is documented
++		 *       for years should be usable everywhere.
++		 */
++		if (mnt_context_is_sloppy(cxt) &&
++		    type && startswith(type, "nfs"))
+ 			args[i++] = "-s";		/* 4 */
+ 		if (mnt_context_is_fake(cxt))
+ 			args[i++] = "-f";		/* 5 */
+-- 
+1.7.9.2
+