X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F13-preserve-explicit-port-2049.patch;fp=debian%2Fpatches%2F13-preserve-explicit-port-2049.patch;h=5d270c94a2077cc5b4767f0a2c7d1ab7119805d5;hb=e8bf7bbe4cb900fc3c9813c5aad3525168e1c403;hp=0000000000000000000000000000000000000000;hpb=1ebb17941e49e14b9b9428a63024e133ed4548f0;p=nfs-utils.git

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)