From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 14 Jul 2010 02:40:48 +0000 (+0100)
Subject: mount.nfs: Preserve explicit port=2049 option (Closes: #582003)
X-Git-Tag: debian/1%1.2.2-3~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e8bf7bbe4cb900fc3c9813c5aad3525168e1c403;p=nfs-utils.git

mount.nfs: Preserve explicit port=2049 option (Closes: #582003)
---

diff --git a/debian/changelog b/debian/changelog
index c2eab80..0d5b199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 nfs-utils (1:1.2.2-3) UNRELEASED; urgency=low
 
-  *
+  * mount.nfs: Preserve explicit port=2049 option (Closes: #582003)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 14 Jul 2010 03:37:03 +0100
 
diff --git a/debian/patches/13-preserve-explicit-port-2049.patch b/debian/patches/13-preserve-explicit-port-2049.patch
new file mode 100644
index 0000000..5d270c9
--- /dev/null
+++ b/debian/patches/13-preserve-explicit-port-2049.patch
@@ -0,0 +1,17 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: [PATCH] mount.nfs: Preserve any explicit port=2049 option
+
+This addresses Debian bug #582003.
+--- nfs-utils-1.2.2.orig/utils/mount/stropts.c
++++ nfs-utils-1.2.2/utils/mount/stropts.c
+@@ -434,8 +434,8 @@
+ 	if (po_append(options, new_option) == PO_FAILED)
+ 		return 0;
+ 
+-	po_remove_all(options, "port");
+-	if (nfs_pmap->pm_port != NFS_PORT) {
++	if (po_remove_all(options, "port") == PO_FOUND ||
++		nfs_pmap->pm_port != NFS_PORT) {
+ 		snprintf(new_option, sizeof(new_option) - 1,
+ 			 "port=%lu", nfs_pmap->pm_port);
+ 		if (po_append(options, new_option) == PO_FAILED)
diff --git a/debian/patches/series b/debian/patches/series
index abd79b3..bbc16aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 07-remove-duplicate-exports-paragraphs.patch
 11-532048-reduce-verbosity.patch
 12-svcgssd-document-n-option.patch
+13-preserve-explicit-port-2049.patch