[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs-utils-1.1.4-no-exec.patch nfs-utils-1.1.4-ascii-man.patch nfs-utils-1.1.4-mtab-sym.patch

[Mike Frysinger (vapier)]

vapier      09/01/31 22:20:24

  Added:                nfs-utils-1.1.4-no-exec.patch
                        nfs-utils-1.1.4-ascii-man.patch
                        nfs-utils-1.1.4-mtab-sym.patch
  Log:
  Add some fixes from Debian and push out init.d fixes.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch?rev=1.1&content-type=text/plain

Index: nfs-utils-1.1.4-no-exec.patch
===================================================================
ripped from Debian

--- nfs-utils-1.1.2/utils/mount/mount.c
+++ nfs-utils-1.1.2/utils/mount/mount.c
@@ -381,10 +381,6 @@
 		mount_error(NULL, mount_point, ENOTDIR);
 		return 1;
 	}
-	if (access(mount_point, X_OK) < 0) {
-		mount_error(NULL, mount_point, errno);
-		return 1;
-	}
 
 	return 0;
 }



1.1                  net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch?rev=1.1&content-type=text/plain

Index: nfs-utils-1.1.4-ascii-man.patch
===================================================================
ripped from Debian

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
patch by nbreen@×××.net (Nicholas Breen)

--- nfs-utils-1.1.3/utils/mount/nfs.man
+++ nfs-utils-1.1.3/utils/mount/nfs.man
@@ -799,7 +799,7 @@
 and server load.
 .P
 However, UDP can be quite effective in specialized settings where  
-the network’s MTU is large relative to NFS’s data transfer size (such  
+the network's MTU is large relative to NFS's data transfer size (such  
 as network environments that enable jumbo Ethernet frames).  In such  
 environments, trimming the 
 .B rsize 



1.1                  net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch?rev=1.1&content-type=text/plain

Index: nfs-utils-1.1.4-mtab-sym.patch
===================================================================
ripped from Debian

--- nfs-utils-1.1.4/utils/mount/fstab.c
+++ nfs-utils-1.1.4/utils/mount/fstab.c
@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
 	return var_mtab_does_not_exist;
 }
 
-static int
+int
 mtab_is_a_symlink(void) {
         get_mtab_info();
         return var_mtab_is_a_symlink;
--- nfs-utils-1.1.4/utils/mount/fstab.h
+++ nfs-utils-1.1.4/utils/mount/fstab.h
@@ -7,6 +7,7 @@
 #define _PATH_FSTAB "/etc/fstab"
 #endif
 
+int mtab_is_a_symlink(void);
 int mtab_is_writable(void);
 int mtab_does_not_exist(void);
 void reset_mtab_info(void);
--- nfs-utils-1.1.4/utils/mount/mount.c
+++ nfs-utils-1.1.4/utils/mount/mount.c
@@ -230,6 +230,13 @@ create_mtab (void) {
 	int flags;
 	mntFILE *mfp;
 
+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
+	   that would create a file /proc/mounts in case the proc filesystem
+	   is not mounted, and the fchmod below would also fail. */
+	if (mtab_is_a_symlink()) {
+		return EX_SUCCESS;
+	}
+
 	lock_mtab();
 
 	mfp = nfs_setmntent (MOUNTED, "a+");