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

diff --git a/debian/patches/13-preserve-explicit-port-2049.patch b/debian/patches/13-preserve-explicit-port-2049.patch
deleted file mode 100644
index 5d270c9..0000000
--- a/debian/patches/13-preserve-explicit-port-2049.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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)