Imported Debian patch 1.1.2-5

diff --git a/debian/changelog b/debian/changelog
index c9879264a6c6961aa0a80b33c3523f5577cde7a1..f2a0c7913783a39f8435d615418c7d767330b17d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+nfs-utils (1:1.1.2-5) unstable; urgency=high
+
+  * 05-default-use-old-mount-interface.patch: New patch, disables the
+    text-mounting interface by default. It seems to be a bit shaky still,
+    causes problems for several users (some of which are only fixable with a
+    kernel update). It will be turned back on again after lenny's release, but
+    for now we're reverting to the safe option.
+    (Closes: #473171, #478824, #475274, #478831)
+  * 06-dont-check-exec-bit.patch: New patch, removes check for executable bit
+    on mount points. (Closes: #478499)
+  * 07-remove-duplicate-exports-paragraphs.patch: New patch from Antonio
+    Ospite, removes some duplicate paragraphs in the exports man page.
+    (Closes: #488009)
+  * Add "no_subtree_check" option to packaged /etc/exports. (Closes: #485658)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri, 11 Jul 2008 18:45:45 +0200
+

 nfs-utils (1:1.1.2-4) unstable; urgency=low
 
   * 04-eacces-is-a-permanent-error.patch: New patch mirroring upstream git;
 nfs-utils (1:1.1.2-4) unstable; urgency=low
 
   * 04-eacces-is-a-permanent-error.patch: New patch mirroring upstream git;

diff --git a/debian/etc.exports b/debian/etc.exports
index 4bb425bffa24101fbe5e0f0ff03dfb576c88cec3..9bff68017b1fb0c034d558c8edb3657c69528c5f 100644 (file)
--- a/debian/etc.exports
+++ b/debian/etc.exports
@@ -2,9 +2,9 @@
 #              to NFS clients.  See exports(5).
 #
 # Example for NFSv2 and NFSv3:
 #              to NFS clients.  See exports(5).
 #
 # Example for NFSv2 and NFSv3:

-# /srv/homes       hostname1(rw,sync) hostname2(ro,sync)
+# /srv/homes       hostname1(rw,sync,no_subtree_check) hostname2(ro,sync,no_subtree_check)

 #
 # Example for NFSv4:
 #
 # Example for NFSv4:

-# /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt)
-# /srv/nfs4/homes  gss/krb5i(rw,sync)
+# /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check)
+# /srv/nfs4/homes  gss/krb5i(rw,sync,no_subtree_check)

 #
 #

diff --git a/debian/patches/05-default-use-old-mount-interface.patch b/debian/patches/05-default-use-old-mount-interface.patch
new file mode 100644 (file)
index 0000000..798505b
--- /dev/null
+++ b/debian/patches/05-default-use-old-mount-interface.patch
@@ -0,0 +1,14 @@
+Index: nfs-utils-1.1.2/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/mount/mount.c   2008-07-11 18:56:00.000000000 +0200
++++ nfs-utils-1.1.2/utils/mount/mount.c        2008-07-11 18:56:06.000000000 +0200
+@@ -189,9 +189,6 @@
+       }
+       if (nfs_mount_data_version > NFS_MOUNT_VERSION)
+               nfs_mount_data_version = NFS_MOUNT_VERSION;
+-      else
+-              if (kernel_version > MAKE_VERSION(2, 6, 22))
+-                      string++;
+ }
+ 
+ static void print_one(char *spec, char *node, char *type, char *opts)

diff --git a/debian/patches/06-dont-check-exec-bit.patch b/debian/patches/06-dont-check-exec-bit.patch
new file mode 100644 (file)
index 0000000..28606e2
--- /dev/null
+++ b/debian/patches/06-dont-check-exec-bit.patch
@@ -0,0 +1,15 @@
+Index: nfs-utils-1.1.2/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/mount/mount.c   2008-07-11 18:59:58.000000000 +0200
++++ nfs-utils-1.1.2/utils/mount/mount.c        2008-07-11 18:59:58.000000000 +0200
+@@ -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;
+ }

diff --git a/debian/patches/07-remove-duplicate-exports-paragraphs.patch b/debian/patches/07-remove-duplicate-exports-paragraphs.patch
new file mode 100644 (file)
index 0000000..8bc59f9
--- /dev/null
+++ b/debian/patches/07-remove-duplicate-exports-paragraphs.patch
@@ -0,0 +1,25 @@
+Index: nfs-utils-1.1.2/utils/exportfs/exports.man
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/exportfs/exports.man    2008-03-14 16:46:29.000000000 +0100
++++ nfs-utils-1.1.2/utils/exportfs/exports.man 2008-07-11 18:57:46.000000000 +0200
+@@ -365,20 +365,6 @@
+ will be given this list of alternatives. (Note that actual replication
+ of the filesystem must be handled elsewhere.)
+ 
+-.TP
+-.IR refer= path@host[+host][:path@host[+host]]
+-A client referencing the export point will be directed to choose from
+-the given list an alternative location for the filesystem.
+-(Note that the server must have a mountpoint here, though a different
+-filesystem is not required; so, for example,
+-.IR "mount --bind" " /path /path"
+-is sufficient.)
+-.TP
+-.IR replicas= path@host[+host][:path@host[+host]]
+-If the client asks for alternative locations for the export point, it
+-will be given this list of alternatives. (Note that actual replication
+-of the filesystem must be handled elsewhere.)
+-
+ .SS User ID Mapping
+ .PP
+ .I nfsd

diff --git a/debian/patches/series b/debian/patches/series
index 8defecf59825bf6aea102829ffbd33ffa56934c9..b150fe2ca98910dca8aad0f064c2c6bd2ebdef70 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,6 @@
 02-fix-retry-option.patch
 03-handle-mtab-symlink.patch
 04-eacces-is-a-permanent-error.patch
 02-fix-retry-option.patch
 03-handle-mtab-symlink.patch
 04-eacces-is-a-permanent-error.patch

+05-default-use-old-mount-interface.patch
+06-dont-check-exec-bit.patch
+07-remove-duplicate-exports-paragraphs.patch