Imported Debian patch 1.1.2-3

diff --git a/debian/changelog b/debian/changelog
index f5e7638b12b813087d78c111ce8e98484d465f20..4ddabc14cd86dd9e52d16623ea18dabd884b3c44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.1.2-3) unstable; urgency=low
+
+  * 02-fix-retry-option.patch: New patch from upstream, fixes interpretation
+    of the retry= option. (Closes: #476094)
+  * 03-handle-mtab-symlink.patch: New patch from Joey Hess, makes mount.nfs
+    handle symlinked /etc/mtab the way umount.nfs and util-linux handle it.
+    (Closes: #476577)
+  * Fix "pakage" typo in debian/copyright.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri, 25 Apr 2008 18:26:12 +0200
+
 nfs-utils (1:1.1.2-2) unstable; urgency=low
 
   * Remove ${misc:Depends} from binary variables -- it is not used, and not

diff --git a/debian/copyright b/debian/copyright
index c16b5546597be94fa731a3003d216393792cdbd2..b01120056cb56a578b395ada75b832a9c006743a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This package was debianized by Chip Salzenberg <chip@debian.org> on Fri,  3 Dec 1999 20:00:00 -0800
 
-The source pakage was downloaded from http://sourceforge.net/projects/nfs/.
+The source package was downloaded from http://sourceforge.net/projects/nfs/.
 
 View individual source files for respective authors.
 

diff --git a/debian/patches/02-fix-retry-option.patch b/debian/patches/02-fix-retry-option.patch
new file mode 100644 (file)
index 0000000..935cb3d
--- /dev/null
+++ b/debian/patches/02-fix-retry-option.patch
@@ -0,0 +1,104 @@
+text-based mount command: Fix retry= option
+
+Steinar Gunderson reports:
+
+"It seems retry= is now additive with the text-based mount interface. In
+particular, "mount -o retry=0" still gives a two-minute timeout."
+
+Make retry option parsing more robust, while we're at it.
+
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+---
+
+ utils/mount/stropts.c |   55 ++++++++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 43 insertions(+), 12 deletions(-)
+
+diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
+index cadb1f4..4df9ad9 100644
+--- a/utils/mount/stropts.c
++++ b/utils/mount/stropts.c
+@@ -65,6 +65,14 @@
+ #define NFS_MAXPATHNAME               (1024)
+ #endif
+ 
++#ifndef NFS_DEF_FG_TIMEOUT_MINUTES
++#define NFS_DEF_FG_TIMEOUT_MINUTES    (2ul)
++#endif
++
++#ifndef NFS_DEF_BG_TIMEOUT_MINUTES
++#define NFS_DEF_BG_TIMEOUT_MINUTES    (10000ul)
++#endif
++
+ extern int nfs_mount_data_version;
+ extern char *progname;
+ extern int verbose;
+@@ -141,6 +149,35 @@ static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
+ }
+ 
+ /*
++ * Set up a timeout value based on the value of the "retry=" option.
++ *
++ * Returns 1 if the option was parsed successfully, otherwise zero.
++ * Returns the parsed timeout, or the default, in *timeout.
++ */
++static int parse_retry_option(time_t *timeout, struct mount_options *options,
++                            unsigned long timeout_minutes)
++{
++      char *retry_option, *endptr;
++
++      retry_option = po_get(options, "retry");
++      if (retry_option) {
++              long tmp;
++
++              errno = 0;
++              tmp = strtol(retry_option, &endptr, 10);
++              if (errno || endptr == retry_option || tmp < 0) {
++                      nfs_error(_("%s: incorrect retry timeout specified"),
++                                      progname);
++                      return 0;
++              }
++              timeout_minutes = tmp;
++      }
++
++      *timeout = time(NULL) + (time_t)(timeout_minutes * 60);
++      return 1;
++}
++
++/*
+  * Append the 'addr=' option to the options string to pass a resolved
+  * server address to the kernel.  After a successful mount, this address
+  * is also added to /etc/mtab for use when unmounting.
+@@ -535,13 +572,10 @@ static int nfsmount_fg(const char *spec, const char *node,
+                      char **extra_opts)
+ {
+       unsigned int secs = 1;
+-      time_t timeout = time(NULL);
+-      char *retry;
++      time_t timeout;
+ 
+-      timeout += 60 * 2;              /* default: 2 minutes */
+-      retry = po_get(options, "retry");
+-      if (retry)
+-              timeout += 60 * atoi(retry);
++      if (!parse_retry_option(&timeout, options, NFS_DEF_FG_TIMEOUT_MINUTES))
++              return EX_FAIL;
+ 
+       if (verbose)
+               printf(_("%s: timeout set for %s"),
+@@ -612,13 +646,10 @@ static int nfsmount_child(const char *spec, const char *node,
+                         int fake, char **extra_opts)
+ {
+       unsigned int secs = 1;
+-      time_t timeout = time(NULL);
+-      char *retry;
++      time_t timeout;
+ 
+-      timeout += 60 * 10000;          /* default: 10,000 minutes */
+-      retry = po_get(options, "retry");
+-      if (retry)
+-              timeout += 60 * atoi(retry);
++      if (!parse_retry_option(&timeout, options, NFS_DEF_BG_TIMEOUT_MINUTES))
++              return EX_FAIL;
+ 
+       for (;;) {
+               if (sleep(secs))

diff --git a/debian/patches/03-handle-mtab-symlink.patch b/debian/patches/03-handle-mtab-symlink.patch
new file mode 100644 (file)
index 0000000..28211a5
--- /dev/null
+++ b/debian/patches/03-handle-mtab-symlink.patch
@@ -0,0 +1,43 @@
+Index: nfs-utils-1.1.2/utils/mount/fstab.c
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/mount/fstab.c
++++ nfs-utils-1.1.2/utils/mount/fstab.c
+@@ -52,7 +52,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;
+Index: nfs-utils-1.1.2/utils/mount/fstab.h
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/mount/fstab.h
++++ nfs-utils-1.1.2/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);
+ 
+Index: nfs-utils-1.1.2/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/mount/mount.c
++++ nfs-utils-1.1.2/utils/mount/mount.c
+@@ -257,6 +257,13 @@ static int add_mtab(char *spec, char *mo
+               return EX_SUCCESS;
+       }
+ 
++      /* 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();
+ 
+       mtab = nfs_setmntent(MOUNTED, "a+");

diff --git a/debian/patches/series b/debian/patches/series
index 6cf83a08b734ab47e49b40dca89888d3862357c7..6c57d4c341bf4bd07e82b967dc16eedaa2a7e182 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 01-sm-notify-in-sbin.patch
+02-fix-retry-option.patch
+03-handle-mtab-symlink.patch