Merge ~ahasenack/ubuntu/+source/nfs-utils:cosmic-fix-rpc.svcgssd-args-1616123 into ubuntu/+source/nfs-utils:ubuntu/cosmic-devel

[Andreas Hasenack]

SRU for the same bug already fixed in disco and later (see https://code.launchpad.net/~ahasenack/ubuntu/+source/nfs-utils/+git/nfs-utils/+merge/364923)

The bug contains testing instructions.

This was also already merged in debian: https://salsa.debian.org/debian/nfs-utils/merge_requests/2

[Christian Ehrhardt  (paelzer)]

I think we have tackled all the rough edges when we have discussed the upgrade paths for Disco.
This is "just the same" as backport and I think it is correct here just as much.
+1

review: Approve

[Andreas Hasenack (ahasenack)]

Tagged and uploaded.
$ git push pkg upload/1%1.3.4-2.2ubuntu3.2
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 4 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.48 KiB | 302.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/nfs-utils
 * [new tag] upload/1%1.3.4-2.2ubuntu3.2 -> upload/1%1.3.4-2.2ubuntu3.2

$ dput ubuntu ../nfs-utils_1.3.4-2.2ubuntu3.2_source.changes
Checking signature on .changes
gpg: ../nfs-utils_1.3.4-2.2ubuntu3.2_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../nfs-utils_1.3.4-2.2ubuntu3.2.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nfs-utils_1.3.4-2.2ubuntu3.2.dsc: done.
  Uploading nfs-utils_1.3.4-2.2ubuntu3.2.debian.tar.xz: done.
  Uploading nfs-utils_1.3.4-2.2ubuntu3.2_source.buildinfo: done.
  Uploading nfs-utils_1.3.4-2.2ubuntu3.2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 9ba4540..9ee4943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.3.4-2.2ubuntu3.2) cosmic; urgency=medium
+
+  * d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS,
+    which is the variable name expected by the rpc-svcgssd systemd service.
+    (LP: #1616123)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 25 Apr 2019 17:13:13 -0300
+
 nfs-utils (1:1.3.4-2.2ubuntu3.1) cosmic; urgency=medium
 
   * d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due to
diff --git a/debian/nfs-utils_env.sh b/debian/nfs-utils_env.sh
index d48eb51..fa7ad84 100644
--- a/debian/nfs-utils_env.sh
+++ b/debian/nfs-utils_env.sh
@@ -12,7 +12,15 @@ echo PIPEFS_MOUNTPOINT=/run/rpc_pipefs
 echo RPCNFSDARGS=\"$RPCNFSDOPTS ${RPCNFSDCOUNT:-8}\"
 echo RPCMOUNTDARGS=\"$RPCMOUNTDOPTS\"
 echo STATDARGS=\"$STATDOPTS\"
+# The rpc-svcgssd.service systemd file uses SVCGSSDARGS, not
+# RPCSVCGSSDARGS, but for a long time just the latter was exported.
+# To not break upgrades for people who have worked around this by
+# overriding the systemd service to use RPCSVCGSSDARGS, both variables
+# are being exported now.
+# See https://bugs.launchpad.net/bugs/1616123 and
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892654 for more details.
 echo RPCSVCGSSDARGS=\"$RPCSVCGSSDOPTS\"
+echo SVCGSSDARGS=\"$RPCSVCGSSDOPTS\"
 } > /run/sysconfig/nfs-utils
 
 # the following are supported by the systemd units, but not exposed in default files