diff -pruN 1:2.8.3-1/debian/README.Ubuntu 1:2.8.3-1ubuntu3/debian/README.Ubuntu --- 1:2.8.3-1/debian/README.Ubuntu 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/README.Ubuntu 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1,30 @@ +# New configuration file + +nfs-common and nfs-kernel-server use a common configuration file /etc/nfs.conf. +They also support a /etc/nfs.conf.d/*.conf structure. + +If there are local modifications to either /etc/default/nfs-common or +/etc/default/nfs-kernel-server as installed by previous versions of the +corresponding Debian packages, nfs-common will attempt a migration to the new +configuration file. This migration is done by calling the +/usr/share/nfs-common/nfsconvert.py script in postinst. + +Upon success, the script will produce /etc/nfs.conf.d/local.conf with the local +customizations specified in those older config files, while /etc/nfs.conf will +remain with the default settings. + +If the migration fails for some reason, the package installation will fail and +manual intervention will be required. This will probably involve temporarily +removing the offending configuration option that was not handled by the +migration script and configuring the package again. Please consult nfs.conf(5) +and each daemon's manpage to determine how to translate the command line +options previously defined in /etc/default/nfs-* to the new configuration file +format. + +# Services + +All NFS related services are enabled by default. This means that depending on +the NFS version that you intend to use, some services might be superfluous. +For example, if you never intend to serve NFSv3, then you can safely disable +the rpc-statd.service unit. Note that some NFSv4 service units will start only +if Kerberos is setup. diff -pruN 1:2.8.3-1/debian/changelog 1:2.8.3-1ubuntu3/debian/changelog --- 1:2.8.3-1/debian/changelog 2025-03-31 18:13:33.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/changelog 2025-09-07 08:50:39.000000000 +0000 @@ -1,3 +1,46 @@ +nfs-utils (1:2.8.3-1ubuntu3) questing; urgency=medium + + * Fix FTBFS with glibc 2.42 (LP: #2122270) + + -- Heinrich Schuchardt Sun, 07 Sep 2025 10:50:39 +0200 + +nfs-utils (1:2.8.3-1ubuntu2) questing; urgency=medium + + * Rebuild to include updated RISC-V base ISA RVA23 + + -- Heinrich Schuchardt Sat, 06 Sep 2025 14:17:52 +0000 + +nfs-utils (1:2.8.3-1ubuntu1) questing; urgency=medium + + * Merge with Debian unstable (LP: #2112047). + Nothing of note in this merge, very straightforward rebase. + Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook (LP #1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Move the regex module to a separate binary package libnfsidmap-regex + (LP #1974067): + + d/control: new package, adjust breaks/conflicts + + d/libnfsidmap-regex.install: install the plugin file + + d/libnfsidmap1.install: don't install regex.so + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements (LP #1977745): + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - d/not-installed: mark files we knowingly don't include in the + packaging + + -- Florent 'Skia' Jacquet Mon, 30 Jun 2025 16:00:10 +0200 + nfs-utils (1:2.8.3-1) unstable; urgency=medium * Upload to unstable @@ -19,6 +62,43 @@ nfs-utils (1:2.8.2-3) unstable; urgency= -- Salvatore Bonaccorso Thu, 20 Feb 2025 21:41:30 +0100 +nfs-utils (1:2.8.2-2ubuntu2) questing; urgency=medium + + * No-change rebuild for libxml2 soname change. + + -- Matthias Klose Tue, 20 May 2025 12:24:11 +0200 + +nfs-utils (1:2.8.2-2ubuntu1) plucky; urgency=medium + + * Merge from Debian unstable (LP: #2098870). Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This package + contains not only plugins, but an actual shared library, with a + different soname. + - Update README file: + - d/README.Ubuntu: new /etc/nfs.conf config structure + - d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook: + - d/source.apport: apport hook for nfs-utils + - d/control: build-depend dh-apport + - d/rules: build with apport, and install the hook in the nfs-common + package which is installed on both client and servers + - Move the regex module to a separate binary package libnfsidmap-regex : + - d/control: new package, adjust breaks/conflicts + - d/libnfsidmap-regex.install: install the plugin file + - d/libnfsidmap1.install: don't install regex.so + - d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: note that + the regex plugin is in another package + - rpc.svcgssd fixes and improvements: + - d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also document the + missing svcgssd options to the nfs.conf(5) manpage + - d/not-installed: mark files we knowingly don't include in the packaging + * Removed patches obsoleted/merged by upstream: + - Add more DEP8 tests: + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-mount}: specific NFSv3 mount test + + -- Dave Jones Wed, 19 Feb 2025 16:30:13 +0000 + nfs-utils (1:2.8.2-2) unstable; urgency=medium [ Helmut Grohne ] @@ -125,6 +205,41 @@ nfs-utils (1:2.6.4-5) unstable; urgency= -- Salvatore Bonaccorso Sat, 22 Jun 2024 11:50:22 +0200 +nfs-utils (1:2.6.4-4ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook: + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests: + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-mount}: specific NFSv3 mount test + - Move the regex module to a separate binary package libnfsidmap-regex: + + d/control: new package, adjust breaks/conflicts + + d/libnfsidmap-regex.install: install the plugin file + + d/libnfsidmap1.install: don't install regex.so + [missed in previous d/changelog] + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements: + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - d/not-installed: mark files we knowingly don't include in the + packaging + * Dropped changes, included in Debian: + - d/p/armhf-time-t-format-error.patch: resolve armhf ftbfs due to + time_t transition. + + -- Steve Langasek Thu, 06 Jun 2024 21:55:18 -0700 + nfs-utils (1:2.6.4-4) unstable; urgency=medium * junction: export-cache: cast to a type with a known size to ensure sprintf @@ -132,6 +247,64 @@ nfs-utils (1:2.6.4-4) unstable; urgency= -- Salvatore Bonaccorso Sun, 07 Apr 2024 07:01:47 +0200 +nfs-utils (1:2.6.4-3ubuntu5) noble; urgency=medium + + * No-change rebuild against libevent-core-2.1-7t64 + + -- Steve Langasek Sun, 07 Apr 2024 02:44:50 +0000 + +nfs-utils (1:2.6.4-3ubuntu4) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 08:10:14 +0000 + +nfs-utils (1:2.6.4-3ubuntu3) noble; urgency=medium + + * No-change rebuild against libtirpc3t64 + + -- Steve Langasek Thu, 29 Feb 2024 09:30:58 +0000 + +nfs-utils (1:2.6.4-3ubuntu2) noble; urgency=medium + + * d/p/armhf-time-t-format-error.patch: resolve armhf ftbfs due to + time_t transition (LP: #2055349). + + -- Vladimir Petko Thu, 29 Feb 2024 10:52:10 +1300 + +nfs-utils (1:2.6.4-3ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2055100). Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook (LP 1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests (LP 1960828): + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-mount}: specific NFSv3 mount test + - Move the regex module to a separate binary package libnfsidmap-regex + (LP 1974067): + + d/control: new package, adjust breaks/conflicts + + d/libnfsidmap-regex.install: install the plugin file + + d/libnfsidmap1.install: don't install regex.so + [missed in previous d/changelog] + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements (LP 1977745): + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - d/not-installed: mark files we knowingly don't include in the + packaging + + -- Vladimir Petko Tue, 27 Feb 2024 14:48:29 +1300 + nfs-utils (1:2.6.4-3) unstable; urgency=medium [ Salvatore Bonaccorso ] @@ -188,6 +361,44 @@ nfs-utils (1:2.6.3-4~exp1) experimental; -- Salvatore Bonaccorso Mon, 20 Nov 2023 22:13:01 +0100 +nfs-utils (1:2.6.3-3ubuntu1) mantic; urgency=medium + + * Merge with Debian unstable (LP: #2030474). Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook (LP #1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests (LP #1960828): + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-mount}: specific NFSv3 mount test + - Move the regex module to a separate binary package libnfsidmap-regex + (LP #1974067): + + d/control: new package, adjust breaks/conflicts + + d/libnfsidmap-regex.install: install the plugin file + + d/libnfsidmap1.install: don't install regex.so + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements (LP #1977745): + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - d/not-installed: mark files we knowingly don't include in the + packaging + * Dropped changes: + - Rely on the generator units for the rpc_pipefs mount (LP #1971935): + + d/p/always-run-generator.patch: run the generator even if the + config differs from the built-in default + + d/rules: exclude the units we will let the generator produce + [Fixed in 1:2.6.3-1] + + -- Vladimir Petko Tue, 08 Aug 2023 09:54:52 +1200 + nfs-utils (1:2.6.3-3) unstable; urgency=medium * nfs-idmapd.service: add network-online.target to Wants= and After= @@ -249,6 +460,50 @@ nfs-utils (1:2.6.3-1~exp1) experimental; -- Salvatore Bonaccorso Sun, 23 Apr 2023 18:08:07 +0200 +nfs-utils (1:2.6.2-4ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook (LP #1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests (LP #1960828): + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-mount}: specific NFSv3 mount test + - Move the regex module to a separate binary package libnfsidmap-regex + (LP #1974067): + + d/control: new package, adjust breaks/conflicts + + d/libnfsidmap-regex.install: install the plugin file + + d/libnfsidmap1.install: don't install regex.so + [missed in previous d/changelog] + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements (LP #1977745): + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - Rely on the generator units for the rpc_pipefs mount + (LP #1971935): + + d/p/always-run-generator.patch: run the generator even if the + config differs from the built-in default + + d/rules: exclude the units we will let the generator produce + [Missed in previous d/changelog] + - d/not-installed: mark files we knowingly don't include in the + packaging + [Missed in previous d/changelog] + * Dropped: + - d/rules: re-add hardening option lost from the src:libnfsidmap to + src:nfs-utils transition (LP: #1980095) + [In 1:2.6.2-1~exp1] + + -- Andreas Hasenack Sun, 19 Feb 2023 14:49:53 -0300 + nfs-utils (1:2.6.2-4) unstable; urgency=medium [ Guillem Jover ] @@ -276,6 +531,39 @@ nfs-utils (1:2.6.2-3) unstable; urgency= -- Salvatore Bonaccorso Tue, 06 Dec 2022 16:38:32 +0100 +nfs-utils (1:2.6.2-2ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - New apport hook (LP #1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests (LP #1960828): + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-moun}t: specific NFSv3 mount test + - Move the regex module to a separate binary package libnfsidmap-regex + (LP: #1974067): + + d/control: new package + + d/libnfsidmap-regex.install: install the plugin file + + d/not-installed: remove the plugin from the not-installed list + + d/p/remove-regex-from-docs.patch: deleted + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements (LP: #1977745): + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - d/README.Ubuntu: updated with the content of the previous d/NEWS + file + + -- Łukasz 'sil2100' Zemczak Fri, 25 Nov 2022 10:40:08 +0100 + nfs-utils (1:2.6.2-2) unstable; urgency=medium [ Debian Janitor ] @@ -311,6 +599,96 @@ nfs-utils (1:2.6.2-1~exp1) experimental; -- Salvatore Bonaccorso Sun, 21 Aug 2022 22:41:04 +0200 +nfs-utils (1:2.6.1-2ubuntu5) lunar; urgency=medium + + * d/p/blkmapd-fix-invalid-free.patch: fix blkmapd crash due to invalid + free() (LP: #1979885) + + -- Andreas Hasenack Fri, 28 Oct 2022 08:26:52 -0300 + +nfs-utils (1:2.6.1-2ubuntu4) kinetic; urgency=medium + + * No-change rebuild against libevent-core-2.1-7a + + -- Steve Langasek Fri, 07 Oct 2022 21:23:03 +0000 + +nfs-utils (1:2.6.1-2ubuntu3) kinetic; urgency=medium + + * d/p/fix-format-overflow-warning.patch: fix a format-overflow warning + from gcc which was failing the build + + -- Andreas Hasenack Thu, 28 Jul 2022 20:39:54 +0000 + +nfs-utils (1:2.6.1-2ubuntu2) kinetic; urgency=medium + + * Rely on the generator units for the rpc_pipefs mount + (LP: #1971935): + - d/p/always-run-generator.patch: run the generator even if the + config differs from the built-in default + - d/rules: exclude the units we will let the generator produce + + -- Andreas Hasenack Thu, 07 Jul 2022 21:08:11 +0000 + +nfs-utils (1:2.6.1-2ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable (LP: #1974233). Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - Don't install the regex module, as it's built by + src:libnfsidmap-regex which is in Universe (MIR: #1960824) + + d/control: don't conflict/break/etc with libnfsidmap-regex + + d/libnfsidmap1.install: don't install regex.so + + d/not-installed: mark files we knowingly don't include in the + packaging + + d/p/remove-regex-from-docs.patch: remove the regex section from + the idmapd.conf(5) manpage, as we are not building that plugin in + this package + - Update README file: + + d/README.Ubuntu: new /etc/nfs.conf config structure + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu + - d/nfs-common.postrm: also purge /etc/nfs.conf.d/local.conf + - d/nfs-common.dirs: we also own /etc/nfs.conf.d + - New apport hook (LP #1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests (LP #1960828): + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-moun}t: specific NFSv3 mount test + * Dropped: + - d/nfsconvert.py: add short "u" option for mountd's no-udp + [Included in 1:2.6.1-2] + - d/NEWS: explain some of the major changes in 2.6.x + [Obsoleted by Debian's update to the per-package NEWS files] + - d/nfs-*.bug-script: update to also include /etc/nfs.conf and + /etc/nfs.conf.d/*.conf + [Included in 1:2.6.1-2] + * Added changes: + - New binary package libnfsidmap-regex (LP: #1974067): + + d/control: new package + + d/libnfsidmap-regex.install: install the plugin file + + d/not-installed: remove the plugin from the not-installed list + + d/p/remove-regex-from-docs.patch: deleted + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: + note that the regex plugin is in another package + - rpc.svcgssd fixes and improvements (LP: #1977745): + + d/p/svcgssd-fix-use-after-free.patch: fix use-after-free which was + preventing svcgssd options set in /etc/nfs.conf from being used + + d/p/svcgssd-display-principal-if-set.patch: improve logging, + showing the expected principal name if it was set in the config + + d/p/svcgssd-document-missing-options.patch: add missing options to + the svcgssd manpage + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also + document the missing svcgssd options to the nfs.conf(5) manpage + - d/README.Ubuntu: updated with the content of the previous d/NEWS + file + - d/rules: re-add hardening option lost from the src:libnfsidmap to + src:nfs-utils transition (LP: #1980095) + + -- Andreas Hasenack Tue, 28 Jun 2022 10:59:36 -0300 + nfs-utils (1:2.6.1-2) unstable; urgency=medium [ Andreas Hasenack ] @@ -337,6 +715,51 @@ nfs-utils (1:2.6.1-2) unstable; urgency= -- Salvatore Bonaccorso Tue, 12 Apr 2022 12:20:44 +0200 +nfs-utils (1:2.6.1-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable (LP: #1960829). Remaining changes: + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This + package contains not only plugins, but an actual shared library, + with a different soname. + - d/NEWS: explain some of the major changes in 2.6.x + - Don't install the regex module, as it's built by + src:libnfsidmap-regex which is in Universe (MIR: #1960824) + + d/control: don't conflict/break/etc with libnfsidmap-regex + + d/libnfsidmap1.install: don't install regex.so + + d/not-installed: mark files we knowingly don't include in the + packaging + + d/p/remove-regex-from-docs.patch: remove the regex section from + the idmapd.conf(5) manpage, as we are not building that plugin in + this package + - Update README files: + + d/README.Ubuntu: explains some of the packaging decisions + + d/README.Debian.nfsv4: removed as the content is out of date + + d/nfs-common.docs: install README.Ubuntu instead of + README.Debian.nfsv4 + + d/libnfsidmap1.docs: install README.Ubuntu + * Dropped: + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in + the #DEBHELPER# section can do its job if needed + [Fixed with the upstream re-arrangement of systemd units] + * Added: + - d/nfsconvert.py: add short "u" option for mountd's no-udp + - d/NEWS: update + - d/nfs-common.postrm: also purge /etc/nfs.conf.d/local.conf + - d/nfs-common.dirs: we also own /etc/nfs.conf.d + - d/README.Ubuntu: update + - d/nfs-*.bug-script: update to also include /etc/nfs.conf and + /etc/nfs.conf.d/*.conf + - New apport hook (LP: #1961058): + + d/source.apport: apport hook for nfs-utils + + d/control: build-depend dh-apport + + d/rules: build with apport, and install the hook in the + nfs-common package which is installed on both client and servers + - Add more DEP8 tests (LP: #1960828): + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts + + d/t/{control, v3-moun}t: specific NFSv3 mount test + + -- Andreas Hasenack Fri, 04 Mar 2022 17:44:10 -0300 + nfs-utils (1:2.6.1-1) unstable; urgency=medium [ Ben Hutchings ] @@ -359,6 +782,65 @@ nfs-utils (1:2.6.1-1) unstable; urgency= -- Ben Hutchings Thu, 24 Feb 2022 14:54:49 +0100 +nfs-utils (1:2.6.1-1~exp1ubuntu1) jammy; urgency=medium + + * Merge with Debian experimental (LP: #1878601, #1812280). Remaining + changes: + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in + the #DEBHELPER# section can do its job if needed + * Dropped: + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu + [Ubuntu has it, but not in main] + - debian/nfs-common.default: remove NEED_STATD and related comment. + [/etc/default/nfs-* files are no longer used] + - debian/nfs-common.default: always start idmapd automatically; drop the + configuration option. + [/etc/default/nfs-* files are no longer used] + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx + argument of the serialize_krb5_ctx() function. + [Was only needed when libgssglue-dev was used for build, which it + isn't since nfs-utils 1:1.2.8-7] + - 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 + [Fixed upstream] + - truncate_gid*.patch: Backports from upstream to prevent truncating UIDs + and GIDs over 65536 on certain architectures + [Fixed upstream] + - 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 + [Fixed upstream. Patch 3 we don't need anymore because now the pkg + is built with --with-systemd] + - 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. + [Fixed upstream] + * Added: + - d/control: don't provide libnfsidmap2 in libnfsidmap1 + - d/NEWS: explain some of the major changes in 2.6.x + - Don't install the regex module, as it's built by + src:libnfsidmap-regex which is in Universe (MIR: #1960824) + + d/control: don't conflict/break/etc with libnfsidmap-regex + + d/libnfsidmap1.install: don't install regex.so + + d/not-installed: mark files we knowingly don't include in the + packaging + + d/p/remove-regex-from-docs.patch: remove the regex section from + the idmapd.conf(5) manpage, as we are not building that plugin in + this package + - Update README files: + + d/README.Ubuntu: explains some of the packaging decisions + + d/README.Debian.nfsv4: removed as the content is out of date + + d/nfs-common.docs: install README.Ubuntu instead of + README.Debian.nfsv4 + + d/libnfsidmap1.docs: install README.Ubuntu + + -- Andreas Hasenack Wed, 16 Feb 2022 20:20:26 +0000 + nfs-utils (1:2.6.1-1~exp1) experimental; urgency=medium [ Romain Perier ] @@ -480,6 +962,50 @@ nfs-utils (1:2.5.4-1~exp1) experimental; -- Anibal Monsalve Salazar Sun, 05 Sep 2021 23:50:09 +1000 +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 + + -- Dave Jones Tue, 06 Jul 2021 11:47:33 +0100 + nfs-utils (1:1.3.4-6) unstable; urgency=medium * mountstats: Remove a shebang @@ -497,6 +1023,59 @@ nfs-utils (1:1.3.4-5) unstable; urgency= -- Salvatore Bonaccorso Tue, 09 Mar 2021 17:17:42 +0100 +nfs-utils (1:1.3.4-4ubuntu3) impish; urgency=medium + + * d/nfs-common.postinst: always start nfs-utils.service, so the restart in + the #DEBHELPER# section can do its job if needed (LP: #1928259) + + -- Andreas Hasenack Mon, 24 May 2021 17:59:39 -0300 + +nfs-utils (1:1.3.4-4ubuntu2) hirsute; urgency=medium + + * Depend on network-online.target when starting services. (LP: #1918141) + - 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. + + -- Sergio Durigan Junior Mon, 15 Mar 2021 18:26:22 -0400 + +nfs-utils (1:1.3.4-4ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - 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 + - Convert mountstats and nfsiostat scripts to Python3 and recommend + python3 instead of python. + - truncate_gid*.patch: Backports from upstream to prevent truncating + UIDs and GIDs over 65536 on certain architectures + - Remove hard-coded dep on libtirpc1. + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, + which is the variable name expected by the rpc-svcgssd systemd service. + - 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 + * Dropped changes, included in Debian: + - Allow compilation to succeed with -fno-common + - debian/nfs-common.postinst: don't make /var/lib/nfs owned by statd. + - debian/patches/CVE-2019-3689.patch: take user-id from + /var/lib/nfs/sm in support/nsm/file.c, utils/statd/sm-notify.man, + utils/statd/statd.man. + - d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due + to using 'list' as a variable name. + + -- Steve Langasek Mon, 26 Oct 2020 09:25:58 -0700 + nfs-utils (1:1.3.4-4) unstable; urgency=medium * Allow compilation to succeed with -fno-common (Closes: #957608) @@ -535,6 +1114,73 @@ nfs-utils (1:1.3.4-3) unstable; urgency= -- Salvatore Bonaccorso Fri, 13 Mar 2020 05:16:46 +0100 +nfs-utils (1:1.3.4-2.5ubuntu6) groovy; urgency=medium + + * Allow compilation to succeed with -fno-common (Closes: #957608) + (cherry picked from 1:1.3.4-4) + + -- Julian Andres Klode Wed, 16 Sep 2020 16:20:55 +0200 + +nfs-utils (1:1.3.4-2.5ubuntu5) groovy; urgency=medium + + * SECURITY UPDATE: privilege escalation via directory permissions + - debian/patches/CVE-2019-3689.patch: take user-id from + /var/lib/nfs/sm in support/nsm/file.c, utils/statd/sm-notify.man, + utils/statd/statd.man. + - debian/nfs-common.postinst: don't make /var/lib/nfs owned by statd. + - CVE-2019-3689 + + -- Marc Deslauriers Wed, 17 Jun 2020 08:42:59 -0400 + +nfs-utils (1:1.3.4-2.5ubuntu4) groovy; urgency=medium + + [ Rodrigo Barbieri ] + * 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 (LP: #1871214) + + -- Dariusz Gadomski Thu, 28 May 2020 17:45:23 -0400 + +nfs-utils (1:1.3.4-2.5ubuntu3) focal; urgency=medium + + * No-change rebuild for libevent soname changes. + + -- Matthias Klose Sat, 19 Oct 2019 19:57:12 +0000 + +nfs-utils (1:1.3.4-2.5ubuntu2) eoan; urgency=medium + + * No-change upload with strops.h and sys/strops.h removed in glibc. + + -- Matthias Klose Thu, 05 Sep 2019 11:04:05 +0000 + +nfs-utils (1:1.3.4-2.5ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - 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 + - Convert mountstats and nfsiostat scripts to Python3 and recommend + python3 instead of python. + - truncate_gid*.patch: Backports from upstream to prevent truncating + UIDs and GIDs over 65536 on certain architectures + - Remove hard-coded dep on libtirpc1. + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, + which is the variable name expected by the rpc-svcgssd systemd service. + - d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due + to using 'list' as a variable name. + * Dropped changes, included in Debian: + - glibc-2.28-compat.patch: Include for major/minor. + + -- Steve Langasek Thu, 02 May 2019 22:43:12 -0700 + nfs-utils (1:1.3.4-2.5) unstable; urgency=medium * Non-maintainer upload. @@ -560,6 +1206,43 @@ nfs-utils (1:1.3.4-2.4) unstable; urgenc -- Hilko Bengen Sat, 09 Feb 2019 15:26:27 +0100 +nfs-utils (1:1.3.4-2.3ubuntu3) disco; urgency=medium + + * d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due to + using 'list' as a variable name. (LP: #1821261) + + -- Matthew Ruffell Tue, 02 Apr 2019 11:09:15 +1300 + +nfs-utils (1:1.3.4-2.3ubuntu2) disco; 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 Mon, 25 Mar 2019 09:24:29 -0300 + +nfs-utils (1:1.3.4-2.3ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - 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 + (LP: #1446851) + - 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 + - Convert mountstats and nfsiostat scripts to Python3 and recommend + python3 instead of python. + - glibc-2.28-compat.patch: Include for major/minor. + - truncate_gid*.patch: Backports from upstream to prevent truncating + UIDs and GIDs over 65536 on certain architectures + - Remove hard-coded dep on libtirpc1. + + -- Steve Langasek Thu, 31 Jan 2019 23:18:10 -0800 + nfs-utils (1:1.3.4-2.3) unstable; urgency=medium * Non-maintainer upload. @@ -579,6 +1262,51 @@ nfs-utils (1:1.3.4-2.3) unstable; urgenc -- Laurent Bigonville Sat, 20 Oct 2018 15:04:07 +0200 +nfs-utils (1:1.3.4-2.2ubuntu5) disco; urgency=medium + + * Remove hard-coded dep on libtirpc1. + + -- Steve Langasek Tue, 13 Nov 2018 17:03:07 -0800 + +nfs-utils (1:1.3.4-2.2ubuntu4) disco; urgency=medium + + * No-change rebuild against latest libtirpc + + -- Jeremy Bicha Sat, 10 Nov 2018 07:54:17 -0500 + +nfs-utils (1:1.3.4-2.2ubuntu3) cosmic; urgency=medium + + * truncate_gid*.patch: Backports from upstream to prevent truncating + UIDs and GIDs over 65536 on certain architectures (LP: #1779962) + + -- Adam Conrad Tue, 16 Oct 2018 06:06:43 -0600 + +nfs-utils (1:1.3.4-2.2ubuntu2) cosmic; urgency=medium + + * glibc-2.28-compat.patch: Include for major/minor. + + -- Adam Conrad Tue, 16 Oct 2018 05:24:40 -0600 + +nfs-utils (1:1.3.4-2.2ubuntu1) cosmic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - 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 + (LP: #1446851) + - 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 + - Convert mountstats and nfsiostat scripts to Python3 and recommend + python3 instead of python. + * Dropped already integrated changes: + - Provide UINT16_MAX definition if not provided by glibc. + + -- Balint Reczey Thu, 23 Aug 2018 16:16:30 +0200 + nfs-utils (1:1.3.4-2.2) unstable; urgency=medium * Non-maintainer upload. @@ -590,6 +1318,55 @@ nfs-utils (1:1.3.4-2.2) unstable; urgenc -- Adrian Bunk Tue, 06 Feb 2018 21:20:36 +0200 +nfs-utils (1:1.3.4-2.1ubuntu5) bionic; urgency=medium + + * Drop obsoleted 20-ticket-expired-error.patch (LP: #1709129) + The original issue is fixed in the kernel starting with version 3.10. + * Refresh patches + * Remove whitespace after '=' in service files + + -- Balint Reczey Tue, 16 Jan 2018 23:49:38 +0100 + +nfs-utils (1:1.3.4-2.1ubuntu4) bionic; urgency=medium + + * Convert mountstats and nfsiostat scripts to Python3 and recommend + python3 instead of python. LP: #1735458. + * Provide UINT16_MAX definition if not provided by glibc. + + -- Matthias Klose Fri, 01 Dec 2017 03:49:39 +0100 + +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. @@ -623,6 +1400,22 @@ nfs-utils (1:1.3.4-1) unstable; urgency= -- 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. @@ -638,6 +1431,27 @@ nfs-utils (1:1.2.8-9.2) unstable; urgenc -- 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: @@ -702,6 +1516,149 @@ nfs-utils (1:1.2.8-9.1) unstable; urgenc -- 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- @@ -710,6 +1667,26 @@ nfs-utils (1:1.2.8-9) unstable; urgency= -- 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. @@ -730,6 +1707,38 @@ nfs-utils (1:1.2.8-7) experimental; urge -- 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 @@ -756,6 +1765,29 @@ nfs-utils (1:1.2.8-6) unstable; urgency= -- 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 ] @@ -772,6 +1804,37 @@ nfs-utils (1:1.2.8-5) unstable; urgency= -- 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. @@ -790,6 +1853,64 @@ nfs-utils (1:1.2.8-3) unstable; urgency= -- 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. @@ -819,12 +1940,80 @@ nfs-utils (1:1.2.8-1) unstable; urgency= -- 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. @@ -852,6 +2041,44 @@ nfs-utils (1:1.2.5-4) unstable; urgency= -- 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 ] @@ -870,6 +2097,33 @@ nfs-utils (1:1.2.5-3) unstable; urgency= -- 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 @@ -912,6 +2166,57 @@ nfs-utils (1:1.2.4-2) UNRELEASED; urgenc -- 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 @@ -999,6 +2304,93 @@ nfs-utils (1:1.2.2-5) unstable; urgency= -- 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) @@ -1026,6 +2418,28 @@ nfs-utils (1:1.2.2-2) unstable; urgency= -- 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 ] @@ -1097,6 +2511,51 @@ nfs-utils (1:1.2.0-4.1) unstable; urgenc -- 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. @@ -1111,6 +2570,94 @@ nfs-utils (1:1.2.0-3) unstable; urgency= -- 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 -pruN 1:2.8.3-1/debian/control 1:2.8.3-1ubuntu3/debian/control --- 1:2.8.3-1/debian/control 2025-03-31 18:13:33.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/control 2025-09-07 08:50:39.000000000 +0000 @@ -1,9 +1,10 @@ Source: nfs-utils Priority: optional Section: net -Maintainer: Debian kernel team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings , Salvatore Bonaccorso -Build-Depends: debhelper-compat (= 13), libwrap0-dev, libevent-dev, libkrb5-dev, libblkid-dev, libkeyutils-dev, pkgconf, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, libmount-dev, libnl-3-dev, libnl-genl-3-dev, libreadline-dev, libsqlite3-dev, libxml2-dev +Build-Depends: debhelper-compat (= 13), libwrap0-dev, libevent-dev, libkrb5-dev, libblkid-dev, libkeyutils-dev, pkgconf, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, libmount-dev, libnl-3-dev, libnl-genl-3-dev, libreadline-dev, libsqlite3-dev, libxml2-dev, dh-apport Standards-Version: 4.7.2 Homepage: https://linux-nfs.org/ Vcs-Git: https://salsa.debian.org/kernel-team/nfs-utils.git @@ -62,10 +63,20 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libnfsidmap2, libnfsidmap-regex -Provides: libnfsidmap2, libnfsidmap-regex -Breaks: libnfsidmap2 (<< 0.25-7~), libnfsidmap-regex -Replaces: libnfsidmap2 (<< 0.25-7~), libnfsidmap-regex +Conflicts: libnfsidmap2 +Breaks: libnfsidmap2 (<< 0.25-7~) +Replaces: libnfsidmap2 (<< 0.25-7~) Description: NFS idmapping library libnfsidmap provides functions to map between NFSv4 names (which are of the form user@domain) and local uid's and gid's. + +Package: libnfsidmap-regex +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Plugin to map NFSv4 names to and from ids via regex + The regex plugin parses NFSv4 user and groups names using regex to extract the + local user or group. NFSv4 names are created by adding constant strings before + and after the local user and group names. diff -pruN 1:2.8.3-1/debian/libnfsidmap-regex.install 1:2.8.3-1ubuntu3/debian/libnfsidmap-regex.install --- 1:2.8.3-1/debian/libnfsidmap-regex.install 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/libnfsidmap-regex.install 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libnfsidmap/regex.so diff -pruN 1:2.8.3-1/debian/libnfsidmap1.docs 1:2.8.3-1ubuntu3/debian/libnfsidmap1.docs --- 1:2.8.3-1/debian/libnfsidmap1.docs 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/libnfsidmap1.docs 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1 @@ +debian/README.Ubuntu diff -pruN 1:2.8.3-1/debian/libnfsidmap1.install 1:2.8.3-1ubuntu3/debian/libnfsidmap1.install --- 1:2.8.3-1/debian/libnfsidmap1.install 2025-03-31 18:13:33.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/libnfsidmap1.install 2025-09-07 08:50:39.000000000 +0000 @@ -1,3 +1,5 @@ usr/lib/*/lib*.so.* -usr/lib/*/libnfsidmap/*.so +usr/lib/*/libnfsidmap/nsswitch.so +usr/lib/*/libnfsidmap/static.so +usr/lib/*/libnfsidmap/umich_ldap.so usr/share/man/man5/idmapd.conf.5 diff -pruN 1:2.8.3-1/debian/nfs-common.docs 1:2.8.3-1ubuntu3/debian/nfs-common.docs --- 1:2.8.3-1/debian/nfs-common.docs 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/nfs-common.docs 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1 @@ +debian/README.Ubuntu diff -pruN 1:2.8.3-1/debian/not-installed 1:2.8.3-1ubuntu3/debian/not-installed --- 1:2.8.3-1/debian/not-installed 2025-03-31 18:13:33.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/not-installed 2025-09-07 08:50:39.000000000 +0000 @@ -1,3 +1,6 @@ debian/tmp/var/lib/nfs/etab debian/tmp/var/lib/nfs/rmtab debian/tmp/var/lib/nfs/state +usr/lib/*/libnfsidmap/*.a +usr/lib/*/libnfsidmap/*.la +usr/lib/*/libnfsidmap.la diff -pruN 1:2.8.3-1/debian/patches/Fix-build-with-glibc-2.42.patch 1:2.8.3-1ubuntu3/debian/patches/Fix-build-with-glibc-2.42.patch --- 1:2.8.3-1/debian/patches/Fix-build-with-glibc-2.42.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/patches/Fix-build-with-glibc-2.42.patch 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1,55 @@ +From: Yaakov Selkowitz +Date: Fri, 27 Jun 2025 04:54:08 -0500 +Subject: [PATCH 1/1] Fix build with glibc-2.42 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +exportfs.c: In function ‘release_lockfile’: +exportfs.c:83:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] + 83 | lockf(_lockfd, F_ULOCK, 0); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +exportfs.c: In function ‘grab_lockfile’: +exportfs.c:77:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] + 77 | lockf(_lockfd, F_LOCK, 0); + | ^~~~~~~~~~~~~~~~~~~~~~~~~ + +lockf is now marked with attribute warn_unused_result: + +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f3c82fc1b41261f582f5f9fa12f74af9bcbc88f9 + +Signed-off-by: Steve Dickson +Origin: upstream, https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=9f974046c37b7c28705d5558328759fff708b1cb +--- + utils/exportfs/exportfs.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c +index b03a047b..748c38e3 100644 +--- a/utils/exportfs/exportfs.c ++++ b/utils/exportfs/exportfs.c +@@ -74,13 +74,19 @@ grab_lockfile(void) + { + _lockfd = open(lockfile, O_CREAT|O_RDWR, 0666); + if (_lockfd != -1) +- lockf(_lockfd, F_LOCK, 0); ++ if (lockf(_lockfd, F_LOCK, 0) != 0) { ++ xlog_warn("%s: lockf() failed: errno %d (%s)", ++ __func__, errno, strerror(errno)); ++ } + } + static void + release_lockfile(void) + { + if (_lockfd != -1) { +- lockf(_lockfd, F_ULOCK, 0); ++ if (lockf(_lockfd, F_ULOCK, 0) != 0) { ++ xlog_warn("%s: lockf() failed: errno %d (%s)", ++ __func__, errno, strerror(errno)); ++ } + close(_lockfd); + _lockfd = -1; + } +-- +2.51.0 + diff -pruN 1:2.8.3-1/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch 1:2.8.3-1ubuntu3/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch --- 1:2.8.3-1/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1,19 @@ +Description: add missing svcgssd long options to nfs.conf(5) +Author: Andreas Hasenack +Forwarded: https://marc.info/?l=linux-nfs&m=165635622607689&w=4 +Last-Update: 2022-06-27 + +--- a/systemd/nfs.conf.man ++++ b/systemd/nfs.conf.man +@@ -280,7 +280,10 @@ + .TP + .B svcgssd + Recognized values: +-.BR principal . ++.BR principal , ++.BR verbosity , ++.BR rpc-verbosity , ++.BR idmap-verbosity . + + See + .BR rpc.svcgssd (8) diff -pruN 1:2.8.3-1/debian/patches/series 1:2.8.3-1ubuntu3/debian/patches/series --- 1:2.8.3-1/debian/patches/series 2025-03-31 18:13:33.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/patches/series 2025-09-07 08:50:39.000000000 +0000 @@ -1,2 +1,5 @@ multiarch-kerberos-paths.patch always-run-generator.patch +ubuntu-idmapd-manpage-update-regex-other-package.patch +nfs-conf-manpage-missing-svcgssd-options.patch +Fix-build-with-glibc-2.42.patch diff -pruN 1:2.8.3-1/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch 1:2.8.3-1ubuntu3/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch --- 1:2.8.3-1/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1,12 @@ +--- a/support/nfsidmap/idmapd.conf.5 ++++ b/support/nfsidmap/idmapd.conf.5 +@@ -158,6 +158,9 @@ + .nf + + .fi ++.B NOTE: ++In Ubuntu, the regex plugin is shipped in the libnfsidmap-regex package. If you want to use this plugin, please install that package. ++ + If the "regex" translation method is specified, the following + variables within the [REGEX] section are used to map between NFS4 names and local IDs. + .TP diff -pruN 1:2.8.3-1/debian/rules 1:2.8.3-1ubuntu3/debian/rules --- 1:2.8.3-1/debian/rules 2025-03-31 18:13:33.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/rules 2025-09-07 08:50:39.000000000 +0000 @@ -9,7 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardeni include /usr/share/dpkg/architecture.mk %: - dh $@ + dh $@ --with apport override_dh_auto_configure: # Use --with-systemd=/lib/systemd/system if backporting to bookworm or earlier @@ -43,3 +43,6 @@ override_dh_installinit: override_dh_missing: dh_missing --list-missing + +override_dh_apport: + dh_apport -pnfs-common diff -pruN 1:2.8.3-1/debian/source.apport 1:2.8.3-1ubuntu3/debian/source.apport --- 1:2.8.3-1/debian/source.apport 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.8.3-1ubuntu3/debian/source.apport 2025-09-07 08:50:39.000000000 +0000 @@ -0,0 +1,32 @@ +#!/usr/bin/python3 + +'''NFS Apport Interface + +Copyright (C) 2022 Canonical Ltd +Author: Andreas Hasenack + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +from apport.hookutils import ( + attach_file_if_exists, + command_output, + recent_syslog, +) +from glob import glob +import re + +def add_info(report, ui): + file_list = ["/etc/nfs.conf","/etc/default/nfs-common", "/etc/default/nfs-kernel-server"] + file_list.extend(glob("/etc/nfs.conf.d/*.conf")) + file_list.append("/etc/exports") + file_list.append("/etc/request-key.d/id_resolver.conf") + for f in file_list: + attach_file_if_exists(report, f) + report["SyslogNFS"] = recent_syslog(re.compile("(rpc\.(nfsd|gssd|svcgssd|statd|mountd|idmapd)|blkmapd|nfsdcld|nfsidmap)\[")) + report["NFSMounts"] = command_output(["findmnt", "-n", "-t", "nfs"]) + report["NFSv4Mounts"] = command_output(["findmnt", "-n", "-t", "nfs4"])