diff -Nru nfs-utils-1.2.8/debian/changelog nfs-utils-1.2.8/debian/changelog --- nfs-utils-1.2.8/debian/changelog 2015-11-24 03:40:18.000000000 -0500 +++ nfs-utils-1.2.8/debian/changelog 2016-03-02 15:02:49.000000000 -0500 @@ -1,3 +1,10 @@ +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. diff -Nru nfs-utils-1.2.8/debian/patches/remove-gssproxy.patch nfs-utils-1.2.8/debian/patches/remove-gssproxy.patch --- nfs-utils-1.2.8/debian/patches/remove-gssproxy.patch 1969-12-31 19:00:00.000000000 -0500 +++ nfs-utils-1.2.8/debian/patches/remove-gssproxy.patch 2016-03-02 15:03:01.000000000 -0500 @@ -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 + +--- nfs-utils-1.2.8.orig/systemd/auth-rpcgss-module.service ++++ nfs-utils-1.2.8/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] +--- nfs-utils-1.2.8.orig/systemd/nfs-client.target ++++ nfs-utils-1.2.8/systemd/nfs-client.target +@@ -7,8 +7,8 @@ Wants=nfs-blkmap.service + After=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 +--- nfs-utils-1.2.8.orig/systemd/nfs-server.service ++++ nfs-utils-1.2.8/systemd/nfs-server.service +@@ -12,7 +12,7 @@ Before= rpc-statd-notify.service + + # 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 +--- nfs-utils-1.2.8.orig/systemd/rpc-svcgssd.service ++++ nfs-utils-1.2.8/systemd/rpc-svcgssd.service +@@ -6,9 +6,6 @@ After=run-rpc_pipefs.mount local-fs.targ + 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.2.8/debian/patches/series nfs-utils-1.2.8/debian/patches/series --- nfs-utils-1.2.8/debian/patches/series 2015-04-27 11:44:03.000000000 -0400 +++ nfs-utils-1.2.8/debian/patches/series 2016-03-02 14:58:35.000000000 -0500 @@ -17,3 +17,4 @@ 26-systemd-server-before-client.patch 27-systemd-enable-with-systemctl-statd.patch 90-gss-free-lucid-sec-context.patch +remove-gssproxy.patch