diffstat of debian/ for nfs-utils_1.3.4-2.1 nfs-utils_1.3.4-2.1ubuntu2 changelog | 804 ++++++++++++- control | 3 nfs-common.default | 5 nfs-common.maintscript | 9 patches/20-ticket-expired-error.patch | 71 + patches/90-gss-free-lucid-sec-context.patch | 20 patches/remove-gssproxy.patch | 57 patches/series | 4 patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch | 44 tests/local-server-client | 2 10 files changed, 1011 insertions(+), 8 deletions(-) diff -Nru nfs-utils-1.3.4/debian/changelog nfs-utils-1.3.4/debian/changelog --- nfs-utils-1.3.4/debian/changelog 2017-03-20 15:07:55.000000000 +0000 +++ nfs-utils-1.3.4/debian/changelog 2017-09-01 06:08:25.000000000 +0000 @@ -1,3 +1,35 @@ +nfs-utils (1:1.3.4-2.1ubuntu2) artful; urgency=medium + + * Fix flaky autopkgtest: a 'sync' after an update on the server does not + guarantee that the change is visible on the client. For that, we need + to flush the inode/dentry cache instead. + + -- Steve Langasek Thu, 31 Aug 2017 23:08:25 -0700 + +nfs-utils (1:1.3.4-2.1ubuntu1) artful; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel + on ticket expiry. (LP: #794112) + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx + argument of the serialize_krb5_ctx() function. (LP: #1331201) + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu + (LP: #1446851) + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart + jobs) on upgrades. This needs to be kept until after 18.04 LTS. + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency + to avoid race conditions: + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch + * Dropped already integrated changes: + - Add a dependency on keyutils to nfs-common, so that idmapping will work + under systemd. (LP: #1449074) + + -- Balint Reczey Thu, 03 Aug 2017 20:50:38 +0200 + nfs-utils (1:1.3.4-2.1) unstable; urgency=medium * Non-maintainer upload. @@ -31,6 +63,22 @@ -- Daniel Pocock Tue, 13 Dec 2016 19:37:42 +0100 +nfs-utils (1:1.2.8-9.2ubuntu2) zesty; urgency=medium + + * Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency + to avoid race conditions: + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch + - Add systemd-unit-files-fix-up-dependencies-on-rpcbind.patch + + -- Rafael David Tinoco Fri, 17 Mar 2017 12:19:53 +0100 + +nfs-utils (1:1.2.8-9.2ubuntu1) yakkety; urgency=medium + + * Merge fixes from Debian. + + -- Martin Pitt Mon, 12 Sep 2016 23:18:00 +0200 + nfs-utils (1:1.2.8-9.2) unstable; urgency=medium * Non-maintainer upload. @@ -46,6 +94,27 @@ -- Andreas Henriksson Thu, 11 Aug 2016 18:50:24 +0200 +nfs-utils (1:1.2.8-9.1ubuntu1) yakkety; urgency=medium + + * Drop upstart jobs, upstart is not in yakkety any more. + * Drop libgssglue-dev build dep, --with-gssglue got dropped a while ago. + * Merge with Debian unstable. Remaining Ubuntu changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel + on ticket expiry. (LP: #794112) + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx + argument of the serialize_krb5_ctx() function. (LP: #1331201) + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu + (LP: #1446851) + - Add a dependency on keyutils to nfs-common, so that idmapping will work + under systemd. (LP: #1449074) + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart + jobs) on upgrades. This needs to be kept until after 18.04 LTS. + + -- Martin Pitt Thu, 28 Jul 2016 15:21:53 +0200 + nfs-utils (1:1.2.8-9.1) unstable; urgency=medium Partial sync from ubuntu, included changes: @@ -110,6 +179,149 @@ -- Andreas Henriksson Tue, 28 Jun 2016 02:05:16 +0200 +nfs-utils (1:1.2.8-9ubuntu13) yakkety; urgency=medium + + * Drop obsolete versioned initscripts dependency. (Closes: #804990) + + -- Martin Pitt Wed, 22 Jun 2016 16:09:37 +0200 + +nfs-utils (1:1.2.8-9ubuntu12) xenial; urgency=medium + + * Drop gssproxy as it's not in Ubuntu (LP: #1446851) + * Fix no nfs doesn't show failed units on client (LP: #1452667) + + -- Bryan Quigley Wed, 02 Mar 2016 15:01:29 -0500 + +nfs-utils (1:1.2.8-9ubuntu11) xenial; urgency=medium + + * Drop obsolete and no-op dh_installinit --upstart-only option. + (LP: #1519228) + + -- Martin Pitt Tue, 24 Nov 2015 09:39:56 +0100 + +nfs-utils (1:1.2.8-9ubuntu10) wily; urgency=medium + + * debian/nfs-common.links: Add naming compatibility symlinks for + gssd.service → rpc-gssd.service and idmapd.service → /dev/null (as this + is bound to/handled by nfs-server.service) to provide a match for the + upstart job names. (LP: #1476010). + + -- Martin Pitt Fri, 28 Aug 2015 09:59:48 +0200 + +nfs-utils (1:1.2.8-9ubuntu9) wily; urgency=medium + + * Drop versioned mountall dependency. Trusty's is already newer and we don't + need it with systemd under Ubuntu 15.04 and newer. + + -- Martin Pitt Mon, 27 Jul 2015 10:37:24 +0200 + +nfs-utils (1:1.2.8-9ubuntu8.1) vivid; urgency=medium + + * Add a dependency on keyutils to nfs-common, so that idmapping will work + under systemd. LP: #1449074. + + -- Steve Langasek Mon, 27 Apr 2015 17:46:03 +0200 + +nfs-utils (1:1.2.8-9ubuntu8) vivid; urgency=medium + + * Ship missing .override files + * Ensure we only remove the manual flag from the statd-mounting.override + file, and potentially, remove it if empty. + + -- Didier Roche Wed, 01 Apr 2015 08:22:59 +0200 + +nfs-utils (1:1.2.8-9ubuntu7) vivid; urgency=medium + + * 27-systemd-enable-with-systemctl-statd.patch: let the admin + enable/disable statd via systemd tools. (LP: #1428486) + * debian/nfs-common.default: remove NEED_STATD and related comment. + * debian/statd{,-mounting}.upstart: remove the usage of NEED_STATD, we'll + directly disable the jobs now. + * debian/rules: don't start statd by default (or it will trigger upstart + and systemd statd unit startup). + * debian/nfs-common.{preinst,postinst}: transition the conffile to the new + template and enable statd services in both upstart and systemd if + NEED_STATD was set to yes. + * debian/control, debian/*install: move nfs-utils.service to nfs-common + package. (LP: #1436304) + + -- Didier Roche Thu, 12 Mar 2015 09:13:06 +0100 + +nfs-utils (1:1.2.8-9ubuntu6) vivid; urgency=medium + + * Revert previous upload; per upstream, rpc.idmapd is not used when the + nfsidmap utility is available and configured for use in request-key + upcalls. So rpc.idmapd does not need to be started on clients anymore. + + -- Steve Langasek Fri, 06 Mar 2015 10:19:57 -0800 + +nfs-utils (1:1.2.8-9ubuntu5) vivid; urgency=medium + + * Add 27-systemd-start-nfs-idmapd-also-on-clients.patch: idmapd is needed + for clients too, so start it from nfs-client.target and stop binding to it + in nfs-server.service. (LP: #1428961) + + -- Martin Pitt Fri, 06 Mar 2015 11:56:46 +0100 + +nfs-utils (1:1.2.8-9ubuntu4) vivid; urgency=medium + + * Add autopkgtest for installing server and client on localhost, setting up + two exports, rebooting, and ensuring that the NFS mounts work. + * Add 23-systemd-relax-dependencies.patch: Stop depending on basic.target in + the daemons which still do; i. e. add DefaultDependencies=no. This makes + it possible to run NFS during early boot, helps if you e. g. have /var + on NFS, and avoids dependency cycles with rcS init.d scripts which depend + on $remote_fs. (LP: #1428487) + * Shift number prefixes of other systemd patches accordingly, and adjust + them to the above patch. + + -- Martin Pitt Thu, 05 Mar 2015 10:43:54 +0100 + +nfs-utils (1:1.2.8-9ubuntu3) vivid; urgency=medium + + * Add 00git-start-statd-systemd.patch: Latest start-statd script from + 1.3.2 to start rpc-statd.service under systemd. + * Add 23-systemd-pipefs_in_run.patch: systemd: Mount rpc_pipefs in /run instead of + /var/lib/nfs/, like in the upstart units. + * Add 24-systemd-daemon-paths.patch: Adjust program paths in systemd units. + * debian/nfs-kernel-server.links: Add nfs-kernel-server.service alias + symlink, to match SysV init script. + * Add 25-systemd-server-before-client.patch: Order NFS server before client, + to make mounting NFS shares from localhost work reliably. + * Add debian/nfs-utils_env.sh: Translate our /etc/default files into runtime + configuration for nfs-config.service. + * debian/nfs-{common,kernel-server}.install: Install systemd units. + * debian/rules: Enable/start systemd units. (LP: #1312976) + + -- Martin Pitt Thu, 05 Mar 2015 07:46:41 +0100 + +nfs-utils (1:1.2.8-9ubuntu2) vivid; urgency=medium + + * debian/nfs-common.statd.upstart: wait for rpcbind job instead of + relying on portmap compatibility event. (LP: #1391296) + + -- Marc Deslauriers Tue, 18 Nov 2014 19:07:15 -0500 + +nfs-utils (1:1.2.8-9ubuntu1) utopic; urgency=medium + + * Merge from Debian usntable, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs + due to EKEYEXPIRED error from kernel on ticket expiry. + - drop nfs-kernel-server's LSB dependency on nfs-common. + - Add patch to adjust for changes to the ctx argument of the + serialize_krb5_ctx() function. + + -- Steve Langasek Thu, 21 Aug 2014 11:29:38 -0700 + nfs-utils (1:1.2.8-9) unstable; urgency=medium * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc- @@ -118,6 +330,26 @@ -- Steve Langasek Tue, 12 Aug 2014 17:12:38 -0700 +nfs-utils (1:1.2.8-8ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs + due to EKEYEXPIRED error from kernel on ticket expiry. + - drop nfs-kernel-server's LSB dependency on nfs-common. + - Add patch to adjust for changes to the ctx argument of the + serialize_krb5_ctx() function. + + -- Steve Langasek Mon, 11 Aug 2014 01:10:28 -0700 + nfs-utils (1:1.2.8-8) unstable; urgency=medium * Upload to unstable where this belongs. @@ -138,6 +370,38 @@ -- Anibal Monsalve Salazar Sat, 02 Aug 2014 12:25:47 +0100 +nfs-utils (1:1.2.8-6ubuntu4) utopic; urgency=medium + + * Add patch from Sergio Gelato to adjust for changes to the ctx + argument of the serialize_krb5_ctx() function (LP: #1331201) + + -- Adam Conrad Wed, 25 Jun 2014 12:23:09 -0600 + +nfs-utils (1:1.2.8-6ubuntu3) utopic; urgency=medium + + * Soon nfs-common.init is going to be split on the Debian side, and + nfs-kernel-server init.d's LSB depends on "nfs-common" has never done + anything in Ubuntu. Drop it to avoid breaking insserv. (LP: #1323274) + + -- Martin Pitt Tue, 27 May 2014 11:38:51 +0200 + +nfs-utils (1:1.2.8-6ubuntu1) trusty; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs + due to EKEYEXPIRED error from kernel on ticket expiry. + + -- Steve Langasek Tue, 25 Feb 2014 09:18:47 -0800 + nfs-utils (1:1.2.8-6) unstable; urgency=medium * Fix the sec=krb5* handling in debian/nfs-common.init to properly match @@ -164,6 +428,29 @@ -- Steve Langasek Mon, 24 Feb 2014 18:11:17 +0000 +nfs-utils (1:1.2.8-5ubuntu1) trusty; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs + due to EKEYEXPIRED error from kernel on ticket expiry. + * Dropped changes, included in Debian: + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + + -- Steve Langasek Mon, 13 Jan 2014 21:13:11 -0800 + nfs-utils (1:1.2.8-5) unstable; urgency=medium [ Ben Hutchings ] @@ -180,6 +467,37 @@ -- Steve Langasek Mon, 13 Jan 2014 22:07:53 +0000 +nfs-utils (1:1.2.8-4ubuntu1) trusty; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - debian/nfs-common.defaults: always start idmapd automatically; drop + the configuration option. + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 + - Fix the stop conditions: never stop on 'runlevel [06]' since that gives + the system no time to cleanly unmount nfs mounts; instead, stop only on + the unmounted-remote-filesystems event. LP: #569094. + * Dropped changes: + - build-depend on debhelper (>= 7.3.15ubuntu3): all supported debhelper + versions meet this requirement now, so it's not worth carrying a delta + for. + * Drop removal handling for rpc_pipefs.conf, which has been obsolete since + before the 12.04 release. + + -- Steve Langasek Thu, 21 Nov 2013 13:35:20 -0800 + nfs-utils (1:1.2.8-4) unstable; urgency=low * The configure option name is --with-gssglue, not --with-libgssglue. @@ -198,6 +516,64 @@ -- Steve Langasek Fri, 31 May 2013 17:59:53 -0700 +nfs-utils (1:1.2.8-2ubuntu2) saucy; urgency=low + + * Start statd on virtual-filesystems instead of on local-filesystems; + this works and avoids a deadlock in the nfsroot case. Also, adjust + idmapd to not block MOUNTPOINT=/ for the same reason. This isn't a + perfect fix since idmapd would be needed if we ever wanted nfsv4 + nfsroot, but implementing that can wait until we have /usr mounting from + the initramfs. LP: #537133. + + -- Steve Langasek Wed, 11 Sep 2013 15:00:02 -0700 + +nfs-utils (1:1.2.8-2ubuntu1) saucy; urgency=low + + [ Stéphane Graber ] + * Merge from Debian unstable. + - includes upstream fix for gssd -R. LP: #1179992. + - includes upstream fix for an exportfs crash when using long paths. + LP: #1062022. + * Remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart + init handling. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - debian/nfs-common.defaults: always start idmapd automatically; drop + the configuration option. + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 + - Adjust upstart jobs to treat TYPE=nfs and TYPE=nfs4 mounts identically, + since TYPE=nfs4 is considered deprecated. + - Fix various boot-time race conditions between mountall and nfs-utils by + moving handling of the 'mounting' events to separate gssd-mounting and + idmapd-mounting jobs. Requires mountall 2.41 or better to avoid deadlock + on boot. LP: #643289, LP: #611397. + - Fix the stop conditions: never stop on 'runlevel [06]' since that gives + the system no time to cleanly unmount nfs mounts; instead, stop only on + the unmounted-remote-filesystems event. LP: #569094. + - Newer versions of gssd don't talk to portmap, so don't make the upstart + job depend on it. + - Add an instance to statd-mounting, and change it to just wait for statd + instead of trying to trigger it potentially out of order. This also + means we don't need to try to force portmap to start from statd. + + [ Steve Langasek ] + * Build --with-gssglue; linking directly against libgssapi-krb5 results in + rpc.gssd trying to incorrectly pass opaque pointers between two different + gss implementations (via libtirpc). + + -- Steve Langasek Fri, 31 May 2013 18:05:03 -0700 + nfs-utils (1:1.2.8-2) unstable; urgency=medium * Fix reportbug scripts to use rpcinfo in /usr/sbin. @@ -227,12 +603,80 @@ -- Luk Claes Fri, 10 May 2013 14:27:47 +0200 +nfs-utils (1:1.2.6-3ubuntu2) quantal; urgency=low + + [ Steve Langasek ] + * Adjust upstart jobs to treat TYPE=nfs and TYPE=nfs4 mounts identically, + since TYPE=nfs4 is considered deprecated. + * Fix various boot-time race conditions between mountall and nfs-utils by + moving handling of the 'mounting' events to separate gssd-mounting and + idmapd-mounting jobs. Requires mountall 2.41 or better to avoid deadlock + on boot. LP: #643289, LP: #611397. + * Fix the stop conditions: never stop on 'runlevel [06]' since that gives + the system no time to cleanly unmount nfs mounts; instead, stop only on + the unmounted-remote-filesystems event. LP: #569094. + * Newer versions of gssd don't talk to portmap, so don't make the upstart + job depend on it. + * Add an instance to statd-mounting, and change it to just wait for statd + instead of trying to trigger it potentially out of order. This also means + we don't need to try to force portmap to start from statd. + + [ Matthew L. Dailey ] + * Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 + + -- Stéphane Graber Fri, 28 Sep 2012 13:58:43 -0400 + +nfs-utils (1:1.2.6-3ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart + init handling. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - debian/nfs-common.defaults: always start idmapd automatically; drop + the configuration option. + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + + -- Logan Rosen Sun, 05 Aug 2012 00:56:05 -0400 + nfs-utils (1:1.2.6-3) unstable; urgency=low * Iterate through exports.d to look for expors (Closes: #676604). -- Luk Claes Tue, 10 Jul 2012 19:38:22 +0200 +nfs-utils (1:1.2.6-2ubuntu1) quantal; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart + init handling. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - debian/nfs-common.defaults: always start idmapd automatically; drop + the configuration option. + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + * Dropped changes, included in Debian: + - nfs-kernel-server.default: Add comment about how to disable nfs4. + + -- Steve Langasek Fri, 22 Jun 2012 11:25:28 -0700 + nfs-utils (1:1.2.6-2) unstable; urgency=low * Move open-iscsi and watchdog to Suggests. @@ -260,6 +704,44 @@ -- Luk Claes Sun, 22 Jan 2012 15:46:25 +0100 +nfs-utils (1:1.2.5-3ubuntu3) precise; urgency=low + + * In some cases, /var/lib/nfs/rpc_pipefs is successfully unmounted on + upgrade but the directory still has contents within it. Since this is + /var/lib we shouldn't assume it's ok for delete these; instead, pass + --ignore-fail-on-non-empty to rmdir. LP: #954619. + + -- Steve Langasek Sun, 08 Apr 2012 22:44:40 -0700 + +nfs-utils (1:1.2.5-3ubuntu2) precise; urgency=low + + * Fix wrong path to rpcinfo in the init script, which breaks use of nfs + v3 support in the server. LP: #945651. + + -- Steve Langasek Tue, 27 Mar 2012 10:44:03 -0700 + +nfs-utils (1:1.2.5-3ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart + init handling. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.default: Add comment about how to disable nfs4. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - debian/nfs-common.defaults: always start idmapd automatically; drop + the configuration option. + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + + -- Steve Langasek Wed, 04 Jan 2012 09:20:27 -0800 + nfs-utils (1:1.2.5-3) unstable; urgency=low [ Roger Leigh ] @@ -278,6 +760,33 @@ -- Luk Claes Fri, 09 Dec 2011 11:55:31 +0100 +nfs-utils (1:1.2.5-2ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart + init handling. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.default: Add comment about how to disable nfs4. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - Allow issuing options to rpc.nfsd + - debian/nfs-common.defaults: always start idmapd automatically; drop + the configuration option. + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + * Dropped changes, superseded in Debian/upstream: + - debian/patches/multiarch-kerberos-paths: Search for kerberos libs + in multiarch locations. + - ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel + version numbers. + + -- Steve Langasek Sun, 30 Oct 2011 00:12:50 +0000 + nfs-utils (1:1.2.5-2) unstable; urgency=low * debian/patches/18-dont-use-PAGE_SIZE.patch @@ -320,6 +829,57 @@ -- Luk Claes Sat, 06 Aug 2011 07:38:48 +0200 +nfs-utils (1:1.2.4-1ubuntu4) precise; urgency=low + + * debian/nfs-common.postinst: handle the case when /var/lib/nfs/rpc_pipefs + is not already mounted on upgrade - dpkg will already remove the + directory for us on upgrade, so don't fail when it's missing. + LP: #882799. + + -- Steve Langasek Thu, 27 Oct 2011 16:21:22 -0700 + +nfs-utils (1:1.2.4-1ubuntu3) precise; urgency=low + + * debian/nfs-common.defaults, debian/nfs-common.idmapd.upstart: idmapd + should always be started automatically, because we can no longer assume + that a mount of type 'nfs' in /etc/fstab is not nfs4. This also lets + things work by default with nfs4 autofs. LP: #662711. + * Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong + in /var/lib. + * Ignore errors from mount if the filesystem is already mounted. + LP: #811823. + + -- Steve Langasek Thu, 27 Oct 2011 12:04:58 -0700 + +nfs-utils (1:1.2.4-1ubuntu2) oneiric; urgency=low + + * Allow issuing options to rpc.nfsd + (LP: #567491) + + -- Bryce Harrington Mon, 08 Aug 2011 16:37:26 -0700 + +nfs-utils (1:1.2.4-1ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable (LP: #728586, LP: #789117), remaining + changes: + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart + init handling. + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + - nfs-kernel-server.default: Add comment about how to disable nfs4. + - debian/patches/multiarch-kerberos-paths: Search for kerberos libs + in multiarch locations. + - nfs-kernel-server.init: Unmount nfsd fs when init script stops + - ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel + version numbers. + + -- Steve Langasek Sat, 23 Jul 2011 17:54:36 +0200 + nfs-utils (1:1.2.4-1) unstable; urgency=low * New upstream version @@ -407,6 +967,93 @@ -- Luk Claes Wed, 16 Mar 2011 23:10:15 +0100 +nfs-utils (1:1.2.2-4ubuntu8) oneiric; urgency=low + + * debian/nfs-common.idmapd.upstart: don't use a script unnecessarily for + our job when we can exec directly - making the job more resilient in + the face of races with /usr being mounted. LP: #811823. + * Drop rpc_pipefs.conf; this has gotten far more complicated than it + should be, just do the mount in-line in each of the gssd and idmapd + jobs. + + -- Steve Langasek Sun, 17 Jul 2011 02:23:01 -0700 + +nfs-utils (1:1.2.2-4ubuntu7) oneiric; urgency=low + + [ Andy Whitcroft ] + * ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel + version numbers. (LP: #796611) + + -- Evan Dandrea Tue, 14 Jun 2011 17:13:14 +0100 + +nfs-utils (1:1.2.2-4ubuntu6) oneiric; urgency=low + + * nfs-kernel-server.init: Unmount nfsd fs when init script stops + (LP: #251026) + + -- Bryce Harrington Mon, 06 Jun 2011 19:18:16 -0700 + +nfs-utils (1:1.2.2-4ubuntu5) natty; urgency=low + + * Search kerberos libs in multiarch locations. + + -- Matthias Klose Fri, 01 Apr 2011 12:35:30 +0200 + +nfs-utils (1:1.2.2-4ubuntu4) natty; urgency=low + + * nvs-kernel-server.default: Add comment about how to disable nfs4. + There are corner cases where the server providing nfsv4 as the default + can confuse the client (117957, 680680) or even cause kernel problems + (716811), so it is worthwhile to document how to fallback to nfs3 only. + + -- Bryce Harrington Mon, 14 Feb 2011 13:20:27 -0800 + +nfs-utils (1:1.2.2-4ubuntu3) natty; urgency=low + + * debian/nfs-common.statd.upstart: pass a new WAITER= variable + to portmap-wait, so that multiple jobs can wait in parallel, fixing + another subtle race condition; and bump the portmap dependency again for + the necessary instance support. + * also fix the grouping in the start condition, so that restarts work + correctly when portmap is restarted. + * debian/nfs-common.rpc_pipefs.upstart: instantiate this job separately for + gssd and idmapd, so that the filesystem gets mounted and unmounted + correctly even if both of gssd and idmapd aren't being run, or if one of + the two tries to start before the filesystem is fully mounted. Though + it may be simpler now to move this logic back into the gssd and idmapd + jobs directly, leave that for a later date. + + -- Steve Langasek Tue, 18 Jan 2011 17:45:45 -0800 + +nfs-utils (1:1.2.2-4ubuntu2) natty; urgency=low + + * debian/nfs-common.statd.upstart, + debian/nfs-common.statd-mounting.upstart: refactor startup to wait for + local-filesystems. (LP: #525154) + * debian/control: depend on portmap version that sets ON_BOOT=y and + has the portmap-wait job. + * debian/rules: install new statd-mounting upstart job + + -- Clint Byrum Wed, 05 Jan 2011 12:27:32 -0800 + +nfs-utils (1:1.2.2-4ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #685860), remaining changes: + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, and + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init + handling. + - debian/control: + + depend on the upstart-using version of portmap, 6.0-10ubuntu1; and + drop the alternative depends on rpcbind, which hasn't been converted. + + depend on portmap 6.0-10ubuntu1. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + + -- Lorenzo De Liso Wed, 15 Dec 2010 21:42:55 +0100 + nfs-utils (1:1.2.2-4) unstable; urgency=low * mountd: fix path comparison for v4 crossmnt (Closes: #578317) @@ -433,7 +1080,29 @@ * Fix out-of-date-standards-version -- Anibal Monsalve Salazar Tue, 13 Jul 2010 15:20:17 +1000 - + +nfs-utils (1:1.2.2-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, and + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init + handling. + - debian/control: depend on the upstart-using version of portmap, + 6.0-10ubuntu1; and drop the alternative depends on rpcbind, which + hasn't been converted. + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + * Dropped changes, included in Debian: + - debian/control: add ${misc:Depends} line for nfs-common, for the + upstart deps + - debian/nfs-kernel-server.init: updated check for presence of nfsd + support + + -- Steve Langasek Fri, 04 Jun 2010 09:55:28 +0000 + nfs-utils (1:1.2.2-1) unstable; urgency=low [ Anibal Monsalve Salazar ] @@ -505,6 +1174,51 @@ -- Ben Hutchings Wed, 16 Dec 2009 22:14:01 +0000 +nfs-utils (1:1.2.0-4ubuntu4) lucid; urgency=low + + * debian/nfs-common.gssd.upstart: + - fix the OPTIONS= match for the start condition (missing a leading '*') + so that we actually match on nfs4 mounts + - drop the 'script' for a straight exec of rpc.gssd; if /usr is a separate + partition then nfs4 mounts might be attempted in parallel, and upstart + gets mightily confused when this happens. LP: #545673 + + -- Steve Langasek Tue, 23 Mar 2010 22:26:07 -0700 + +nfs-utils (1:1.2.0-4ubuntu3) lucid; urgency=low + + * debian/nfs-common.*.upstart: start on new 'mounting' signal instead of + obsolete 'mount' signal. + + -- Steve Langasek Thu, 25 Feb 2010 06:41:46 -0800 + +nfs-utils (1:1.2.0-4ubuntu2) lucid; urgency=low + + * debian/nfs-kernel-server.init: 2.6.32 kernels no longer export the + same symbols. Switch symbol check to nfsd_serv which has been present + since 2005. LP: #493145. + + -- Andy Whitcroft Mon, 07 Dec 2009 16:56:56 +0000 + +nfs-utils (1:1.2.0-4ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, + debian/rules: drop nfs-common init script in favor of upstart jobs, and + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init + handling. + - debian/control: depend on the upstart-using version of portmap, + 6.0-10ubuntu1; and drop the alternative depends on rpcbind, which + hasn't been converted. + - debian/control: add ${misc:Depends} line for nfs-common, for the + upstart deps + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" + in the postinst, this is redundant anyway and the nfs-common init script + is gone now. + + -- Steve Langasek Fri, 04 Dec 2009 18:37:48 -0800 + nfs-utils (1:1.2.0-4) unstable; urgency=low * Removing myself from uploaders. @@ -519,6 +1233,94 @@ -- Steinar H. Gunderson Sun, 09 Aug 2009 12:47:00 +0200 +nfs-utils (1:1.2.0-2ubuntu9) lucid; urgency=low + + * debian/nfs-common.statd.upstart: check for a started portmap in a + non-racy manner. LP: #484209. + + -- Steve Langasek Tue, 17 Nov 2009 11:27:37 -0600 + +nfs-utils (1:1.2.0-2ubuntu8) karmic; urgency=low + + * debian/control: add missing ${misc:Depends} for nfs-common, else we don't + get the dependency on upstart that we should have. LP: #456281. + + -- Steve Langasek Tue, 20 Oct 2009 13:10:01 +0000 + +nfs-utils (1:1.2.0-2ubuntu7) karmic; urgency=low + + * debian/rules: now that the jobs will exit cleanly on their own when + 'start' is called but the job is a no-op, remove the --error-handler + option to dh_installinit so that we don't accidentally ignore other + kinds of errors that could point to real problems. + + -- Steve Langasek Sun, 11 Oct 2009 08:51:39 +0000 + +nfs-utils (1:1.2.0-2ubuntu6) karmic; urgency=low + + * Drop the gssd upstart job's dependency on "local-filesystems"; at boot + time this is always implied transitively by the dep on portmap, and using + a combination of 'or' and 'and' operators in the dependency list seems + to confuse upstart quite badly, causing kerberized mounts to hang at boot. + LP: #447654. + + -- Steve Langasek Sat, 10 Oct 2009 20:12:11 +0000 + +nfs-utils (1:1.2.0-2ubuntu5) karmic; urgency=low + + * Set upstart jobs to also start on mount attempt, in the event that + mountall gets to them before the daemons are done starting. Really-fixes + LP: #431248. + * Call 'stop' in the pre-start scripts for all jobs when we want to prevent + the job from starting; this lets upstart know that it's a clean stop, + and avoids boot-time messages about service start failures + + -- Steve Langasek Fri, 09 Oct 2009 19:17:34 +0000 + +nfs-utils (1:1.2.0-2ubuntu4) karmic; urgency=low + + * Mounting rpc_pipefs also requires the sunrpc module, so move this + modprobe to the right upstart job. + + -- Steve Langasek Mon, 05 Oct 2009 22:04:28 -0700 + +nfs-utils (1:1.2.0-2ubuntu3) karmic; urgency=low + + * nfs-kernel-server: don't call invoke-rc.d nfs-common in the postinst, + this is redundant anyway and the nfs-common init script is gone now. + LP: #441855. + + -- Steve Langasek Sat, 03 Oct 2009 23:07:09 -0700 + +nfs-utils (1:1.2.0-2ubuntu2) karmic; urgency=low + + * Configure gssd and idmapd upstart jobs to stop on runlevels 0 and 6; this + is consistent with previous initscript-based behavior, and spares upstart + trying to restart the jobs repeatedly when sendsigs runs. + * When autodetecting gssd, handle the case of 'sec=krb5' being embedded in + the middle of the options list in /etc/fstab. LP: #364861. + * Fix transition idempotency error when stopping old nfs-common init + script, in case the postinst fails to finish afterwards (e.g., failure to + restart the daemons). + * Fix statd upstart job to properly honor NEED_STATD=no and not get stuck + respawning indefinitely. + * Ignore failures to start the daemons on upgrade, since if they aren't + needed we don't *want* them to start. LP: #441055. + * Fix up the rpc_pipefs job, the wrong version of the file slipped into + the previous upload. + + -- Steve Langasek Sat, 03 Oct 2009 01:52:21 +0000 + +nfs-utils (1:1.2.0-2ubuntu1) karmic; urgency=low + + * Drop nfs-common init script in favor of new upstart jobs. LP: #431248. + * Build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init + handling. + * Depend the upstart-using version of portmap, 6.0-10ubuntu1; and drop the + alternative depends on rpcbind, which hasn't been converted. + + -- Steve Langasek Fri, 02 Oct 2009 19:23:19 +0000 + nfs-utils (1:1.2.0-2) unstable; urgency=low * Merge from Ubuntu diff -Nru nfs-utils-1.3.4/debian/control nfs-utils-1.3.4/debian/control --- nfs-utils-1.3.4/debian/control 2016-12-15 13:30:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/control 2017-08-03 18:50:38.000000000 +0000 @@ -1,7 +1,8 @@ Source: nfs-utils Priority: standard Section: net -Maintainer: Debian kernel team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings , Steve Langasek , Daniel Pocock Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev, dh-systemd Standards-Version: 3.9.8 diff -Nru nfs-utils-1.3.4/debian/nfs-common.default nfs-utils-1.3.4/debian/nfs-common.default --- nfs-utils-1.3.4/debian/nfs-common.default 2016-12-15 13:30:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/nfs-common.default 2017-08-03 18:50:38.000000000 +0000 @@ -2,8 +2,6 @@ # autodetected; this should be sufficient for most people. Valid alternatives # for the NEED_ options are "yes" and "no". -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD= # Options for rpc.statd. # Should rpc.statd listen on a specific port? This is especially useful @@ -12,8 +10,5 @@ # For more information, see rpc.statd(8) or http://wiki.debian.org/SecuringNFS STATDOPTS= -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD= - # Do you want to start the gssd daemon? It is required for Kerberos mounts. NEED_GSSD= diff -Nru nfs-utils-1.3.4/debian/nfs-common.maintscript nfs-utils-1.3.4/debian/nfs-common.maintscript --- nfs-utils-1.3.4/debian/nfs-common.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/nfs-common.maintscript 2017-08-03 18:50:38.000000000 +0000 @@ -0,0 +1,9 @@ +rm_conffile /etc/init/statd.override 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/statd.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/statd-mounting.override 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/statd-mounting.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/idmapd.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/idmapd-mounting.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/gssd.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/gssd-mounting.conf 1:1.2.8-9.1ubuntu1~ + diff -Nru nfs-utils-1.3.4/debian/patches/20-ticket-expired-error.patch nfs-utils-1.3.4/debian/patches/20-ticket-expired-error.patch --- nfs-utils-1.3.4/debian/patches/20-ticket-expired-error.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/20-ticket-expired-error.patch 2017-08-03 18:50:38.000000000 +0000 @@ -0,0 +1,71 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +--- a/utils/gssd/gssd.c ++++ b/utils/gssd/gssd.c +@@ -85,6 +85,7 @@ + unsigned int context_timeout = 0; + unsigned int rpc_timeout = 5; + char *preferred_realm = NULL; ++int ticket_expiry_is_error = 0; + /* Avoid DNS reverse lookups on server names */ + static bool avoid_dns = true; + int thread_started = false; +@@ -830,7 +831,7 @@ + static void + usage(char *progname) + { +- fprintf(stderr, "usage: %s [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm] [-D]\n", ++ fprintf(stderr, "usage: %s [-e] [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm] [-D]\n", + progname); + exit(1); + } +@@ -848,8 +849,11 @@ + char *ccachedir = NULL; + struct event sighup_ev; + +- while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:T:R:")) != -1) { ++ while ((opt = getopt(argc, argv, "eDfvrlmnMp:k:d:t:T:R:")) != -1) { + switch (opt) { ++ case 'e': ++ ticket_expiry_is_error = 1; ++ break; + case 'f': + fg = 1; + break; +--- a/utils/gssd/gssd.h ++++ b/utils/gssd/gssd.h +@@ -62,6 +62,7 @@ + extern unsigned int context_timeout; + extern unsigned int rpc_timeout; + extern char *preferred_realm; ++extern int ticket_expiry_is_error; + extern pthread_mutex_t ple_lock; + extern pthread_cond_t pcond; + extern pthread_mutex_t pmutex; +--- a/utils/gssd/gssd.man ++++ b/utils/gssd/gssd.man +@@ -290,6 +290,12 @@ + The default is no explicit timeout, which means the kernel context will live + the lifetime of the Kerberos service ticket used in its creation. + .TP ++.B -e ++Return EACCESS instead of EKEYEXPIRED when a user's credentials expire. ++Returning EKEYEXPIRED was introduced around kernel 2.6.34 and causes all nfs4 ++I/O to block when a user's credentials expire. This option reverts to old ++behavior. ++.TP + .B -T timeout + Timeout, in seconds, to create an RPC connection with a server while + establishing an authenticated gss context for a user. +--- a/utils/gssd/gssd_proc.c ++++ b/utils/gssd/gssd_proc.c +@@ -507,7 +507,7 @@ + for (dname = ccachesearch; resp != 0 && *dname != NULL; dname++) { + err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, + *dname); +- if (err == -EKEYEXPIRED) ++ if (err == -EKEYEXPIRED && !ticket_expiry_is_error) + *downcall_err = -EKEYEXPIRED; + else if (err == 0) + resp = create_auth_rpc_client(clp, tgtname, rpc_clnt, diff -Nru nfs-utils-1.3.4/debian/patches/90-gss-free-lucid-sec-context.patch nfs-utils-1.3.4/debian/patches/90-gss-free-lucid-sec-context.patch --- nfs-utils-1.3.4/debian/patches/90-gss-free-lucid-sec-context.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/90-gss-free-lucid-sec-context.patch 2017-08-03 18:50:38.000000000 +0000 @@ -0,0 +1,20 @@ +From: Sergio Gelato +Subject: Fix gss_free_lucid_sec_context() call + Commit 051eb4863cf880f0349a1de44517f9c99a9c5bd4 changed + serialize_krb5_ctx() to take a pointer to gss_ctx_id_t instead of a + gss_ctx_id_t directly. The call to gss_export_lucid_sec_context() + was adjusted accordingly but the call to gss_free_lucid_sec_context() + was not. +Bug-Ubuntu: https://launchpad.net/bugs/1331201 + +--- a/utils/gssd/context_lucid.c ++++ b/utils/gssd/context_lucid.c +@@ -302,7 +302,7 @@ + else + retcode = prepare_krb5_rfc4121_buffer(lctx, buf, endtime); + +- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx); ++ maj_stat = gss_free_lucid_sec_context(&min_stat, *ctx, return_ctx); + if (maj_stat != GSS_S_COMPLETE) { + pgsserr("gss_free_lucid_sec_context", + maj_stat, min_stat, &krb5oid); diff -Nru nfs-utils-1.3.4/debian/patches/remove-gssproxy.patch nfs-utils-1.3.4/debian/patches/remove-gssproxy.patch --- nfs-utils-1.3.4/debian/patches/remove-gssproxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/remove-gssproxy.patch 2017-08-03 18:50:38.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Remove gssproxy + Gssproxy isn't packages for Ubuntu so we should drop it from + the service definitions. It also makes rpc-svcgssd always show + as failing on the client. + . +Author: Bryan Quigley +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1452667 + +--- a/systemd/auth-rpcgss-module.service ++++ b/systemd/auth-rpcgss-module.service +@@ -7,8 +7,8 @@ + [Unit] + Description=Kernel Module supporting RPCSEC_GSS + DefaultDependencies=no +-Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service +-Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service ++Before=rpc-svcgssd.service rpc-gssd.service ++Wants=rpc-svcgssd.service rpc-gssd.service + ConditionPathExists=/etc/krb5.keytab + + [Service] +--- a/systemd/nfs-client.target ++++ b/systemd/nfs-client.target +@@ -6,8 +6,8 @@ + Wants=nfs-blkmap.service + + # GSS services dependencies and ordering +-Wants=auth-rpcgss-module.service +-After=rpc-gssd.service rpc-svcgssd.service gssproxy.service ++Wants=rpc-gssd.service ++After=rpc-gssd.service + + [Install] + WantedBy=multi-user.target +--- a/systemd/nfs-server.service ++++ b/systemd/nfs-server.service +@@ -13,7 +13,7 @@ + + # GSS services dependencies and ordering + Wants=auth-rpcgss-module.service +-After=rpc-gssd.service gssproxy.service rpc-svcgssd.service ++After=rpc-gssd.service rpc-svcgssd.service + + # start/stop server before/after client + Before=remote-fs-pre.target +--- a/systemd/rpc-svcgssd.service ++++ b/systemd/rpc-svcgssd.service +@@ -6,9 +6,6 @@ + PartOf=nfs-server.service + PartOf=nfs-utils.service + +-After=gssproxy.service +-ConditionPathExists=|!/run/gssproxy.pid +-ConditionPathExists=|!/proc/net/rpc/use-gss-proxy + ConditionPathExists=/etc/krb5.keytab + + Wants=nfs-config.service diff -Nru nfs-utils-1.3.4/debian/patches/series nfs-utils-1.3.4/debian/patches/series --- nfs-utils-1.3.4/debian/patches/series 2016-12-17 10:47:35.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/series 2017-08-03 18:50:38.000000000 +0000 @@ -3,10 +3,14 @@ 03-handle-mtab-symlink.patch 17-multiarch-kerberos-paths.patch 19-iscsiadm-path.patch +20-ticket-expired-error.patch 24-systemd-pipefs_in_run.patch 25-systemd-daemon-paths.patch 27-systemd-enable-with-systemctl-statd.patch unbreak-blkmapd-rpc_pipefs-run.patch unbreak-gssd-rpc_pipefs-run.patch +remove-gssproxy.patch +90-gss-free-lucid-sec-context.patch +systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch 28-nfs-utils_env-location.patch 29-start-statd-fd-9.patch diff -Nru nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch --- nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch 2017-08-03 18:50:38.000000000 +0000 @@ -0,0 +1,44 @@ +Description: systemd: Fix nfs-mountd dependency on rpcbind + +Following commit 91da135f - it replaced "rpcbind.target" by "rpcbind.socket" in +some unit files - "rpcbind.socket" should also be added to "nfs-mountd.service" +as a dependency to avoid race conditions. + +Usually "rpcbind.socket" is either started as a "sockets.target" dependency, or +as a dependency for "nfs-server.service", when unit files include it in +"BindsTo" or "After". Unfortunately there is a possilibility to have +"nfs-mountd.service" started when the rpcbind socket is not yet created: + +systemd[1]: Starting NFS Mount Daemon... +systemd[1]: nfs-mountd.service: Control process exited, code=exited status=1 +systemd[1]: Failed to start NFS Mount Daemon. +systemd[1]: nfs-mountd.service: Unit entered failed state. +systemd[1]: nfs-mountd.service: Failed with result 'exit-code'. + +Nowadays "nfs-mountd.service" uses "BindTo" directive to "nfs-server.service". +That, per se, doesn't guarantee ordering for NFS server to start rpcbind and for +nfs-mountd to depend on it. + +https://bugs.launchpad.net/bugs/1590799 + +Reviewed-by: NeilBrown +Signed-off-by: Rafael David Tinoco +Signed-off-by: Steve Dickson +- +Author: Rafael David Tinoco +Origin: upstream, commit: 907426b00bdcd69d9a56ac1870990e8ae8c6fe9f +Bug-Debian: https://bugs.debian.org/856328 +Bug-Ubuntu: https://launchpad.net/bugs/1590799 +Reviewed-By: Rafael David Tinoco +Last-Update: 2017-03-01 + +--- nfs-utils-1.2.8.orig/systemd/nfs-mountd.service ++++ nfs-utils-1.2.8/systemd/nfs-mountd.service +@@ -4,6 +4,7 @@ DefaultDependencies=no + Requires=proc-fs-nfsd.mount + After=proc-fs-nfsd.mount + After=network.target local-fs.target ++After=rpcbind.socket + BindsTo=nfs-server.service + + Wants=nfs-config.service diff -Nru nfs-utils-1.3.4/debian/tests/local-server-client nfs-utils-1.3.4/debian/tests/local-server-client --- nfs-utils-1.3.4/debian/tests/local-server-client 2016-12-15 13:30:00.000000000 +0000 +++ nfs-utils-1.3.4/debian/tests/local-server-client 2017-09-01 05:53:05.000000000 +0000 @@ -41,7 +41,7 @@ # test that we can write to /home and get it in NFS rm /home/hello.txt - sync + echo 2 > /proc/sys/vm/drop_caches [ ! -e /mnt/nfs_home/hello.txt ] || fail "/mnt/nfs_home/hello.txt exists after removal" # read-only, should fail