Imported Debian patch 1.1.2-4

diff --git a/debian/changelog b/debian/changelog
index 4ddabc14cd86dd9e52d16623ea18dabd884b3c44..c9879264a6c6961aa0a80b33c3523f5577cde7a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.1.2-4) unstable; urgency=low
+
+  * 04-eacces-is-a-permanent-error.patch: New patch mirroring upstream git;
+    makes the text-based mounting interface (used with kernel >= 2.6.23) 
+    treat "access denied" as a permanent instead of a temporary error.
+    (Closes: #476128)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 07 May 2008 20:49:14 +0200
+
 nfs-utils (1:1.1.2-3) unstable; urgency=low
 
   * 02-fix-retry-option.patch: New patch from upstream, fixes interpretation

diff --git a/debian/patches/04-eacces-is-a-permanent-error.patch b/debian/patches/04-eacces-is-a-permanent-error.patch
new file mode 100644 (file)
index 0000000..d3d2406
--- /dev/null
+++ b/debian/patches/04-eacces-is-a-permanent-error.patch
@@ -0,0 +1,12 @@
+Index: nfs-utils-1.1.2/utils/mount/stropts.c
+===================================================================
+--- nfs-utils-1.1.2.orig/utils/mount/stropts.c
++++ nfs-utils-1.1.2/utils/mount/stropts.c
+@@ -252,7 +252,6 @@ static int set_mandatory_options(const c
+ static int is_permanent_error(int error)
+ {
+       switch (error) {
+-      case EACCES:
+       case ESTALE:
+       case ETIMEDOUT:
+       case ECONNREFUSED:

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