[arch-commits] Commit in mkinitcpio-nfs-utils/trunk (3 files)

[Dave Reisner]

    Date: Saturday, November 10, 2012 @ 20:29:19
  Author: dreisner
Revision: 170762

upgpkg: mkinitcpio-nfs-utils 0.3-4

- backport fix for wrong umount path (FS#32021)
- explicitly add nfsv3 module

Added:
  mkinitcpio-nfs-utils/trunk/nfsmount-fix-wrong-umount-path.patch
Modified:
  mkinitcpio-nfs-utils/trunk/PKGBUILD
  mkinitcpio-nfs-utils/trunk/initcpio-install-net

--------------------------------------+
 PKGBUILD                             |   13 ++++++++++---
 initcpio-install-net                 |    1 +
 nfsmount-fix-wrong-umount-path.patch |   14 ++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-11 00:52:38 UTC (rev 170761)
+++ PKGBUILD	2012-11-11 01:29:19 UTC (rev 170762)
@@ -3,21 +3,28 @@
 
 pkgname=mkinitcpio-nfs-utils
 pkgver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/"
 license=('GPL2')
 depends=('glibc')
 source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz"
+        'nfsmount-fix-wrong-umount-path.patch'
         'initcpio-install-net'
         'initcpio-hook-net')
 sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939'
-            '8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861'
+            '6edb239f3d541b8ddee816e2d18bfb3ee1d3f5f8827769674cc8bf2a7ce38f21'
+            'ce9f021763c020b9b62a761974437fd1e9e894df3effc58e71671bf83b061255'
             '29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e')
 
 build() {
-  make -C "$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
+
+  # upstream commit 029622dfbfe25203275a385a5bf33d44c2409b00
+  patch -Np1 < "$srcdir/nfsmount-fix-wrong-umount-path.patch"
+
+  make
 }
 
 package() {

Modified: initcpio-install-net
===================================================================
--- initcpio-install-net	2012-11-11 00:52:38 UTC (rev 170761)
+++ initcpio-install-net	2012-11-11 01:29:19 UTC (rev 170762)
@@ -2,6 +2,7 @@
 
 build() {
     add_checked_modules '/drivers/net/'
+    add_module nfsv3?
 
     add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig"
     add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount"

Added: nfsmount-fix-wrong-umount-path.patch
===================================================================
--- nfsmount-fix-wrong-umount-path.patch	                        (rev 0)
+++ nfsmount-fix-wrong-umount-path.patch	2012-11-11 01:29:19 UTC (rev 170762)
@@ -0,0 +1,14 @@
+--- a/nfsmount/mount.c	2012-11-10 20:16:31.894540497 -0500
++++ b/nfsmount/mount.c	2012-11-10 20:16:39.957369011 -0500
+@@ -358,9 +358,9 @@
+       bail:
+ 	if (mounted) {
+ 		if (data->flags & NFS_MOUNT_VER3) {
+-			umount_v3(path, clnt);
++			umount_v3(rem_path, clnt);
+ 		} else {
+-			umount_v2(path, clnt);
++			umount_v2(rem_path, clnt);
+ 		}
+ 	}
+