diff -Nru nfs-utils-1.2.5/debian/changelog nfs-utils-1.2.5/debian/changelog --- nfs-utils-1.2.5/debian/changelog 2012-09-28 13:28:41.000000000 -0500 +++ nfs-utils-1.2.5/debian/changelog 2014-11-14 15:21:18.000000000 -0600 @@ -1,3 +1,10 @@ +nfs-utils (1:1.2.5-3ubuntu3.2) precise; urgency=medium + + * Fix mount.nfs so that it falls back to v3 when ipv4 and ipv6 name resolution + is present, but nfsv4 is not. present. LP: #1391662 + + -- Dave Chiluk Fri, 14 Nov 2014 14:05:18 -0600 + nfs-utils (1:1.2.5-3ubuntu3.1) precise-proposed; urgency=low [ Matthew L. Dailey ] diff -Nru nfs-utils-1.2.5/debian/patches/20-fallback-to-v3.patch nfs-utils-1.2.5/debian/patches/20-fallback-to-v3.patch --- nfs-utils-1.2.5/debian/patches/20-fallback-to-v3.patch 1969-12-31 18:00:00.000000000 -0600 +++ nfs-utils-1.2.5/debian/patches/20-fallback-to-v3.patch 2014-11-14 15:20:51.000000000 -0600 @@ -0,0 +1,46 @@ +Description: Allow fallback to v3 when v4 is not present + Upstream Comment + " + mount.nfs: Mount should really return from errno test + + We should only try next address family if we meet ECONNREFUSED or + EHOSTUNREACH for v4 or ECONNREFUSED or EOPNOTSUPP or EHOSTUNREACH for v3v2. + Before, only a break in swich can not make the program out of for loop. + + Signed-off-by: Yang Bai + Signed-off-by: Steve Dickson + " + + Fix mount.nfs so that it falls back to v3 when ipv4 and ipv6 name resolution + is present, but nfsv4 is not. present. LP: #1391662 + +Author: Dave Chiluk +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1391662 +Origin: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=9da66f8898a6 + +--- nfs-utils-1.2.5.orig/utils/mount/stropts.c ++++ nfs-utils-1.2.5/utils/mount/stropts.c +@@ -665,9 +665,10 @@ static int nfs_try_mount_v3v2(struct nfs + case EHOSTUNREACH: + continue; + default: +- break; ++ goto out; + } + } ++out: + return ret; + } + +@@ -751,9 +752,10 @@ static int nfs_try_mount_v4(struct nfsmo + case EHOSTUNREACH: + continue; + default: +- break; ++ goto out; + } + } ++out: + return ret; + } + diff -Nru nfs-utils-1.2.5/debian/patches/series nfs-utils-1.2.5/debian/patches/series --- nfs-utils-1.2.5/debian/patches/series 2012-09-28 13:28:41.000000000 -0500 +++ nfs-utils-1.2.5/debian/patches/series 2014-11-14 14:08:56.000000000 -0600 @@ -6,3 +6,4 @@ 17-multiarch-kerberos-paths.patch 18-dont-use-PAGE_SIZE.patch 19-ticket-expired-error.patch +20-fallback-to-v3.patch