Please merge nfs-utils 1:1.3.4-5 from Debian unstable

Attaching patch against Debian unstable. For ease of review, I've also pushed relevant commits and tags to the following repository:

  https://code.launchpad.net/~waveform/ubuntu/+source/nfs-utils/+git/nfs-utils

Specifically:

* logical/1%1.3.4-4ubuntu2 represents our split-out delta on top of old/debian (1:1.3.4-4)
* logical/1%1.3.4-5ubuntu1 represents our rebased delta on top of new/debian (1:1.3.4-5)
* merge/1%1.3.4-5ubuntu1 just adds changelog and maintainer changes on top of logical/1%1.3.4-5ubuntu1

Hence, the following command may produce output useful to the purposes of review:

  git range-diff old/debian..logical/1%1.3.4-4ubuntu2 new/debian..logical/1%1.3.4-5ubuntu1

A test package has been built in the following PPA:

  https://launchpad.net/~waveform/+archive/ubuntu/nfs-utils

Hi Dave

Would you please rebase this merge on nfs-utils/1:1.3.4-4ubuntu3 ?
Also, in the meantime, nfs-utils/1:1.3.4-6 was uploaded to Debian.

FWIW, I think Ubuntu's d/p/python3.diff can be dropped in favour of Debian's d/p/Convert-remaining-python-scripts-to-python3.patch.

Regards
Graham

@ginggs Will do, thanks for the patch tip!

Attaching patch against Debian unstable. For ease of review, relevant commits
and tags have been pushed to the following repository:

  https://code.launchpad.net/~waveform/ubuntu/+source/nfs-utils/+git/nfs-utils

Specifically:

* logical/1%1.3.4-4ubuntu3 represents our split-out delta on top of old/debian (1:1.3.4-4)
* logical/1%1.3.4-6ubuntu1 represents our rebased delta on top of new/debian (1:1.3.4-6)
* merge/1%1.3.4-6ubuntu1 just adds changelog and maintainer changes on top of logical/1%1.3.4-6ubuntu1

Hence, the following command may produce output useful to the purposes of review:

  git range-diff old/debian..logical/1%1.3.4-4ubuntu3 new/debian..logical/1%1.3.4-6ubuntu1

A test package has been built in the following PPA:

  https://launchpad.net/~waveform/+archive/ubuntu/nfs-utils

This bug was fixed in the package nfs-utils - 1:1.3.4-6ubuntu1

---------------
nfs-utils (1:1.3.4-6ubuntu1) impish; urgency=medium

  * Merge from Debian unstable (LP: #1929406). Remaining changes:
    - debian/nfs-common.default: always start idmapd automatically; drop the
      configuration option.
      - debian/nfs-common.default: remove NEED_STATD and related comment.
    - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx
      argument of the serialize_krb5_ctx() function.
    - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu
    - Fixing nfs-mountd dependency on rpcbind (race condition) by adding
      "rpcbind.socket" to "nfs-mountd.service" as a dependency to avoid race
      conditions:
      - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch
    - truncate_gid*.patch: Backports from upstream to prevent truncating UIDs
      and GIDs over 65536 on certain architectures
    - d/p/fix-start-ordering-1.patch, d/p/fix-start-ordering-2.patch, d/p/fix-
      start-ordering-3.patch, d/nfs-kernel-server.install: Fix systemd service
      start ordering
    - Depend on network-online.target when starting services.
      - d/p/lp1918141-use-network-online-target-01.patch: Declare a
        Wants=network-online.target on all NFS server services.
      - d/p/lp1918141-use-network-online-target-02.patch: Declare a
        After=network-online.target on all NFS server services. Thanks to
        Niklas Edmundsson for helping with the reproducer.
    - d/nfs-common.postinst: always start nfs-utils.service, so the restart in
      the #DEBHELPER# section can do its job if needed
  * Removed patches obsoleted/merged by upstream:
    - Remove hard-coded dep on libtirpc1; already merged upstream, but
      previously un-noted
    - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS,
      which is the variable name expected by the rpc-svcgssd systemd service;
      already merged upstream, but previously un-noted
    - d/p/python3.diff obsoleted by
      d/p/Convert-remaining-python-scripts-to-python3.patch
  * d/p/nfsiostat-replace-list-reserved-word.patch: re-instated after
    previous merge removed a patch already merged upstream
  * d/p/01-sm-notify-in-sbin.patch,
    d/p/03-handle-mtab-symlink.patch,
    d/p/17-multiarch-kerberos-paths.patch,
    d/p/unbreak-blkmapd-rpc_pipefs-run.patch:
    reverted unnecessary refresh of patches

nfs-utils (1:1.3.4-6) unstable; urgency=medium

  * mountstats: Remove a shebang
  * Convert remaining python scripts to python3 (Closes: #883194)
  * debian/control: Switch Recommends from python to python3
  * Removed a resource leak from mountd/fsloc.c (Closes: #513284)

nfs-utils (1:1.3.4-5) unstable; urgency=medium

  [ Felix Lechner ]
  * Propagate $RPCGSSDOPTS from /etc/default/nfs-common to the system
    service script for rpc-gssd. (Closes: #846950)

 -- Dave Jones <email address hidden> Tue, 06 Jul 2021 11:47:33 +0100