Merge ~ahasenack/ubuntu/+source/nfs-utils:lunar-nfs-utils-merge into ubuntu/+source/nfs-utils:debian/sid
- Git
- lp:~ahasenack/ubuntu/+source/nfs-utils
- lunar-nfs-utils-merge
- Merge into debian/sid
Proposed by
Andreas Hasenack
Status: | Merged |
---|---|
Approved by: | git-ubuntu bot |
Approved revision: | not available |
Merge reported by: | git-ubuntu bot |
Merged at revision: | 8d6a2db7063291b307e7541a565c62090f10210a |
Proposed branch: | ~ahasenack/ubuntu/+source/nfs-utils:lunar-nfs-utils-merge |
Merge into: | ubuntu/+source/nfs-utils:debian/sid |
Diff against target: |
2009 lines (+1662/-8) 18 files modified
debian/README.Ubuntu (+30/-0) debian/changelog (+1337/-0) debian/control (+17/-6) debian/libnfsidmap-regex.install (+1/-0) debian/libnfsidmap1.docs (+1/-0) debian/libnfsidmap1.install (+3/-1) debian/nfs-common.docs (+1/-0) debian/not-installed (+3/-0) debian/patches/always-run-generator.patch (+23/-0) debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch (+19/-0) debian/patches/series (+3/-0) debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch (+12/-0) debian/rules (+8/-1) debian/source.apport (+32/-0) debian/tests/control (+11/-0) debian/tests/kerberos-mount (+38/-0) debian/tests/util (+89/-0) debian/tests/v3-mount (+34/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
git-ubuntu bot | Approve | ||
Sergio Durigan Junior (community) | Approve | ||
Canonical Server Reporter | Pending | ||
Review via email: mp+437544@code.launchpad.net |
Commit message
Description of the change
Quick merge from debian.
PPA: https:/
DEP8 is green in the PPA.
The previous non-git-ubuntu merge missed some d/changelog entries from our delta, which I restored.
I tried sending some of the delta to debian:
DEP8 tests: https:/
generator: https:/
I'll send the d/not-installed one too.
To post a comment you must log in.
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote : | # |
Approvers: ahasenack, sergiodj
Uploaders: ahasenack, sergiodj
MP auto-approved
review:
Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote : | # |
Thanks, uploaded
Uploading nfs-utils_
Uploading nfs-utils_
Uploading nfs-utils_
Uploading nfs-utils_
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/README.Ubuntu b/debian/README.Ubuntu |
2 | new file mode 100644 |
3 | index 0000000..bf80042 |
4 | --- /dev/null |
5 | +++ b/debian/README.Ubuntu |
6 | @@ -0,0 +1,30 @@ |
7 | +# New configuration file |
8 | + |
9 | +nfs-common and nfs-kernel-server use a common configuration file /etc/nfs.conf. |
10 | +They also support a /etc/nfs.conf.d/*.conf structure. |
11 | + |
12 | +If there are local modifications to either /etc/default/nfs-common or |
13 | +/etc/default/nfs-kernel-server as installed by previous versions of the |
14 | +corresponding Debian packages, nfs-common will attempt a migration to the new |
15 | +configuration file. This migration is done by calling the |
16 | +/usr/share/nfs-common/nfsconvert.py script in postinst. |
17 | + |
18 | +Upon success, the script will produce /etc/nfs.conf.d/local.conf with the local |
19 | +customizations specified in those older config files, while /etc/nfs.conf will |
20 | +remain with the default settings. |
21 | + |
22 | +If the migration fails for some reason, the package installation will fail and |
23 | +manual intervention will be required. This will probably involve temporarily |
24 | +removing the offending configuration option that was not handled by the |
25 | +migration script and configuring the package again. Please consult nfs.conf(5) |
26 | +and each daemon's manpage to determine how to translate the command line |
27 | +options previously defined in /etc/default/nfs-* to the new configuration file |
28 | +format. |
29 | + |
30 | +# Services |
31 | + |
32 | +All NFS related services are enabled by default. This means that depending on |
33 | +the NFS version that you intend to use, some services might be superfluous. |
34 | +For example, if you never intend to serve NFSv3, then you can safely disable |
35 | +the rpc-statd.service unit. Note that some NFSv4 service units will start only |
36 | +if Kerberos is setup. |
37 | diff --git a/debian/changelog b/debian/changelog |
38 | index 622cfbc..ac87df3 100644 |
39 | --- a/debian/changelog |
40 | +++ b/debian/changelog |
41 | @@ -1,3 +1,47 @@ |
42 | +nfs-utils (1:2.6.2-4ubuntu1) lunar; urgency=medium |
43 | + |
44 | + * Merge with Debian unstable. Remaining changes: |
45 | + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This |
46 | + package contains not only plugins, but an actual shared library, |
47 | + with a different soname. |
48 | + - Update README file: |
49 | + + d/README.Ubuntu: new /etc/nfs.conf config structure |
50 | + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu |
51 | + - New apport hook (LP #1961058): |
52 | + + d/source.apport: apport hook for nfs-utils |
53 | + + d/control: build-depend dh-apport |
54 | + + d/rules: build with apport, and install the hook in the |
55 | + nfs-common package which is installed on both client and servers |
56 | + - Add more DEP8 tests (LP #1960828): |
57 | + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts |
58 | + + d/t/{control, v3-mount}: specific NFSv3 mount test |
59 | + - Move the regex module to a separate binary package libnfsidmap-regex |
60 | + (LP #1974067): |
61 | + + d/control: new package, adjust breaks/conflicts |
62 | + + d/libnfsidmap-regex.install: install the plugin file |
63 | + + d/libnfsidmap1.install: don't install regex.so |
64 | + [missed in previous d/changelog] |
65 | + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: |
66 | + note that the regex plugin is in another package |
67 | + - rpc.svcgssd fixes and improvements (LP #1977745): |
68 | + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also |
69 | + document the missing svcgssd options to the nfs.conf(5) manpage |
70 | + - Rely on the generator units for the rpc_pipefs mount |
71 | + (LP #1971935): |
72 | + + d/p/always-run-generator.patch: run the generator even if the |
73 | + config differs from the built-in default |
74 | + + d/rules: exclude the units we will let the generator produce |
75 | + [Missed in previous d/changelog] |
76 | + - d/not-installed: mark files we knowingly don't include in the |
77 | + packaging |
78 | + [Missed in previous d/changelog] |
79 | + * Dropped: |
80 | + - d/rules: re-add hardening option lost from the src:libnfsidmap to |
81 | + src:nfs-utils transition (LP: #1980095) |
82 | + [In 1:2.6.2-1~exp1] |
83 | + |
84 | + -- Andreas Hasenack <andreas@canonical.com> Sun, 19 Feb 2023 14:49:53 -0300 |
85 | + |
86 | nfs-utils (1:2.6.2-4) unstable; urgency=medium |
87 | |
88 | [ Guillem Jover ] |
89 | @@ -25,6 +69,39 @@ nfs-utils (1:2.6.2-3) unstable; urgency=medium |
90 | |
91 | -- Salvatore Bonaccorso <carnil@debian.org> Tue, 06 Dec 2022 16:38:32 +0100 |
92 | |
93 | +nfs-utils (1:2.6.2-2ubuntu1) lunar; urgency=low |
94 | + |
95 | + * Merge from Debian unstable. Remaining changes: |
96 | + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This |
97 | + package contains not only plugins, but an actual shared library, |
98 | + with a different soname. |
99 | + - Update README file: |
100 | + + d/README.Ubuntu: new /etc/nfs.conf config structure |
101 | + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu |
102 | + - New apport hook (LP #1961058): |
103 | + + d/source.apport: apport hook for nfs-utils |
104 | + + d/control: build-depend dh-apport |
105 | + + d/rules: build with apport, and install the hook in the |
106 | + nfs-common package which is installed on both client and servers |
107 | + - Add more DEP8 tests (LP #1960828): |
108 | + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts |
109 | + + d/t/{control, v3-moun}t: specific NFSv3 mount test |
110 | + - Move the regex module to a separate binary package libnfsidmap-regex |
111 | + (LP: #1974067): |
112 | + + d/control: new package |
113 | + + d/libnfsidmap-regex.install: install the plugin file |
114 | + + d/not-installed: remove the plugin from the not-installed list |
115 | + + d/p/remove-regex-from-docs.patch: deleted |
116 | + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: |
117 | + note that the regex plugin is in another package |
118 | + - rpc.svcgssd fixes and improvements (LP: #1977745): |
119 | + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also |
120 | + document the missing svcgssd options to the nfs.conf(5) manpage |
121 | + - d/README.Ubuntu: updated with the content of the previous d/NEWS |
122 | + file |
123 | + |
124 | + -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 25 Nov 2022 10:40:08 +0100 |
125 | + |
126 | nfs-utils (1:2.6.2-2) unstable; urgency=medium |
127 | |
128 | [ Debian Janitor ] |
129 | @@ -60,6 +137,96 @@ nfs-utils (1:2.6.2-1~exp1) experimental; urgency=medium |
130 | |
131 | -- Salvatore Bonaccorso <carnil@debian.org> Sun, 21 Aug 2022 22:41:04 +0200 |
132 | |
133 | +nfs-utils (1:2.6.1-2ubuntu5) lunar; urgency=medium |
134 | + |
135 | + * d/p/blkmapd-fix-invalid-free.patch: fix blkmapd crash due to invalid |
136 | + free() (LP: #1979885) |
137 | + |
138 | + -- Andreas Hasenack <andreas@canonical.com> Fri, 28 Oct 2022 08:26:52 -0300 |
139 | + |
140 | +nfs-utils (1:2.6.1-2ubuntu4) kinetic; urgency=medium |
141 | + |
142 | + * No-change rebuild against libevent-core-2.1-7a |
143 | + |
144 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 07 Oct 2022 21:23:03 +0000 |
145 | + |
146 | +nfs-utils (1:2.6.1-2ubuntu3) kinetic; urgency=medium |
147 | + |
148 | + * d/p/fix-format-overflow-warning.patch: fix a format-overflow warning |
149 | + from gcc which was failing the build |
150 | + |
151 | + -- Andreas Hasenack <andreas@canonical.com> Thu, 28 Jul 2022 20:39:54 +0000 |
152 | + |
153 | +nfs-utils (1:2.6.1-2ubuntu2) kinetic; urgency=medium |
154 | + |
155 | + * Rely on the generator units for the rpc_pipefs mount |
156 | + (LP: #1971935): |
157 | + - d/p/always-run-generator.patch: run the generator even if the |
158 | + config differs from the built-in default |
159 | + - d/rules: exclude the units we will let the generator produce |
160 | + |
161 | + -- Andreas Hasenack <andreas@canonical.com> Thu, 07 Jul 2022 21:08:11 +0000 |
162 | + |
163 | +nfs-utils (1:2.6.1-2ubuntu1) kinetic; urgency=medium |
164 | + |
165 | + * Merge with Debian unstable (LP: #1974233). Remaining changes: |
166 | + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This |
167 | + package contains not only plugins, but an actual shared library, |
168 | + with a different soname. |
169 | + - Don't install the regex module, as it's built by |
170 | + src:libnfsidmap-regex which is in Universe (MIR: #1960824) |
171 | + + d/control: don't conflict/break/etc with libnfsidmap-regex |
172 | + + d/libnfsidmap1.install: don't install regex.so |
173 | + + d/not-installed: mark files we knowingly don't include in the |
174 | + packaging |
175 | + + d/p/remove-regex-from-docs.patch: remove the regex section from |
176 | + the idmapd.conf(5) manpage, as we are not building that plugin in |
177 | + this package |
178 | + - Update README file: |
179 | + + d/README.Ubuntu: new /etc/nfs.conf config structure |
180 | + + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu |
181 | + - d/nfs-common.postrm: also purge /etc/nfs.conf.d/local.conf |
182 | + - d/nfs-common.dirs: we also own /etc/nfs.conf.d |
183 | + - New apport hook (LP #1961058): |
184 | + + d/source.apport: apport hook for nfs-utils |
185 | + + d/control: build-depend dh-apport |
186 | + + d/rules: build with apport, and install the hook in the |
187 | + nfs-common package which is installed on both client and servers |
188 | + - Add more DEP8 tests (LP #1960828): |
189 | + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts |
190 | + + d/t/{control, v3-moun}t: specific NFSv3 mount test |
191 | + * Dropped: |
192 | + - d/nfsconvert.py: add short "u" option for mountd's no-udp |
193 | + [Included in 1:2.6.1-2] |
194 | + - d/NEWS: explain some of the major changes in 2.6.x |
195 | + [Obsoleted by Debian's update to the per-package NEWS files] |
196 | + - d/nfs-*.bug-script: update to also include /etc/nfs.conf and |
197 | + /etc/nfs.conf.d/*.conf |
198 | + [Included in 1:2.6.1-2] |
199 | + * Added changes: |
200 | + - New binary package libnfsidmap-regex (LP: #1974067): |
201 | + + d/control: new package |
202 | + + d/libnfsidmap-regex.install: install the plugin file |
203 | + + d/not-installed: remove the plugin from the not-installed list |
204 | + + d/p/remove-regex-from-docs.patch: deleted |
205 | + + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: |
206 | + note that the regex plugin is in another package |
207 | + - rpc.svcgssd fixes and improvements (LP: #1977745): |
208 | + + d/p/svcgssd-fix-use-after-free.patch: fix use-after-free which was |
209 | + preventing svcgssd options set in /etc/nfs.conf from being used |
210 | + + d/p/svcgssd-display-principal-if-set.patch: improve logging, |
211 | + showing the expected principal name if it was set in the config |
212 | + + d/p/svcgssd-document-missing-options.patch: add missing options to |
213 | + the svcgssd manpage |
214 | + + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also |
215 | + document the missing svcgssd options to the nfs.conf(5) manpage |
216 | + - d/README.Ubuntu: updated with the content of the previous d/NEWS |
217 | + file |
218 | + - d/rules: re-add hardening option lost from the src:libnfsidmap to |
219 | + src:nfs-utils transition (LP: #1980095) |
220 | + |
221 | + -- Andreas Hasenack <andreas@canonical.com> Tue, 28 Jun 2022 10:59:36 -0300 |
222 | + |
223 | nfs-utils (1:2.6.1-2) unstable; urgency=medium |
224 | |
225 | [ Andreas Hasenack ] |
226 | @@ -86,6 +253,51 @@ nfs-utils (1:2.6.1-2) unstable; urgency=medium |
227 | |
228 | -- Salvatore Bonaccorso <carnil@debian.org> Tue, 12 Apr 2022 12:20:44 +0200 |
229 | |
230 | +nfs-utils (1:2.6.1-1ubuntu1) jammy; urgency=medium |
231 | + |
232 | + * Merge with Debian unstable (LP: #1960829). Remaining changes: |
233 | + - d/control: don't provide libnfsidmap2 in libnfsidmap1. This |
234 | + package contains not only plugins, but an actual shared library, |
235 | + with a different soname. |
236 | + - d/NEWS: explain some of the major changes in 2.6.x |
237 | + - Don't install the regex module, as it's built by |
238 | + src:libnfsidmap-regex which is in Universe (MIR: #1960824) |
239 | + + d/control: don't conflict/break/etc with libnfsidmap-regex |
240 | + + d/libnfsidmap1.install: don't install regex.so |
241 | + + d/not-installed: mark files we knowingly don't include in the |
242 | + packaging |
243 | + + d/p/remove-regex-from-docs.patch: remove the regex section from |
244 | + the idmapd.conf(5) manpage, as we are not building that plugin in |
245 | + this package |
246 | + - Update README files: |
247 | + + d/README.Ubuntu: explains some of the packaging decisions |
248 | + + d/README.Debian.nfsv4: removed as the content is out of date |
249 | + + d/nfs-common.docs: install README.Ubuntu instead of |
250 | + README.Debian.nfsv4 |
251 | + + d/libnfsidmap1.docs: install README.Ubuntu |
252 | + * Dropped: |
253 | + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
254 | + the #DEBHELPER# section can do its job if needed |
255 | + [Fixed with the upstream re-arrangement of systemd units] |
256 | + * Added: |
257 | + - d/nfsconvert.py: add short "u" option for mountd's no-udp |
258 | + - d/NEWS: update |
259 | + - d/nfs-common.postrm: also purge /etc/nfs.conf.d/local.conf |
260 | + - d/nfs-common.dirs: we also own /etc/nfs.conf.d |
261 | + - d/README.Ubuntu: update |
262 | + - d/nfs-*.bug-script: update to also include /etc/nfs.conf and |
263 | + /etc/nfs.conf.d/*.conf |
264 | + - New apport hook (LP: #1961058): |
265 | + + d/source.apport: apport hook for nfs-utils |
266 | + + d/control: build-depend dh-apport |
267 | + + d/rules: build with apport, and install the hook in the |
268 | + nfs-common package which is installed on both client and servers |
269 | + - Add more DEP8 tests (LP: #1960828): |
270 | + + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts |
271 | + + d/t/{control, v3-moun}t: specific NFSv3 mount test |
272 | + |
273 | + -- Andreas Hasenack <andreas@canonical.com> Fri, 04 Mar 2022 17:44:10 -0300 |
274 | + |
275 | nfs-utils (1:2.6.1-1) unstable; urgency=medium |
276 | |
277 | [ Ben Hutchings ] |
278 | @@ -108,6 +320,65 @@ nfs-utils (1:2.6.1-1) unstable; urgency=medium |
279 | |
280 | -- Ben Hutchings <benh@debian.org> Thu, 24 Feb 2022 14:54:49 +0100 |
281 | |
282 | +nfs-utils (1:2.6.1-1~exp1ubuntu1) jammy; urgency=medium |
283 | + |
284 | + * Merge with Debian experimental (LP: #1878601, #1812280). Remaining |
285 | + changes: |
286 | + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
287 | + the #DEBHELPER# section can do its job if needed |
288 | + * Dropped: |
289 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
290 | + [Ubuntu has it, but not in main] |
291 | + - debian/nfs-common.default: remove NEED_STATD and related comment. |
292 | + [/etc/default/nfs-* files are no longer used] |
293 | + - debian/nfs-common.default: always start idmapd automatically; drop the |
294 | + configuration option. |
295 | + [/etc/default/nfs-* files are no longer used] |
296 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
297 | + argument of the serialize_krb5_ctx() function. |
298 | + [Was only needed when libgssglue-dev was used for build, which it |
299 | + isn't since nfs-utils 1:1.2.8-7] |
300 | + - Fixing nfs-mountd dependency on rpcbind (race condition) by adding |
301 | + "rpcbind.socket" to "nfs-mountd.service" as a dependency to avoid race |
302 | + conditions: |
303 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
304 | + [Fixed upstream] |
305 | + - truncate_gid*.patch: Backports from upstream to prevent truncating UIDs |
306 | + and GIDs over 65536 on certain architectures |
307 | + [Fixed upstream] |
308 | + - d/p/fix-start-ordering-1.patch, d/p/fix-start-ordering-2.patch, d/p/fix- |
309 | + start-ordering-3.patch, d/nfs-kernel-server.install: Fix systemd service |
310 | + start ordering |
311 | + [Fixed upstream. Patch 3 we don't need anymore because now the pkg |
312 | + is built with --with-systemd] |
313 | + - Depend on network-online.target when starting services. |
314 | + - d/p/lp1918141-use-network-online-target-01.patch: Declare a |
315 | + Wants=network-online.target on all NFS server services. |
316 | + - d/p/lp1918141-use-network-online-target-02.patch: Declare a |
317 | + After=network-online.target on all NFS server services. Thanks to |
318 | + Niklas Edmundsson for helping with the reproducer. |
319 | + [Fixed upstream] |
320 | + * Added: |
321 | + - d/control: don't provide libnfsidmap2 in libnfsidmap1 |
322 | + - d/NEWS: explain some of the major changes in 2.6.x |
323 | + - Don't install the regex module, as it's built by |
324 | + src:libnfsidmap-regex which is in Universe (MIR: #1960824) |
325 | + + d/control: don't conflict/break/etc with libnfsidmap-regex |
326 | + + d/libnfsidmap1.install: don't install regex.so |
327 | + + d/not-installed: mark files we knowingly don't include in the |
328 | + packaging |
329 | + + d/p/remove-regex-from-docs.patch: remove the regex section from |
330 | + the idmapd.conf(5) manpage, as we are not building that plugin in |
331 | + this package |
332 | + - Update README files: |
333 | + + d/README.Ubuntu: explains some of the packaging decisions |
334 | + + d/README.Debian.nfsv4: removed as the content is out of date |
335 | + + d/nfs-common.docs: install README.Ubuntu instead of |
336 | + README.Debian.nfsv4 |
337 | + + d/libnfsidmap1.docs: install README.Ubuntu |
338 | + |
339 | + -- Andreas Hasenack <andreas@canonical.com> Wed, 16 Feb 2022 20:20:26 +0000 |
340 | + |
341 | nfs-utils (1:2.6.1-1~exp1) experimental; urgency=medium |
342 | |
343 | [ Romain Perier ] |
344 | @@ -229,6 +500,50 @@ nfs-utils (1:2.5.4-1~exp1) experimental; urgency=medium |
345 | |
346 | -- Anibal Monsalve Salazar <anibal@debian.org> Sun, 05 Sep 2021 23:50:09 +1000 |
347 | |
348 | +nfs-utils (1:1.3.4-6ubuntu1) impish; urgency=medium |
349 | + |
350 | + * Merge from Debian unstable (LP: #1929406). Remaining changes: |
351 | + - debian/nfs-common.default: always start idmapd automatically; drop the |
352 | + configuration option. |
353 | + - debian/nfs-common.default: remove NEED_STATD and related comment. |
354 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
355 | + argument of the serialize_krb5_ctx() function. |
356 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
357 | + - Fixing nfs-mountd dependency on rpcbind (race condition) by adding |
358 | + "rpcbind.socket" to "nfs-mountd.service" as a dependency to avoid race |
359 | + conditions: |
360 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
361 | + - truncate_gid*.patch: Backports from upstream to prevent truncating UIDs |
362 | + and GIDs over 65536 on certain architectures |
363 | + - d/p/fix-start-ordering-1.patch, d/p/fix-start-ordering-2.patch, d/p/fix- |
364 | + start-ordering-3.patch, d/nfs-kernel-server.install: Fix systemd service |
365 | + start ordering |
366 | + - Depend on network-online.target when starting services. |
367 | + - d/p/lp1918141-use-network-online-target-01.patch: Declare a |
368 | + Wants=network-online.target on all NFS server services. |
369 | + - d/p/lp1918141-use-network-online-target-02.patch: Declare a |
370 | + After=network-online.target on all NFS server services. Thanks to |
371 | + Niklas Edmundsson for helping with the reproducer. |
372 | + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
373 | + the #DEBHELPER# section can do its job if needed |
374 | + * Removed patches obsoleted/merged by upstream: |
375 | + - Remove hard-coded dep on libtirpc1; already merged upstream, but |
376 | + previously un-noted |
377 | + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
378 | + which is the variable name expected by the rpc-svcgssd systemd service; |
379 | + already merged upstream, but previously un-noted |
380 | + - d/p/python3.diff obsoleted by |
381 | + d/p/Convert-remaining-python-scripts-to-python3.patch |
382 | + * d/p/nfsiostat-replace-list-reserved-word.patch: re-instated after |
383 | + previous merge removed a patch already merged upstream |
384 | + * d/p/01-sm-notify-in-sbin.patch, |
385 | + d/p/03-handle-mtab-symlink.patch, |
386 | + d/p/17-multiarch-kerberos-paths.patch, |
387 | + d/p/unbreak-blkmapd-rpc_pipefs-run.patch: |
388 | + reverted unnecessary refresh of patches |
389 | + |
390 | + -- Dave Jones <dave.jones@canonical.com> Tue, 06 Jul 2021 11:47:33 +0100 |
391 | + |
392 | nfs-utils (1:1.3.4-6) unstable; urgency=medium |
393 | |
394 | * mountstats: Remove a shebang |
395 | @@ -246,6 +561,59 @@ nfs-utils (1:1.3.4-5) unstable; urgency=medium |
396 | |
397 | -- Salvatore Bonaccorso <carnil@debian.org> Tue, 09 Mar 2021 17:17:42 +0100 |
398 | |
399 | +nfs-utils (1:1.3.4-4ubuntu3) impish; urgency=medium |
400 | + |
401 | + * d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
402 | + the #DEBHELPER# section can do its job if needed (LP: #1928259) |
403 | + |
404 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 24 May 2021 17:59:39 -0300 |
405 | + |
406 | +nfs-utils (1:1.3.4-4ubuntu2) hirsute; urgency=medium |
407 | + |
408 | + * Depend on network-online.target when starting services. (LP: #1918141) |
409 | + - d/p/lp1918141-use-network-online-target-01.patch: Declare a |
410 | + Wants=network-online.target on all NFS server services. |
411 | + - d/p/lp1918141-use-network-online-target-02.patch: Declare a |
412 | + After=network-online.target on all NFS server services. |
413 | + Thanks to Niklas Edmundsson for helping with the reproducer. |
414 | + |
415 | + -- Sergio Durigan Junior <sergio.durigan@canonical.com> Mon, 15 Mar 2021 18:26:22 -0400 |
416 | + |
417 | +nfs-utils (1:1.3.4-4ubuntu1) hirsute; urgency=low |
418 | + |
419 | + * Merge from Debian unstable. Remaining changes: |
420 | + - debian/nfs-common.default: always start idmapd automatically; drop |
421 | + the configuration option. |
422 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
423 | + argument of the serialize_krb5_ctx() function. |
424 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
425 | + - Fixing nfs-mountd dependency on rpcbind (race condition) |
426 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
427 | + to avoid race conditions: |
428 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
429 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
430 | + python3 instead of python. |
431 | + - truncate_gid*.patch: Backports from upstream to prevent truncating |
432 | + UIDs and GIDs over 65536 on certain architectures |
433 | + - Remove hard-coded dep on libtirpc1. |
434 | + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
435 | + which is the variable name expected by the rpc-svcgssd systemd service. |
436 | + - d/p/fix-start-ordering-1.patch, |
437 | + d/p/fix-start-ordering-2.patch, |
438 | + d/p/fix-start-ordering-3.patch, |
439 | + d/nfs-kernel-server.install: |
440 | + Fix systemd service start ordering |
441 | + * Dropped changes, included in Debian: |
442 | + - Allow compilation to succeed with -fno-common |
443 | + - debian/nfs-common.postinst: don't make /var/lib/nfs owned by statd. |
444 | + - debian/patches/CVE-2019-3689.patch: take user-id from |
445 | + /var/lib/nfs/sm in support/nsm/file.c, utils/statd/sm-notify.man, |
446 | + utils/statd/statd.man. |
447 | + - d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due |
448 | + to using 'list' as a variable name. |
449 | + |
450 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 26 Oct 2020 09:25:58 -0700 |
451 | + |
452 | nfs-utils (1:1.3.4-4) unstable; urgency=medium |
453 | |
454 | * Allow compilation to succeed with -fno-common (Closes: #957608) |
455 | @@ -284,6 +652,73 @@ nfs-utils (1:1.3.4-3) unstable; urgency=medium |
456 | |
457 | -- Salvatore Bonaccorso <carnil@debian.org> Fri, 13 Mar 2020 05:16:46 +0100 |
458 | |
459 | +nfs-utils (1:1.3.4-2.5ubuntu6) groovy; urgency=medium |
460 | + |
461 | + * Allow compilation to succeed with -fno-common (Closes: #957608) |
462 | + (cherry picked from 1:1.3.4-4) |
463 | + |
464 | + -- Julian Andres Klode <juliank@ubuntu.com> Wed, 16 Sep 2020 16:20:55 +0200 |
465 | + |
466 | +nfs-utils (1:1.3.4-2.5ubuntu5) groovy; urgency=medium |
467 | + |
468 | + * SECURITY UPDATE: privilege escalation via directory permissions |
469 | + - debian/patches/CVE-2019-3689.patch: take user-id from |
470 | + /var/lib/nfs/sm in support/nsm/file.c, utils/statd/sm-notify.man, |
471 | + utils/statd/statd.man. |
472 | + - debian/nfs-common.postinst: don't make /var/lib/nfs owned by statd. |
473 | + - CVE-2019-3689 |
474 | + |
475 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 17 Jun 2020 08:42:59 -0400 |
476 | + |
477 | +nfs-utils (1:1.3.4-2.5ubuntu4) groovy; urgency=medium |
478 | + |
479 | + [ Rodrigo Barbieri ] |
480 | + * d/p/fix-start-ordering-1.patch, |
481 | + d/p/fix-start-ordering-2.patch, |
482 | + d/p/fix-start-ordering-3.patch, |
483 | + d/nfs-kernel-server.install: |
484 | + - Fix systemd service start ordering (LP: #1871214) |
485 | + |
486 | + -- Dariusz Gadomski <dariusz.gadomski@canonical.com> Thu, 28 May 2020 17:45:23 -0400 |
487 | + |
488 | +nfs-utils (1:1.3.4-2.5ubuntu3) focal; urgency=medium |
489 | + |
490 | + * No-change rebuild for libevent soname changes. |
491 | + |
492 | + -- Matthias Klose <doko@ubuntu.com> Sat, 19 Oct 2019 19:57:12 +0000 |
493 | + |
494 | +nfs-utils (1:1.3.4-2.5ubuntu2) eoan; urgency=medium |
495 | + |
496 | + * No-change upload with strops.h and sys/strops.h removed in glibc. |
497 | + |
498 | + -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 11:04:05 +0000 |
499 | + |
500 | +nfs-utils (1:1.3.4-2.5ubuntu1) eoan; urgency=low |
501 | + |
502 | + * Merge from Debian unstable. Remaining changes: |
503 | + - debian/nfs-common.default: always start idmapd automatically; drop |
504 | + the configuration option. |
505 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
506 | + argument of the serialize_krb5_ctx() function. |
507 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
508 | + - Fixing nfs-mountd dependency on rpcbind (race condition) |
509 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
510 | + to avoid race conditions: |
511 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
512 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
513 | + python3 instead of python. |
514 | + - truncate_gid*.patch: Backports from upstream to prevent truncating |
515 | + UIDs and GIDs over 65536 on certain architectures |
516 | + - Remove hard-coded dep on libtirpc1. |
517 | + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
518 | + which is the variable name expected by the rpc-svcgssd systemd service. |
519 | + - d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due |
520 | + to using 'list' as a variable name. |
521 | + * Dropped changes, included in Debian: |
522 | + - glibc-2.28-compat.patch: Include <sys/sysmacros.h> for major/minor. |
523 | + |
524 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 May 2019 22:43:12 -0700 |
525 | + |
526 | nfs-utils (1:1.3.4-2.5) unstable; urgency=medium |
527 | |
528 | * Non-maintainer upload. |
529 | @@ -309,6 +744,43 @@ nfs-utils (1:1.3.4-2.4) unstable; urgency=medium |
530 | |
531 | -- Hilko Bengen <bengen@debian.org> Sat, 09 Feb 2019 15:26:27 +0100 |
532 | |
533 | +nfs-utils (1:1.3.4-2.3ubuntu3) disco; urgency=medium |
534 | + |
535 | + * d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due to |
536 | + using 'list' as a variable name. (LP: #1821261) |
537 | + |
538 | + -- Matthew Ruffell <matthew.ruffell@canonical.com> Tue, 02 Apr 2019 11:09:15 +1300 |
539 | + |
540 | +nfs-utils (1:1.3.4-2.3ubuntu2) disco; urgency=medium |
541 | + |
542 | + * d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
543 | + which is the variable name expected by the rpc-svcgssd systemd service. |
544 | + (LP: #1616123) |
545 | + |
546 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 25 Mar 2019 09:24:29 -0300 |
547 | + |
548 | +nfs-utils (1:1.3.4-2.3ubuntu1) disco; urgency=low |
549 | + |
550 | + * Merge from Debian unstable. Remaining changes: |
551 | + - debian/nfs-common.default: always start idmapd automatically; drop |
552 | + the configuration option. |
553 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
554 | + argument of the serialize_krb5_ctx() function. |
555 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
556 | + (LP: #1446851) |
557 | + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
558 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
559 | + to avoid race conditions: |
560 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
561 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
562 | + python3 instead of python. |
563 | + - glibc-2.28-compat.patch: Include <sys/sysmacros.h> for major/minor. |
564 | + - truncate_gid*.patch: Backports from upstream to prevent truncating |
565 | + UIDs and GIDs over 65536 on certain architectures |
566 | + - Remove hard-coded dep on libtirpc1. |
567 | + |
568 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Jan 2019 23:18:10 -0800 |
569 | + |
570 | nfs-utils (1:1.3.4-2.3) unstable; urgency=medium |
571 | |
572 | * Non-maintainer upload. |
573 | @@ -328,6 +800,51 @@ nfs-utils (1:1.3.4-2.3) unstable; urgency=medium |
574 | |
575 | -- Laurent Bigonville <bigon@debian.org> Sat, 20 Oct 2018 15:04:07 +0200 |
576 | |
577 | +nfs-utils (1:1.3.4-2.2ubuntu5) disco; urgency=medium |
578 | + |
579 | + * Remove hard-coded dep on libtirpc1. |
580 | + |
581 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 13 Nov 2018 17:03:07 -0800 |
582 | + |
583 | +nfs-utils (1:1.3.4-2.2ubuntu4) disco; urgency=medium |
584 | + |
585 | + * No-change rebuild against latest libtirpc |
586 | + |
587 | + -- Jeremy Bicha <jbicha@ubuntu.com> Sat, 10 Nov 2018 07:54:17 -0500 |
588 | + |
589 | +nfs-utils (1:1.3.4-2.2ubuntu3) cosmic; urgency=medium |
590 | + |
591 | + * truncate_gid*.patch: Backports from upstream to prevent truncating |
592 | + UIDs and GIDs over 65536 on certain architectures (LP: #1779962) |
593 | + |
594 | + -- Adam Conrad <adconrad@ubuntu.com> Tue, 16 Oct 2018 06:06:43 -0600 |
595 | + |
596 | +nfs-utils (1:1.3.4-2.2ubuntu2) cosmic; urgency=medium |
597 | + |
598 | + * glibc-2.28-compat.patch: Include <sys/sysmacros.h> for major/minor. |
599 | + |
600 | + -- Adam Conrad <adconrad@ubuntu.com> Tue, 16 Oct 2018 05:24:40 -0600 |
601 | + |
602 | +nfs-utils (1:1.3.4-2.2ubuntu1) cosmic; urgency=medium |
603 | + |
604 | + * Merge from Debian unstable. Remaining changes: |
605 | + - debian/nfs-common.default: always start idmapd automatically; drop |
606 | + the configuration option. |
607 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
608 | + argument of the serialize_krb5_ctx() function. |
609 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
610 | + (LP: #1446851) |
611 | + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
612 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
613 | + to avoid race conditions: |
614 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
615 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
616 | + python3 instead of python. |
617 | + * Dropped already integrated changes: |
618 | + - Provide UINT16_MAX definition if not provided by glibc. |
619 | + |
620 | + -- Balint Reczey <rbalint@ubuntu.com> Thu, 23 Aug 2018 16:16:30 +0200 |
621 | + |
622 | nfs-utils (1:1.3.4-2.2) unstable; urgency=medium |
623 | |
624 | * Non-maintainer upload. |
625 | @@ -339,6 +856,55 @@ nfs-utils (1:1.3.4-2.2) unstable; urgency=medium |
626 | |
627 | -- Adrian Bunk <bunk@debian.org> Tue, 06 Feb 2018 21:20:36 +0200 |
628 | |
629 | +nfs-utils (1:1.3.4-2.1ubuntu5) bionic; urgency=medium |
630 | + |
631 | + * Drop obsoleted 20-ticket-expired-error.patch (LP: #1709129) |
632 | + The original issue is fixed in the kernel starting with version 3.10. |
633 | + * Refresh patches |
634 | + * Remove whitespace after '=' in service files |
635 | + |
636 | + -- Balint Reczey <rbalint@ubuntu.com> Tue, 16 Jan 2018 23:49:38 +0100 |
637 | + |
638 | +nfs-utils (1:1.3.4-2.1ubuntu4) bionic; urgency=medium |
639 | + |
640 | + * Convert mountstats and nfsiostat scripts to Python3 and recommend |
641 | + python3 instead of python. LP: #1735458. |
642 | + * Provide UINT16_MAX definition if not provided by glibc. |
643 | + |
644 | + -- Matthias Klose <doko@ubuntu.com> Fri, 01 Dec 2017 03:49:39 +0100 |
645 | + |
646 | +nfs-utils (1:1.3.4-2.1ubuntu2) artful; urgency=medium |
647 | + |
648 | + * Fix flaky autopkgtest: a 'sync' after an update on the server does not |
649 | + guarantee that the change is visible on the client. For that, we need |
650 | + to flush the inode/dentry cache instead. |
651 | + |
652 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Aug 2017 23:08:25 -0700 |
653 | + |
654 | +nfs-utils (1:1.3.4-2.1ubuntu1) artful; urgency=low |
655 | + |
656 | + * Merge from Debian unstable. Remaining changes: |
657 | + - debian/nfs-common.default: always start idmapd automatically; drop |
658 | + the configuration option. |
659 | + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) |
660 | + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel |
661 | + on ticket expiry. (LP: #794112) |
662 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
663 | + argument of the serialize_krb5_ctx() function. (LP: #1331201) |
664 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
665 | + (LP: #1446851) |
666 | + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart |
667 | + jobs) on upgrades. This needs to be kept until after 18.04 LTS. |
668 | + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
669 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
670 | + to avoid race conditions: |
671 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
672 | + * Dropped already integrated changes: |
673 | + - Add a dependency on keyutils to nfs-common, so that idmapping will work |
674 | + under systemd. (LP: #1449074) |
675 | + |
676 | + -- Balint Reczey <rbalint@ubuntu.com> Thu, 03 Aug 2017 20:50:38 +0200 |
677 | + |
678 | nfs-utils (1:1.3.4-2.1) unstable; urgency=medium |
679 | |
680 | * Non-maintainer upload. |
681 | @@ -372,6 +938,22 @@ nfs-utils (1:1.3.4-1) unstable; urgency=medium |
682 | |
683 | -- Daniel Pocock <daniel@pocock.pro> Tue, 13 Dec 2016 19:37:42 +0100 |
684 | |
685 | +nfs-utils (1:1.2.8-9.2ubuntu2) zesty; urgency=medium |
686 | + |
687 | + * Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
688 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
689 | + to avoid race conditions: |
690 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
691 | + - Add systemd-unit-files-fix-up-dependencies-on-rpcbind.patch |
692 | + |
693 | + -- Rafael David Tinoco <rafael.tinoco@canonical.com> Fri, 17 Mar 2017 12:19:53 +0100 |
694 | + |
695 | +nfs-utils (1:1.2.8-9.2ubuntu1) yakkety; urgency=medium |
696 | + |
697 | + * Merge fixes from Debian. |
698 | + |
699 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 12 Sep 2016 23:18:00 +0200 |
700 | + |
701 | nfs-utils (1:1.2.8-9.2) unstable; urgency=medium |
702 | |
703 | * Non-maintainer upload. |
704 | @@ -387,6 +969,27 @@ nfs-utils (1:1.2.8-9.2) unstable; urgency=medium |
705 | |
706 | -- Andreas Henriksson <andreas@fatal.se> Thu, 11 Aug 2016 18:50:24 +0200 |
707 | |
708 | +nfs-utils (1:1.2.8-9.1ubuntu1) yakkety; urgency=medium |
709 | + |
710 | + * Drop upstart jobs, upstart is not in yakkety any more. |
711 | + * Drop libgssglue-dev build dep, --with-gssglue got dropped a while ago. |
712 | + * Merge with Debian unstable. Remaining Ubuntu changes: |
713 | + - debian/nfs-common.default: always start idmapd automatically; drop |
714 | + the configuration option. |
715 | + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) |
716 | + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel |
717 | + on ticket expiry. (LP: #794112) |
718 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
719 | + argument of the serialize_krb5_ctx() function. (LP: #1331201) |
720 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
721 | + (LP: #1446851) |
722 | + - Add a dependency on keyutils to nfs-common, so that idmapping will work |
723 | + under systemd. (LP: #1449074) |
724 | + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart |
725 | + jobs) on upgrades. This needs to be kept until after 18.04 LTS. |
726 | + |
727 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 28 Jul 2016 15:21:53 +0200 |
728 | + |
729 | nfs-utils (1:1.2.8-9.1) unstable; urgency=medium |
730 | |
731 | Partial sync from ubuntu, included changes: |
732 | @@ -451,6 +1054,149 @@ nfs-utils (1:1.2.8-9.1) unstable; urgency=medium |
733 | |
734 | -- Andreas Henriksson <andreas@fatal.se> Tue, 28 Jun 2016 02:05:16 +0200 |
735 | |
736 | +nfs-utils (1:1.2.8-9ubuntu13) yakkety; urgency=medium |
737 | + |
738 | + * Drop obsolete versioned initscripts dependency. (Closes: #804990) |
739 | + |
740 | + -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 22 Jun 2016 16:09:37 +0200 |
741 | + |
742 | +nfs-utils (1:1.2.8-9ubuntu12) xenial; urgency=medium |
743 | + |
744 | + * Drop gssproxy as it's not in Ubuntu (LP: #1446851) |
745 | + * Fix no nfs doesn't show failed units on client (LP: #1452667) |
746 | + |
747 | + -- Bryan Quigley <bryan.quigley@canonical.com> Wed, 02 Mar 2016 15:01:29 -0500 |
748 | + |
749 | +nfs-utils (1:1.2.8-9ubuntu11) xenial; urgency=medium |
750 | + |
751 | + * Drop obsolete and no-op dh_installinit --upstart-only option. |
752 | + (LP: #1519228) |
753 | + |
754 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 24 Nov 2015 09:39:56 +0100 |
755 | + |
756 | +nfs-utils (1:1.2.8-9ubuntu10) wily; urgency=medium |
757 | + |
758 | + * debian/nfs-common.links: Add naming compatibility symlinks for |
759 | + gssd.service → rpc-gssd.service and idmapd.service → /dev/null (as this |
760 | + is bound to/handled by nfs-server.service) to provide a match for the |
761 | + upstart job names. (LP: #1476010). |
762 | + |
763 | + -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 28 Aug 2015 09:59:48 +0200 |
764 | + |
765 | +nfs-utils (1:1.2.8-9ubuntu9) wily; urgency=medium |
766 | + |
767 | + * Drop versioned mountall dependency. Trusty's is already newer and we don't |
768 | + need it with systemd under Ubuntu 15.04 and newer. |
769 | + |
770 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 27 Jul 2015 10:37:24 +0200 |
771 | + |
772 | +nfs-utils (1:1.2.8-9ubuntu8.1) vivid; urgency=medium |
773 | + |
774 | + * Add a dependency on keyutils to nfs-common, so that idmapping will work |
775 | + under systemd. LP: #1449074. |
776 | + |
777 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 27 Apr 2015 17:46:03 +0200 |
778 | + |
779 | +nfs-utils (1:1.2.8-9ubuntu8) vivid; urgency=medium |
780 | + |
781 | + * Ship missing .override files |
782 | + * Ensure we only remove the manual flag from the statd-mounting.override |
783 | + file, and potentially, remove it if empty. |
784 | + |
785 | + -- Didier Roche <didrocks@ubuntu.com> Wed, 01 Apr 2015 08:22:59 +0200 |
786 | + |
787 | +nfs-utils (1:1.2.8-9ubuntu7) vivid; urgency=medium |
788 | + |
789 | + * 27-systemd-enable-with-systemctl-statd.patch: let the admin |
790 | + enable/disable statd via systemd tools. (LP: #1428486) |
791 | + * debian/nfs-common.default: remove NEED_STATD and related comment. |
792 | + * debian/statd{,-mounting}.upstart: remove the usage of NEED_STATD, we'll |
793 | + directly disable the jobs now. |
794 | + * debian/rules: don't start statd by default (or it will trigger upstart |
795 | + and systemd statd unit startup). |
796 | + * debian/nfs-common.{preinst,postinst}: transition the conffile to the new |
797 | + template and enable statd services in both upstart and systemd if |
798 | + NEED_STATD was set to yes. |
799 | + * debian/control, debian/*install: move nfs-utils.service to nfs-common |
800 | + package. (LP: #1436304) |
801 | + |
802 | + -- Didier Roche <didrocks@ubuntu.com> Thu, 12 Mar 2015 09:13:06 +0100 |
803 | + |
804 | +nfs-utils (1:1.2.8-9ubuntu6) vivid; urgency=medium |
805 | + |
806 | + * Revert previous upload; per upstream, rpc.idmapd is not used when the |
807 | + nfsidmap utility is available and configured for use in request-key |
808 | + upcalls. So rpc.idmapd does not need to be started on clients anymore. |
809 | + |
810 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 06 Mar 2015 10:19:57 -0800 |
811 | + |
812 | +nfs-utils (1:1.2.8-9ubuntu5) vivid; urgency=medium |
813 | + |
814 | + * Add 27-systemd-start-nfs-idmapd-also-on-clients.patch: idmapd is needed |
815 | + for clients too, so start it from nfs-client.target and stop binding to it |
816 | + in nfs-server.service. (LP: #1428961) |
817 | + |
818 | + -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 06 Mar 2015 11:56:46 +0100 |
819 | + |
820 | +nfs-utils (1:1.2.8-9ubuntu4) vivid; urgency=medium |
821 | + |
822 | + * Add autopkgtest for installing server and client on localhost, setting up |
823 | + two exports, rebooting, and ensuring that the NFS mounts work. |
824 | + * Add 23-systemd-relax-dependencies.patch: Stop depending on basic.target in |
825 | + the daemons which still do; i. e. add DefaultDependencies=no. This makes |
826 | + it possible to run NFS during early boot, helps if you e. g. have /var |
827 | + on NFS, and avoids dependency cycles with rcS init.d scripts which depend |
828 | + on $remote_fs. (LP: #1428487) |
829 | + * Shift number prefixes of other systemd patches accordingly, and adjust |
830 | + them to the above patch. |
831 | + |
832 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Mar 2015 10:43:54 +0100 |
833 | + |
834 | +nfs-utils (1:1.2.8-9ubuntu3) vivid; urgency=medium |
835 | + |
836 | + * Add 00git-start-statd-systemd.patch: Latest start-statd script from |
837 | + 1.3.2 to start rpc-statd.service under systemd. |
838 | + * Add 23-systemd-pipefs_in_run.patch: systemd: Mount rpc_pipefs in /run instead of |
839 | + /var/lib/nfs/, like in the upstart units. |
840 | + * Add 24-systemd-daemon-paths.patch: Adjust program paths in systemd units. |
841 | + * debian/nfs-kernel-server.links: Add nfs-kernel-server.service alias |
842 | + symlink, to match SysV init script. |
843 | + * Add 25-systemd-server-before-client.patch: Order NFS server before client, |
844 | + to make mounting NFS shares from localhost work reliably. |
845 | + * Add debian/nfs-utils_env.sh: Translate our /etc/default files into runtime |
846 | + configuration for nfs-config.service. |
847 | + * debian/nfs-{common,kernel-server}.install: Install systemd units. |
848 | + * debian/rules: Enable/start systemd units. (LP: #1312976) |
849 | + |
850 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Mar 2015 07:46:41 +0100 |
851 | + |
852 | +nfs-utils (1:1.2.8-9ubuntu2) vivid; urgency=medium |
853 | + |
854 | + * debian/nfs-common.statd.upstart: wait for rpcbind job instead of |
855 | + relying on portmap compatibility event. (LP: #1391296) |
856 | + |
857 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 18 Nov 2014 19:07:15 -0500 |
858 | + |
859 | +nfs-utils (1:1.2.8-9ubuntu1) utopic; urgency=medium |
860 | + |
861 | + * Merge from Debian usntable, remaining changes: |
862 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
863 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
864 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
865 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
866 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
867 | + - debian/nfs-common.default: always start idmapd automatically; drop |
868 | + the configuration option. |
869 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
870 | + - Allow issuing options to rpc.nfsd |
871 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
872 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
873 | + - drop nfs-kernel-server's LSB dependency on nfs-common. |
874 | + - Add patch to adjust for changes to the ctx argument of the |
875 | + serialize_krb5_ctx() function. |
876 | + |
877 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 21 Aug 2014 11:29:38 -0700 |
878 | + |
879 | nfs-utils (1:1.2.8-9) unstable; urgency=medium |
880 | |
881 | * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc- |
882 | @@ -459,6 +1205,26 @@ nfs-utils (1:1.2.8-9) unstable; urgency=medium |
883 | |
884 | -- Steve Langasek <vorlon@debian.org> Tue, 12 Aug 2014 17:12:38 -0700 |
885 | |
886 | +nfs-utils (1:1.2.8-8ubuntu1) utopic; urgency=medium |
887 | + |
888 | + * Merge from Debian unstable, remaining changes: |
889 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
890 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
891 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
892 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
893 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
894 | + - debian/nfs-common.default: always start idmapd automatically; drop |
895 | + the configuration option. |
896 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
897 | + - Allow issuing options to rpc.nfsd |
898 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
899 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
900 | + - drop nfs-kernel-server's LSB dependency on nfs-common. |
901 | + - Add patch to adjust for changes to the ctx argument of the |
902 | + serialize_krb5_ctx() function. |
903 | + |
904 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Aug 2014 01:10:28 -0700 |
905 | + |
906 | nfs-utils (1:1.2.8-8) unstable; urgency=medium |
907 | |
908 | * Upload to unstable where this belongs. |
909 | @@ -479,6 +1245,38 @@ nfs-utils (1:1.2.8-7) experimental; urgency=medium |
910 | |
911 | -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 02 Aug 2014 12:25:47 +0100 |
912 | |
913 | +nfs-utils (1:1.2.8-6ubuntu4) utopic; urgency=medium |
914 | + |
915 | + * Add patch from Sergio Gelato to adjust for changes to the ctx |
916 | + argument of the serialize_krb5_ctx() function (LP: #1331201) |
917 | + |
918 | + -- Adam Conrad <adconrad@ubuntu.com> Wed, 25 Jun 2014 12:23:09 -0600 |
919 | + |
920 | +nfs-utils (1:1.2.8-6ubuntu3) utopic; urgency=medium |
921 | + |
922 | + * Soon nfs-common.init is going to be split on the Debian side, and |
923 | + nfs-kernel-server init.d's LSB depends on "nfs-common" has never done |
924 | + anything in Ubuntu. Drop it to avoid breaking insserv. (LP: #1323274) |
925 | + |
926 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 27 May 2014 11:38:51 +0200 |
927 | + |
928 | +nfs-utils (1:1.2.8-6ubuntu1) trusty; urgency=medium |
929 | + |
930 | + * Merge from Debian unstable, remaining changes: |
931 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
932 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
933 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
934 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
935 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
936 | + - debian/nfs-common.default: always start idmapd automatically; drop |
937 | + the configuration option. |
938 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
939 | + - Allow issuing options to rpc.nfsd |
940 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
941 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
942 | + |
943 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 25 Feb 2014 09:18:47 -0800 |
944 | + |
945 | nfs-utils (1:1.2.8-6) unstable; urgency=medium |
946 | |
947 | * Fix the sec=krb5* handling in debian/nfs-common.init to properly match |
948 | @@ -505,6 +1303,29 @@ nfs-utils (1:1.2.8-6) unstable; urgency=medium |
949 | |
950 | -- Steve Langasek <vorlon@debian.org> Mon, 24 Feb 2014 18:11:17 +0000 |
951 | |
952 | +nfs-utils (1:1.2.8-5ubuntu1) trusty; urgency=medium |
953 | + |
954 | + * Merge from Debian unstable, remaining changes: |
955 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
956 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
957 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
958 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
959 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
960 | + - debian/nfs-common.default: always start idmapd automatically; drop |
961 | + the configuration option. |
962 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
963 | + - Allow issuing options to rpc.nfsd |
964 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
965 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
966 | + * Dropped changes, included in Debian: |
967 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
968 | + in /var/lib. |
969 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
970 | + in the postinst, this is redundant anyway and the nfs-common init script |
971 | + is gone now. |
972 | + |
973 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 13 Jan 2014 21:13:11 -0800 |
974 | + |
975 | nfs-utils (1:1.2.8-5) unstable; urgency=medium |
976 | |
977 | [ Ben Hutchings ] |
978 | @@ -521,6 +1342,37 @@ nfs-utils (1:1.2.8-5) unstable; urgency=medium |
979 | |
980 | -- Steve Langasek <vorlon@debian.org> Mon, 13 Jan 2014 22:07:53 +0000 |
981 | |
982 | +nfs-utils (1:1.2.8-4ubuntu1) trusty; urgency=low |
983 | + |
984 | + * Merge from Debian unstable, remaining changes: |
985 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
986 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
987 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
988 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
989 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
990 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
991 | + in the postinst, this is redundant anyway and the nfs-common init script |
992 | + is gone now. |
993 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
994 | + - Allow issuing options to rpc.nfsd |
995 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
996 | + the configuration option. |
997 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
998 | + in /var/lib. |
999 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due |
1000 | + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 |
1001 | + - Fix the stop conditions: never stop on 'runlevel [06]' since that gives |
1002 | + the system no time to cleanly unmount nfs mounts; instead, stop only on |
1003 | + the unmounted-remote-filesystems event. LP: #569094. |
1004 | + * Dropped changes: |
1005 | + - build-depend on debhelper (>= 7.3.15ubuntu3): all supported debhelper |
1006 | + versions meet this requirement now, so it's not worth carrying a delta |
1007 | + for. |
1008 | + * Drop removal handling for rpc_pipefs.conf, which has been obsolete since |
1009 | + before the 12.04 release. |
1010 | + |
1011 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 21 Nov 2013 13:35:20 -0800 |
1012 | + |
1013 | nfs-utils (1:1.2.8-4) unstable; urgency=low |
1014 | |
1015 | * The configure option name is --with-gssglue, not --with-libgssglue. |
1016 | @@ -539,6 +1391,64 @@ nfs-utils (1:1.2.8-3) unstable; urgency=low |
1017 | |
1018 | -- Steve Langasek <vorlon@debian.org> Fri, 31 May 2013 17:59:53 -0700 |
1019 | |
1020 | +nfs-utils (1:1.2.8-2ubuntu2) saucy; urgency=low |
1021 | + |
1022 | + * Start statd on virtual-filesystems instead of on local-filesystems; |
1023 | + this works and avoids a deadlock in the nfsroot case. Also, adjust |
1024 | + idmapd to not block MOUNTPOINT=/ for the same reason. This isn't a |
1025 | + perfect fix since idmapd would be needed if we ever wanted nfsv4 |
1026 | + nfsroot, but implementing that can wait until we have /usr mounting from |
1027 | + the initramfs. LP: #537133. |
1028 | + |
1029 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 11 Sep 2013 15:00:02 -0700 |
1030 | + |
1031 | +nfs-utils (1:1.2.8-2ubuntu1) saucy; urgency=low |
1032 | + |
1033 | + [ Stéphane Graber ] |
1034 | + * Merge from Debian unstable. |
1035 | + - includes upstream fix for gssd -R. LP: #1179992. |
1036 | + - includes upstream fix for an exportfs crash when using long paths. |
1037 | + LP: #1062022. |
1038 | + * Remaining changes: |
1039 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1040 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1041 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1042 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1043 | + init handling. |
1044 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1045 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1046 | + in the postinst, this is redundant anyway and the nfs-common init script |
1047 | + is gone now. |
1048 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1049 | + - Allow issuing options to rpc.nfsd |
1050 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1051 | + the configuration option. |
1052 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1053 | + in /var/lib. |
1054 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due |
1055 | + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 |
1056 | + - Adjust upstart jobs to treat TYPE=nfs and TYPE=nfs4 mounts identically, |
1057 | + since TYPE=nfs4 is considered deprecated. |
1058 | + - Fix various boot-time race conditions between mountall and nfs-utils by |
1059 | + moving handling of the 'mounting' events to separate gssd-mounting and |
1060 | + idmapd-mounting jobs. Requires mountall 2.41 or better to avoid deadlock |
1061 | + on boot. LP: #643289, LP: #611397. |
1062 | + - Fix the stop conditions: never stop on 'runlevel [06]' since that gives |
1063 | + the system no time to cleanly unmount nfs mounts; instead, stop only on |
1064 | + the unmounted-remote-filesystems event. LP: #569094. |
1065 | + - Newer versions of gssd don't talk to portmap, so don't make the upstart |
1066 | + job depend on it. |
1067 | + - Add an instance to statd-mounting, and change it to just wait for statd |
1068 | + instead of trying to trigger it potentially out of order. This also |
1069 | + means we don't need to try to force portmap to start from statd. |
1070 | + |
1071 | + [ Steve Langasek ] |
1072 | + * Build --with-gssglue; linking directly against libgssapi-krb5 results in |
1073 | + rpc.gssd trying to incorrectly pass opaque pointers between two different |
1074 | + gss implementations (via libtirpc). |
1075 | + |
1076 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 31 May 2013 18:05:03 -0700 |
1077 | + |
1078 | nfs-utils (1:1.2.8-2) unstable; urgency=medium |
1079 | |
1080 | * Fix reportbug scripts to use rpcinfo in /usr/sbin. |
1081 | @@ -568,12 +1478,80 @@ nfs-utils (1:1.2.8-1) unstable; urgency=low |
1082 | |
1083 | -- Luk Claes <luk@zomers.be> Fri, 10 May 2013 14:27:47 +0200 |
1084 | |
1085 | +nfs-utils (1:1.2.6-3ubuntu2) quantal; urgency=low |
1086 | + |
1087 | + [ Steve Langasek ] |
1088 | + * Adjust upstart jobs to treat TYPE=nfs and TYPE=nfs4 mounts identically, |
1089 | + since TYPE=nfs4 is considered deprecated. |
1090 | + * Fix various boot-time race conditions between mountall and nfs-utils by |
1091 | + moving handling of the 'mounting' events to separate gssd-mounting and |
1092 | + idmapd-mounting jobs. Requires mountall 2.41 or better to avoid deadlock |
1093 | + on boot. LP: #643289, LP: #611397. |
1094 | + * Fix the stop conditions: never stop on 'runlevel [06]' since that gives |
1095 | + the system no time to cleanly unmount nfs mounts; instead, stop only on |
1096 | + the unmounted-remote-filesystems event. LP: #569094. |
1097 | + * Newer versions of gssd don't talk to portmap, so don't make the upstart |
1098 | + job depend on it. |
1099 | + * Add an instance to statd-mounting, and change it to just wait for statd |
1100 | + instead of trying to trigger it potentially out of order. This also means |
1101 | + we don't need to try to force portmap to start from statd. |
1102 | + |
1103 | + [ Matthew L. Dailey ] |
1104 | + * Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due |
1105 | + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 |
1106 | + |
1107 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 28 Sep 2012 13:58:43 -0400 |
1108 | + |
1109 | +nfs-utils (1:1.2.6-3ubuntu1) quantal; urgency=low |
1110 | + |
1111 | + * Merge from Debian unstable. Remaining changes: |
1112 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1113 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1114 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1115 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1116 | + init handling. |
1117 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1118 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1119 | + in the postinst, this is redundant anyway and the nfs-common init script |
1120 | + is gone now. |
1121 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1122 | + - Allow issuing options to rpc.nfsd |
1123 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1124 | + the configuration option. |
1125 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1126 | + in /var/lib. |
1127 | + |
1128 | + -- Logan Rosen <logatronico@gmail.com> Sun, 05 Aug 2012 00:56:05 -0400 |
1129 | + |
1130 | nfs-utils (1:1.2.6-3) unstable; urgency=low |
1131 | |
1132 | * Iterate through exports.d to look for expors (Closes: #676604). |
1133 | |
1134 | -- Luk Claes <luk@zomers.be> Tue, 10 Jul 2012 19:38:22 +0200 |
1135 | |
1136 | +nfs-utils (1:1.2.6-2ubuntu1) quantal; urgency=low |
1137 | + |
1138 | + * Merge from Debian unstable, remaining changes: |
1139 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1140 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1141 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1142 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1143 | + init handling. |
1144 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1145 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1146 | + in the postinst, this is redundant anyway and the nfs-common init script |
1147 | + is gone now. |
1148 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1149 | + - Allow issuing options to rpc.nfsd |
1150 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1151 | + the configuration option. |
1152 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1153 | + in /var/lib. |
1154 | + * Dropped changes, included in Debian: |
1155 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1156 | + |
1157 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 22 Jun 2012 11:25:28 -0700 |
1158 | + |
1159 | nfs-utils (1:1.2.6-2) unstable; urgency=low |
1160 | |
1161 | * Move open-iscsi and watchdog to Suggests. |
1162 | @@ -601,6 +1579,44 @@ nfs-utils (1:1.2.5-4) unstable; urgency=low |
1163 | |
1164 | -- Luk Claes <luk@debian.org> Sun, 22 Jan 2012 15:46:25 +0100 |
1165 | |
1166 | +nfs-utils (1:1.2.5-3ubuntu3) precise; urgency=low |
1167 | + |
1168 | + * In some cases, /var/lib/nfs/rpc_pipefs is successfully unmounted on |
1169 | + upgrade but the directory still has contents within it. Since this is |
1170 | + /var/lib we shouldn't assume it's ok for delete these; instead, pass |
1171 | + --ignore-fail-on-non-empty to rmdir. LP: #954619. |
1172 | + |
1173 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 08 Apr 2012 22:44:40 -0700 |
1174 | + |
1175 | +nfs-utils (1:1.2.5-3ubuntu2) precise; urgency=low |
1176 | + |
1177 | + * Fix wrong path to rpcinfo in the init script, which breaks use of nfs |
1178 | + v3 support in the server. LP: #945651. |
1179 | + |
1180 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 27 Mar 2012 10:44:03 -0700 |
1181 | + |
1182 | +nfs-utils (1:1.2.5-3ubuntu1) precise; urgency=low |
1183 | + |
1184 | + * Merge from Debian testing, remaining changes: |
1185 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1186 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1187 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1188 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1189 | + init handling. |
1190 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1191 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1192 | + in the postinst, this is redundant anyway and the nfs-common init script |
1193 | + is gone now. |
1194 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1195 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1196 | + - Allow issuing options to rpc.nfsd |
1197 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1198 | + the configuration option. |
1199 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1200 | + in /var/lib. |
1201 | + |
1202 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 04 Jan 2012 09:20:27 -0800 |
1203 | + |
1204 | nfs-utils (1:1.2.5-3) unstable; urgency=low |
1205 | |
1206 | [ Roger Leigh ] |
1207 | @@ -619,6 +1635,33 @@ nfs-utils (1:1.2.5-3) unstable; urgency=low |
1208 | |
1209 | -- Luk Claes <luk@debian.org> Fri, 09 Dec 2011 11:55:31 +0100 |
1210 | |
1211 | +nfs-utils (1:1.2.5-2ubuntu1) precise; urgency=low |
1212 | + |
1213 | + * Merge from Debian testing, remaining changes: |
1214 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1215 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1216 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1217 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1218 | + init handling. |
1219 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1220 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1221 | + in the postinst, this is redundant anyway and the nfs-common init script |
1222 | + is gone now. |
1223 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1224 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1225 | + - Allow issuing options to rpc.nfsd |
1226 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1227 | + the configuration option. |
1228 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1229 | + in /var/lib. |
1230 | + * Dropped changes, superseded in Debian/upstream: |
1231 | + - debian/patches/multiarch-kerberos-paths: Search for kerberos libs |
1232 | + in multiarch locations. |
1233 | + - ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel |
1234 | + version numbers. |
1235 | + |
1236 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 30 Oct 2011 00:12:50 +0000 |
1237 | + |
1238 | nfs-utils (1:1.2.5-2) unstable; urgency=low |
1239 | |
1240 | * debian/patches/18-dont-use-PAGE_SIZE.patch |
1241 | @@ -661,6 +1704,57 @@ nfs-utils (1:1.2.4-2) UNRELEASED; urgency=low |
1242 | |
1243 | -- Luk Claes <luk@debian.org> Sat, 06 Aug 2011 07:38:48 +0200 |
1244 | |
1245 | +nfs-utils (1:1.2.4-1ubuntu4) precise; urgency=low |
1246 | + |
1247 | + * debian/nfs-common.postinst: handle the case when /var/lib/nfs/rpc_pipefs |
1248 | + is not already mounted on upgrade - dpkg will already remove the |
1249 | + directory for us on upgrade, so don't fail when it's missing. |
1250 | + LP: #882799. |
1251 | + |
1252 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 27 Oct 2011 16:21:22 -0700 |
1253 | + |
1254 | +nfs-utils (1:1.2.4-1ubuntu3) precise; urgency=low |
1255 | + |
1256 | + * debian/nfs-common.defaults, debian/nfs-common.idmapd.upstart: idmapd |
1257 | + should always be started automatically, because we can no longer assume |
1258 | + that a mount of type 'nfs' in /etc/fstab is not nfs4. This also lets |
1259 | + things work by default with nfs4 autofs. LP: #662711. |
1260 | + * Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1261 | + in /var/lib. |
1262 | + * Ignore errors from mount if the filesystem is already mounted. |
1263 | + LP: #811823. |
1264 | + |
1265 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 27 Oct 2011 12:04:58 -0700 |
1266 | + |
1267 | +nfs-utils (1:1.2.4-1ubuntu2) oneiric; urgency=low |
1268 | + |
1269 | + * Allow issuing options to rpc.nfsd |
1270 | + (LP: #567491) |
1271 | + |
1272 | + -- Bryce Harrington <bryce@ubuntu.com> Mon, 08 Aug 2011 16:37:26 -0700 |
1273 | + |
1274 | +nfs-utils (1:1.2.4-1ubuntu1) oneiric; urgency=low |
1275 | + |
1276 | + * Merge from Debian unstable (LP: #728586, LP: #789117), remaining |
1277 | + changes: |
1278 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1279 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1280 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1281 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1282 | + init handling. |
1283 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1284 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1285 | + in the postinst, this is redundant anyway and the nfs-common init script |
1286 | + is gone now. |
1287 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1288 | + - debian/patches/multiarch-kerberos-paths: Search for kerberos libs |
1289 | + in multiarch locations. |
1290 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1291 | + - ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel |
1292 | + version numbers. |
1293 | + |
1294 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 23 Jul 2011 17:54:36 +0200 |
1295 | + |
1296 | nfs-utils (1:1.2.4-1) unstable; urgency=low |
1297 | |
1298 | * New upstream version |
1299 | @@ -748,6 +1842,93 @@ nfs-utils (1:1.2.2-5) unstable; urgency=low |
1300 | |
1301 | -- Luk Claes <luk@debian.org> Wed, 16 Mar 2011 23:10:15 +0100 |
1302 | |
1303 | +nfs-utils (1:1.2.2-4ubuntu8) oneiric; urgency=low |
1304 | + |
1305 | + * debian/nfs-common.idmapd.upstart: don't use a script unnecessarily for |
1306 | + our job when we can exec directly - making the job more resilient in |
1307 | + the face of races with /usr being mounted. LP: #811823. |
1308 | + * Drop rpc_pipefs.conf; this has gotten far more complicated than it |
1309 | + should be, just do the mount in-line in each of the gssd and idmapd |
1310 | + jobs. |
1311 | + |
1312 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 17 Jul 2011 02:23:01 -0700 |
1313 | + |
1314 | +nfs-utils (1:1.2.2-4ubuntu7) oneiric; urgency=low |
1315 | + |
1316 | + [ Andy Whitcroft ] |
1317 | + * ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel |
1318 | + version numbers. (LP: #796611) |
1319 | + |
1320 | + -- Evan Dandrea <ev@ubuntu.com> Tue, 14 Jun 2011 17:13:14 +0100 |
1321 | + |
1322 | +nfs-utils (1:1.2.2-4ubuntu6) oneiric; urgency=low |
1323 | + |
1324 | + * nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1325 | + (LP: #251026) |
1326 | + |
1327 | + -- Bryce Harrington <bryce@ubuntu.com> Mon, 06 Jun 2011 19:18:16 -0700 |
1328 | + |
1329 | +nfs-utils (1:1.2.2-4ubuntu5) natty; urgency=low |
1330 | + |
1331 | + * Search kerberos libs in multiarch locations. |
1332 | + |
1333 | + -- Matthias Klose <doko@ubuntu.com> Fri, 01 Apr 2011 12:35:30 +0200 |
1334 | + |
1335 | +nfs-utils (1:1.2.2-4ubuntu4) natty; urgency=low |
1336 | + |
1337 | + * nvs-kernel-server.default: Add comment about how to disable nfs4. |
1338 | + There are corner cases where the server providing nfsv4 as the default |
1339 | + can confuse the client (117957, 680680) or even cause kernel problems |
1340 | + (716811), so it is worthwhile to document how to fallback to nfs3 only. |
1341 | + |
1342 | + -- Bryce Harrington <bryce@ubuntu.com> Mon, 14 Feb 2011 13:20:27 -0800 |
1343 | + |
1344 | +nfs-utils (1:1.2.2-4ubuntu3) natty; urgency=low |
1345 | + |
1346 | + * debian/nfs-common.statd.upstart: pass a new WAITER= variable |
1347 | + to portmap-wait, so that multiple jobs can wait in parallel, fixing |
1348 | + another subtle race condition; and bump the portmap dependency again for |
1349 | + the necessary instance support. |
1350 | + * also fix the grouping in the start condition, so that restarts work |
1351 | + correctly when portmap is restarted. |
1352 | + * debian/nfs-common.rpc_pipefs.upstart: instantiate this job separately for |
1353 | + gssd and idmapd, so that the filesystem gets mounted and unmounted |
1354 | + correctly even if both of gssd and idmapd aren't being run, or if one of |
1355 | + the two tries to start before the filesystem is fully mounted. Though |
1356 | + it may be simpler now to move this logic back into the gssd and idmapd |
1357 | + jobs directly, leave that for a later date. |
1358 | + |
1359 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 18 Jan 2011 17:45:45 -0800 |
1360 | + |
1361 | +nfs-utils (1:1.2.2-4ubuntu2) natty; urgency=low |
1362 | + |
1363 | + * debian/nfs-common.statd.upstart, |
1364 | + debian/nfs-common.statd-mounting.upstart: refactor startup to wait for |
1365 | + local-filesystems. (LP: #525154) |
1366 | + * debian/control: depend on portmap version that sets ON_BOOT=y and |
1367 | + has the portmap-wait job. |
1368 | + * debian/rules: install new statd-mounting upstart job |
1369 | + |
1370 | + -- Clint Byrum <clint@ubuntu.com> Wed, 05 Jan 2011 12:27:32 -0800 |
1371 | + |
1372 | +nfs-utils (1:1.2.2-4ubuntu1) natty; urgency=low |
1373 | + |
1374 | + * Merge from debian unstable (LP: #685860), remaining changes: |
1375 | + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, |
1376 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1377 | + debian/rules: drop nfs-common init script in favor of upstart jobs, and |
1378 | + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1379 | + handling. |
1380 | + - debian/control: |
1381 | + + depend on the upstart-using version of portmap, 6.0-10ubuntu1; and |
1382 | + drop the alternative depends on rpcbind, which hasn't been converted. |
1383 | + + depend on portmap 6.0-10ubuntu1. |
1384 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1385 | + in the postinst, this is redundant anyway and the nfs-common init script |
1386 | + is gone now. |
1387 | + |
1388 | + -- Lorenzo De Liso <blackz@ubuntu.com> Wed, 15 Dec 2010 21:42:55 +0100 |
1389 | + |
1390 | nfs-utils (1:1.2.2-4) unstable; urgency=low |
1391 | |
1392 | * mountd: fix path comparison for v4 crossmnt (Closes: #578317) |
1393 | @@ -775,6 +1956,28 @@ nfs-utils (1:1.2.2-2) unstable; urgency=low |
1394 | |
1395 | -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 13 Jul 2010 15:20:17 +1000 |
1396 | |
1397 | +nfs-utils (1:1.2.2-1ubuntu1) maverick; urgency=low |
1398 | + |
1399 | + * Merge from Debian unstable, remaining changes: |
1400 | + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, |
1401 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1402 | + debian/rules: drop nfs-common init script in favor of upstart jobs, and |
1403 | + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1404 | + handling. |
1405 | + - debian/control: depend on the upstart-using version of portmap, |
1406 | + 6.0-10ubuntu1; and drop the alternative depends on rpcbind, which |
1407 | + hasn't been converted. |
1408 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1409 | + in the postinst, this is redundant anyway and the nfs-common init script |
1410 | + is gone now. |
1411 | + * Dropped changes, included in Debian: |
1412 | + - debian/control: add ${misc:Depends} line for nfs-common, for the |
1413 | + upstart deps |
1414 | + - debian/nfs-kernel-server.init: updated check for presence of nfsd |
1415 | + support |
1416 | + |
1417 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 04 Jun 2010 09:55:28 +0000 |
1418 | + |
1419 | nfs-utils (1:1.2.2-1) unstable; urgency=low |
1420 | |
1421 | [ Anibal Monsalve Salazar ] |
1422 | @@ -846,6 +2049,51 @@ nfs-utils (1:1.2.0-4.1) unstable; urgency=low |
1423 | |
1424 | -- Ben Hutchings <ben@decadent.org.uk> Wed, 16 Dec 2009 22:14:01 +0000 |
1425 | |
1426 | +nfs-utils (1:1.2.0-4ubuntu4) lucid; urgency=low |
1427 | + |
1428 | + * debian/nfs-common.gssd.upstart: |
1429 | + - fix the OPTIONS= match for the start condition (missing a leading '*') |
1430 | + so that we actually match on nfs4 mounts |
1431 | + - drop the 'script' for a straight exec of rpc.gssd; if /usr is a separate |
1432 | + partition then nfs4 mounts might be attempted in parallel, and upstart |
1433 | + gets mightily confused when this happens. LP: #545673 |
1434 | + |
1435 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 23 Mar 2010 22:26:07 -0700 |
1436 | + |
1437 | +nfs-utils (1:1.2.0-4ubuntu3) lucid; urgency=low |
1438 | + |
1439 | + * debian/nfs-common.*.upstart: start on new 'mounting' signal instead of |
1440 | + obsolete 'mount' signal. |
1441 | + |
1442 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 25 Feb 2010 06:41:46 -0800 |
1443 | + |
1444 | +nfs-utils (1:1.2.0-4ubuntu2) lucid; urgency=low |
1445 | + |
1446 | + * debian/nfs-kernel-server.init: 2.6.32 kernels no longer export the |
1447 | + same symbols. Switch symbol check to nfsd_serv which has been present |
1448 | + since 2005. LP: #493145. |
1449 | + |
1450 | + -- Andy Whitcroft <apw@canonical.com> Mon, 07 Dec 2009 16:56:56 +0000 |
1451 | + |
1452 | +nfs-utils (1:1.2.0-4ubuntu1) lucid; urgency=low |
1453 | + |
1454 | + * Merge from Debian testing, remaining changes: |
1455 | + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, |
1456 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1457 | + debian/rules: drop nfs-common init script in favor of upstart jobs, and |
1458 | + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1459 | + handling. |
1460 | + - debian/control: depend on the upstart-using version of portmap, |
1461 | + 6.0-10ubuntu1; and drop the alternative depends on rpcbind, which |
1462 | + hasn't been converted. |
1463 | + - debian/control: add ${misc:Depends} line for nfs-common, for the |
1464 | + upstart deps |
1465 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1466 | + in the postinst, this is redundant anyway and the nfs-common init script |
1467 | + is gone now. |
1468 | + |
1469 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 04 Dec 2009 18:37:48 -0800 |
1470 | + |
1471 | nfs-utils (1:1.2.0-4) unstable; urgency=low |
1472 | |
1473 | * Removing myself from uploaders. |
1474 | @@ -860,6 +2108,94 @@ nfs-utils (1:1.2.0-3) unstable; urgency=low |
1475 | |
1476 | -- Steinar H. Gunderson <sesse@debian.org> Sun, 09 Aug 2009 12:47:00 +0200 |
1477 | |
1478 | +nfs-utils (1:1.2.0-2ubuntu9) lucid; urgency=low |
1479 | + |
1480 | + * debian/nfs-common.statd.upstart: check for a started portmap in a |
1481 | + non-racy manner. LP: #484209. |
1482 | + |
1483 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 17 Nov 2009 11:27:37 -0600 |
1484 | + |
1485 | +nfs-utils (1:1.2.0-2ubuntu8) karmic; urgency=low |
1486 | + |
1487 | + * debian/control: add missing ${misc:Depends} for nfs-common, else we don't |
1488 | + get the dependency on upstart that we should have. LP: #456281. |
1489 | + |
1490 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 20 Oct 2009 13:10:01 +0000 |
1491 | + |
1492 | +nfs-utils (1:1.2.0-2ubuntu7) karmic; urgency=low |
1493 | + |
1494 | + * debian/rules: now that the jobs will exit cleanly on their own when |
1495 | + 'start' is called but the job is a no-op, remove the --error-handler |
1496 | + option to dh_installinit so that we don't accidentally ignore other |
1497 | + kinds of errors that could point to real problems. |
1498 | + |
1499 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 11 Oct 2009 08:51:39 +0000 |
1500 | + |
1501 | +nfs-utils (1:1.2.0-2ubuntu6) karmic; urgency=low |
1502 | + |
1503 | + * Drop the gssd upstart job's dependency on "local-filesystems"; at boot |
1504 | + time this is always implied transitively by the dep on portmap, and using |
1505 | + a combination of 'or' and 'and' operators in the dependency list seems |
1506 | + to confuse upstart quite badly, causing kerberized mounts to hang at boot. |
1507 | + LP: #447654. |
1508 | + |
1509 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 10 Oct 2009 20:12:11 +0000 |
1510 | + |
1511 | +nfs-utils (1:1.2.0-2ubuntu5) karmic; urgency=low |
1512 | + |
1513 | + * Set upstart jobs to also start on mount attempt, in the event that |
1514 | + mountall gets to them before the daemons are done starting. Really-fixes |
1515 | + LP: #431248. |
1516 | + * Call 'stop' in the pre-start scripts for all jobs when we want to prevent |
1517 | + the job from starting; this lets upstart know that it's a clean stop, |
1518 | + and avoids boot-time messages about service start failures |
1519 | + |
1520 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 09 Oct 2009 19:17:34 +0000 |
1521 | + |
1522 | +nfs-utils (1:1.2.0-2ubuntu4) karmic; urgency=low |
1523 | + |
1524 | + * Mounting rpc_pipefs also requires the sunrpc module, so move this |
1525 | + modprobe to the right upstart job. |
1526 | + |
1527 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 05 Oct 2009 22:04:28 -0700 |
1528 | + |
1529 | +nfs-utils (1:1.2.0-2ubuntu3) karmic; urgency=low |
1530 | + |
1531 | + * nfs-kernel-server: don't call invoke-rc.d nfs-common in the postinst, |
1532 | + this is redundant anyway and the nfs-common init script is gone now. |
1533 | + LP: #441855. |
1534 | + |
1535 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 03 Oct 2009 23:07:09 -0700 |
1536 | + |
1537 | +nfs-utils (1:1.2.0-2ubuntu2) karmic; urgency=low |
1538 | + |
1539 | + * Configure gssd and idmapd upstart jobs to stop on runlevels 0 and 6; this |
1540 | + is consistent with previous initscript-based behavior, and spares upstart |
1541 | + trying to restart the jobs repeatedly when sendsigs runs. |
1542 | + * When autodetecting gssd, handle the case of 'sec=krb5' being embedded in |
1543 | + the middle of the options list in /etc/fstab. LP: #364861. |
1544 | + * Fix transition idempotency error when stopping old nfs-common init |
1545 | + script, in case the postinst fails to finish afterwards (e.g., failure to |
1546 | + restart the daemons). |
1547 | + * Fix statd upstart job to properly honor NEED_STATD=no and not get stuck |
1548 | + respawning indefinitely. |
1549 | + * Ignore failures to start the daemons on upgrade, since if they aren't |
1550 | + needed we don't *want* them to start. LP: #441055. |
1551 | + * Fix up the rpc_pipefs job, the wrong version of the file slipped into |
1552 | + the previous upload. |
1553 | + |
1554 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 03 Oct 2009 01:52:21 +0000 |
1555 | + |
1556 | +nfs-utils (1:1.2.0-2ubuntu1) karmic; urgency=low |
1557 | + |
1558 | + * Drop nfs-common init script in favor of new upstart jobs. LP: #431248. |
1559 | + * Build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1560 | + handling. |
1561 | + * Depend the upstart-using version of portmap, 6.0-10ubuntu1; and drop the |
1562 | + alternative depends on rpcbind, which hasn't been converted. |
1563 | + |
1564 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 02 Oct 2009 19:23:19 +0000 |
1565 | + |
1566 | nfs-utils (1:1.2.0-2) unstable; urgency=low |
1567 | |
1568 | * Merge from Ubuntu |
1569 | @@ -2770,3 +4106,4 @@ nfs-utils (0.1.3-1) unstable; urgency=low |
1570 | * Start following CVS tree at SourceForge. |
1571 | |
1572 | -- Chip Salzenberg <chip@valinux.com> Fri, 3 Dec 1999 20:00:00 -0800 |
1573 | + |
1574 | diff --git a/debian/control b/debian/control |
1575 | index 5d9d5ed..e268002 100644 |
1576 | --- a/debian/control |
1577 | +++ b/debian/control |
1578 | @@ -1,9 +1,10 @@ |
1579 | Source: nfs-utils |
1580 | Priority: optional |
1581 | Section: net |
1582 | -Maintainer: Debian kernel team <debian-kernel@lists.debian.org> |
1583 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1584 | +XSBC-Original-Maintainer: Debian kernel team <debian-kernel@lists.debian.org> |
1585 | Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <benh@debian.org>, Steve Langasek <vorlon@debian.org>, Salvatore Bonaccorso <carnil@debian.org> |
1586 | -Build-Depends: debhelper-compat (= 13), libwrap0-dev, libevent-dev, libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, libmount-dev, libsqlite3-dev |
1587 | +Build-Depends: debhelper-compat (= 13), libwrap0-dev, libevent-dev, libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, libmount-dev, libsqlite3-dev, dh-apport |
1588 | Standards-Version: 4.6.2 |
1589 | Homepage: https://linux-nfs.org/ |
1590 | Vcs-Git: https://salsa.debian.org/kernel-team/nfs-utils.git |
1591 | @@ -60,10 +61,20 @@ Architecture: any |
1592 | Multi-Arch: same |
1593 | Pre-Depends: ${misc:Pre-Depends} |
1594 | Depends: ${shlibs:Depends}, ${misc:Depends} |
1595 | -Conflicts: libnfsidmap2, libnfsidmap-regex |
1596 | -Provides: libnfsidmap2, libnfsidmap-regex |
1597 | -Breaks: libnfsidmap2 (<< 0.25-7~), libnfsidmap-regex |
1598 | -Replaces: libnfsidmap2 (<< 0.25-7~), libnfsidmap-regex |
1599 | +Conflicts: libnfsidmap2 |
1600 | +Breaks: libnfsidmap2 (<< 0.25-7~) |
1601 | +Replaces: libnfsidmap2 (<< 0.25-7~) |
1602 | Description: NFS idmapping library |
1603 | libnfsidmap provides functions to map between NFSv4 names (which are |
1604 | of the form user@domain) and local uid's and gid's. |
1605 | + |
1606 | +Package: libnfsidmap-regex |
1607 | +Section: libs |
1608 | +Architecture: any |
1609 | +Multi-Arch: same |
1610 | +Pre-Depends: ${misc:Pre-Depends} |
1611 | +Depends: ${shlibs:Depends}, ${misc:Depends} |
1612 | +Description: Plugin to map NFSv4 names to and from ids via regex |
1613 | + The regex plugin parses NFSv4 user and groups names using regex to extract the |
1614 | + local user or group. NFSv4 names are created by adding constant strings before |
1615 | + and after the local user and group names. |
1616 | diff --git a/debian/libnfsidmap-regex.install b/debian/libnfsidmap-regex.install |
1617 | new file mode 100644 |
1618 | index 0000000..555f60b |
1619 | --- /dev/null |
1620 | +++ b/debian/libnfsidmap-regex.install |
1621 | @@ -0,0 +1 @@ |
1622 | +usr/lib/*/libnfsidmap/regex.so |
1623 | diff --git a/debian/libnfsidmap1.docs b/debian/libnfsidmap1.docs |
1624 | new file mode 100644 |
1625 | index 0000000..747afb7 |
1626 | --- /dev/null |
1627 | +++ b/debian/libnfsidmap1.docs |
1628 | @@ -0,0 +1 @@ |
1629 | +debian/README.Ubuntu |
1630 | diff --git a/debian/libnfsidmap1.install b/debian/libnfsidmap1.install |
1631 | index 2573d9e..a64297a 100644 |
1632 | --- a/debian/libnfsidmap1.install |
1633 | +++ b/debian/libnfsidmap1.install |
1634 | @@ -1,3 +1,5 @@ |
1635 | usr/lib/*/lib*.so.* |
1636 | -usr/lib/*/libnfsidmap/*.so |
1637 | +usr/lib/*/libnfsidmap/nsswitch.so |
1638 | +usr/lib/*/libnfsidmap/static.so |
1639 | +usr/lib/*/libnfsidmap/umich_ldap.so |
1640 | usr/share/man/man5/idmapd.conf.5 |
1641 | diff --git a/debian/nfs-common.docs b/debian/nfs-common.docs |
1642 | new file mode 100644 |
1643 | index 0000000..747afb7 |
1644 | --- /dev/null |
1645 | +++ b/debian/nfs-common.docs |
1646 | @@ -0,0 +1 @@ |
1647 | +debian/README.Ubuntu |
1648 | diff --git a/debian/not-installed b/debian/not-installed |
1649 | new file mode 100644 |
1650 | index 0000000..d970955 |
1651 | --- /dev/null |
1652 | +++ b/debian/not-installed |
1653 | @@ -0,0 +1,3 @@ |
1654 | +usr/lib/*/libnfsidmap/*.a |
1655 | +usr/lib/*/libnfsidmap/*.la |
1656 | +usr/lib/*/libnfsidmap.la |
1657 | diff --git a/debian/patches/always-run-generator.patch b/debian/patches/always-run-generator.patch |
1658 | new file mode 100644 |
1659 | index 0000000..ba420c5 |
1660 | --- /dev/null |
1661 | +++ b/debian/patches/always-run-generator.patch |
1662 | @@ -0,0 +1,23 @@ |
1663 | +Description: Always run the generator |
1664 | + Run the generator even if the pipefs-directory setting is the default one. |
1665 | +Author: Andreas Hasenack <andreas@canonical.com> |
1666 | +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1971935 |
1667 | +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014429 |
1668 | +Forwarded: https://marc.info/?l=linux-nfs&m=165754514206399&w=4 |
1669 | +Last-Updated: 2022-07-12 |
1670 | +--- |
1671 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
1672 | +diff --git a/systemd/rpc-pipefs-generator.c b/systemd/rpc-pipefs-generator.c |
1673 | +index c24db567..7c42431f 100644 |
1674 | +--- a/systemd/rpc-pipefs-generator.c |
1675 | ++++ b/systemd/rpc-pipefs-generator.c |
1676 | +@@ -139,9 +139,6 @@ int main(int argc, char *argv[]) |
1677 | + s = conf_get_str("general", "pipefs-directory"); |
1678 | + if (!s) |
1679 | + exit(0); |
1680 | +- if (strlen(s) == strlen(RPC_PIPEFS_DEFAULT) && |
1681 | +- strcmp(s, RPC_PIPEFS_DEFAULT) == 0) |
1682 | +- exit(0); |
1683 | + |
1684 | + if (is_non_pipefs_mountpoint(s)) |
1685 | + exit(1); |
1686 | diff --git a/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch b/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch |
1687 | new file mode 100644 |
1688 | index 0000000..b57ad8c |
1689 | --- /dev/null |
1690 | +++ b/debian/patches/nfs-conf-manpage-missing-svcgssd-options.patch |
1691 | @@ -0,0 +1,19 @@ |
1692 | +Description: add missing svcgssd long options to nfs.conf(5) |
1693 | +Author: Andreas Hasenack <andreas@canonical.com> |
1694 | +Forwarded: https://marc.info/?l=linux-nfs&m=165635622607689&w=4 |
1695 | +Last-Update: 2022-06-27 |
1696 | + |
1697 | +--- a/systemd/nfs.conf.man |
1698 | ++++ b/systemd/nfs.conf.man |
1699 | +@@ -283,7 +283,10 @@ |
1700 | + .TP |
1701 | + .B svcgssd |
1702 | + Recognized values: |
1703 | +-.BR principal . |
1704 | ++.BR principal , |
1705 | ++.BR verbosity , |
1706 | ++.BR rpc-verbosity , |
1707 | ++.BR idmap-verbosity . |
1708 | + |
1709 | + See |
1710 | + .BR rpc.svcgssd (8) |
1711 | diff --git a/debian/patches/series b/debian/patches/series |
1712 | index 7b361be..60ba4c9 100644 |
1713 | --- a/debian/patches/series |
1714 | +++ b/debian/patches/series |
1715 | @@ -1,6 +1,9 @@ |
1716 | 01-sm-notify-in-sbin.patch |
1717 | 25-systemd-daemon-paths.patch |
1718 | multiarch-kerberos-paths.patch |
1719 | +ubuntu-idmapd-manpage-update-regex-other-package.patch |
1720 | +nfs-conf-manpage-missing-svcgssd-options.patch |
1721 | +always-run-generator.patch |
1722 | blkmapd-fix-coredump-in-bl_add_disk.patch |
1723 | Revert-configure-make-modprobe.d-directory-configura.patch |
1724 | Revert-modprobe-protect-against-sysctl-errors.patch |
1725 | diff --git a/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch b/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch |
1726 | new file mode 100644 |
1727 | index 0000000..cf63722 |
1728 | --- /dev/null |
1729 | +++ b/debian/patches/ubuntu-idmapd-manpage-update-regex-other-package.patch |
1730 | @@ -0,0 +1,12 @@ |
1731 | +--- a/support/nfsidmap/idmapd.conf.5 |
1732 | ++++ b/support/nfsidmap/idmapd.conf.5 |
1733 | +@@ -158,6 +158,9 @@ |
1734 | + .nf |
1735 | + |
1736 | + .fi |
1737 | ++.B NOTE: |
1738 | ++In Ubuntu, the regex plugin is shipped in the libnfsidmap-regex package. If you want to use this plugin, please install that package. |
1739 | ++ |
1740 | + If the "regex" translation method is specified, the following |
1741 | + variables within the [REGEX] section are used to map between NFS4 names and local IDs. |
1742 | + .TP |
1743 | diff --git a/debian/rules b/debian/rules |
1744 | index 50bdfad..fcc473d 100755 |
1745 | --- a/debian/rules |
1746 | +++ b/debian/rules |
1747 | @@ -7,7 +7,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all |
1748 | DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) |
1749 | |
1750 | %: |
1751 | - dh $@ |
1752 | + dh $@ --with apport |
1753 | |
1754 | override_dh_auto_configure: |
1755 | dh_auto_configure -- \ |
1756 | @@ -27,6 +27,10 @@ override_dh_fixperms: |
1757 | dh_fixperms |
1758 | chmod u+s debian/nfs-common/sbin/mount.nfs |
1759 | |
1760 | +override_dh_install: |
1761 | + # we will let the generator produce these units, see LP: #1971935 |
1762 | + dh_install -Xvar-lib-nfs-rpc_pipefs.mount -Xrpc_pipefs.target |
1763 | + |
1764 | override_dh_installinit: |
1765 | dh_installinit -pnfs-common -R |
1766 | install -m 0755 debian/nfs-kernel-server.init debian/nfs-kernel-server/etc/init.d/nfs-kernel-server |
1767 | @@ -36,3 +40,6 @@ override_dh_md5sums: |
1768 | |
1769 | override_dh_missing: |
1770 | dh_missing --list-missing |
1771 | + |
1772 | +override_dh_apport: |
1773 | + dh_apport -pnfs-common |
1774 | diff --git a/debian/source.apport b/debian/source.apport |
1775 | new file mode 100644 |
1776 | index 0000000..6ea9c65 |
1777 | --- /dev/null |
1778 | +++ b/debian/source.apport |
1779 | @@ -0,0 +1,32 @@ |
1780 | +#!/usr/bin/python3 |
1781 | + |
1782 | +'''NFS Apport Interface |
1783 | + |
1784 | +Copyright (C) 2022 Canonical Ltd |
1785 | +Author: Andreas Hasenack <andreas@canonical.com> |
1786 | + |
1787 | +This program is free software; you can redistribute it and/or modify it |
1788 | +under the terms of the GNU General Public License as published by the |
1789 | +Free Software Foundation; either version 2 of the License, or (at your |
1790 | +option) any later version. See http://www.gnu.org/copyleft/gpl.html for |
1791 | +the full text of the license. |
1792 | +''' |
1793 | + |
1794 | +from apport.hookutils import ( |
1795 | + attach_file_if_exists, |
1796 | + command_output, |
1797 | + recent_syslog, |
1798 | +) |
1799 | +from glob import glob |
1800 | +import re |
1801 | + |
1802 | +def add_info(report, ui): |
1803 | + file_list = ["/etc/nfs.conf","/etc/default/nfs-common", "/etc/default/nfs-kernel-server"] |
1804 | + file_list.extend(glob("/etc/nfs.conf.d/*.conf")) |
1805 | + file_list.append("/etc/exports") |
1806 | + file_list.append("/etc/request-key.d/id_resolver.conf") |
1807 | + for f in file_list: |
1808 | + attach_file_if_exists(report, f) |
1809 | + report["SyslogNFS"] = recent_syslog(re.compile("(rpc\.(nfsd|gssd|svcgssd|statd|mountd|idmapd)|blkmapd|nfsdcld|nfsidmap)\[")) |
1810 | + report["NFSMounts"] = command_output(["findmnt", "-n", "-t", "nfs"]) |
1811 | + report["NFSv4Mounts"] = command_output(["findmnt", "-n", "-t", "nfs4"]) |
1812 | diff --git a/debian/tests/control b/debian/tests/control |
1813 | index dea3f82..8232531 100644 |
1814 | --- a/debian/tests/control |
1815 | +++ b/debian/tests/control |
1816 | @@ -2,3 +2,14 @@ Tests: local-server-client |
1817 | Depends: nfs-kernel-server |
1818 | # we need machine isolation as we need to modprobe stuff |
1819 | Restrictions: needs-root, isolation-machine, breaks-testbed |
1820 | + |
1821 | +Tests: kerberos-mount |
1822 | +Depends: nfs-kernel-server, krb5-kdc, krb5-admin-server, krb5-user, keyutils |
1823 | +Restrictions: needs-root, isolation-machine, breaks-testbed |
1824 | + |
1825 | +Tests: v3-mount |
1826 | +Depends: nfs-kernel-server |
1827 | +# this one allow stderr because when mounting nfsv3, a systemd message |
1828 | +# about statd being started shows up, and I rather not supress stderr |
1829 | +# in the mount command |
1830 | +Restrictions: needs-root, isolation-machine, breaks-testbed, allow-stderr |
1831 | diff --git a/debian/tests/kerberos-mount b/debian/tests/kerberos-mount |
1832 | new file mode 100755 |
1833 | index 0000000..9ea2f52 |
1834 | --- /dev/null |
1835 | +++ b/debian/tests/kerberos-mount |
1836 | @@ -0,0 +1,38 @@ |
1837 | +#!/bin/sh |
1838 | + |
1839 | +set -e |
1840 | + |
1841 | +. debian/tests/util |
1842 | + |
1843 | +cleanup() { |
1844 | + umount /mnt || : |
1845 | +} |
1846 | + |
1847 | +trap cleanup EXIT |
1848 | + |
1849 | +myhostname="nfs-server.dep8" |
1850 | +myrealm="DEP8" |
1851 | +hello="Hello from NFS server $$" |
1852 | + |
1853 | +adjust_hostname "${myhostname}" |
1854 | + |
1855 | +create_realm ${myrealm} ${myhostname} |
1856 | + |
1857 | +for p in "nfs/${myhostname}" "host/${myhostname}"; do |
1858 | + create_krb_svc_principal "${p}" |
1859 | + extract_principal_key_into_keytab "${p}" |
1860 | +done |
1861 | + |
1862 | +# or else clients have to wait 90s by default |
1863 | +nfsconf --set nfsd grace-time 10 |
1864 | +systemctl restart nfs-server.service nfs-client.target |
1865 | + |
1866 | +mkdir -p /storage |
1867 | +echo "${hello}" > /storage/hello.txt |
1868 | + |
1869 | +echo "/storage *(sec=krb5p,rw,sync,no_subtree_check)" > /etc/exports |
1870 | +exportfs -rav |
1871 | + |
1872 | +mount "${myhostname}":/storage /mnt |
1873 | +findmnt -n -t nfs4 | grep -E "/storage.*vers=4.*sec=krb5p" |
1874 | +grep "${hello}" /mnt/hello.txt |
1875 | diff --git a/debian/tests/util b/debian/tests/util |
1876 | new file mode 100644 |
1877 | index 0000000..cd8c9e2 |
1878 | --- /dev/null |
1879 | +++ b/debian/tests/util |
1880 | @@ -0,0 +1,89 @@ |
1881 | +#!/bin/sh |
1882 | + |
1883 | +die() { |
1884 | + echo "ERROR" |
1885 | + echo "$@" |
1886 | + exit 1 |
1887 | +} |
1888 | + |
1889 | +adjust_hostname() { |
1890 | + local myhostname="$1" |
1891 | + |
1892 | + echo "${myhostname}" > /etc/hostname |
1893 | + hostname "${myhostname}" |
1894 | + if ! grep -qE "${myhostname}" /etc/hosts; then |
1895 | + # just so it's resolvable |
1896 | + echo "127.0.1.10 ${myhostname}" >> /etc/hosts |
1897 | + fi |
1898 | +} |
1899 | + |
1900 | +create_realm() { |
1901 | + local realm_name="$1" |
1902 | + local kerberos_server="$2" |
1903 | + |
1904 | + # start fresh |
1905 | + rm -rf /var/lib/krb5kdc/* |
1906 | + rm -rf /etc/krb5kdc/* |
1907 | + rm -f /etc/krb5.keytab |
1908 | + |
1909 | + # setup some defaults |
1910 | + cat > /etc/krb5kdc/kdc.conf <<EOF |
1911 | +[kdcdefaults] |
1912 | + kdc_ports = 750,88 |
1913 | +[realms] |
1914 | + ${realm_name} = { |
1915 | + database_name = /var/lib/krb5kdc/principal |
1916 | + admin_keytab = FILE:/etc/krb5kdc/kadm5.keytab |
1917 | + acl_file = /etc/krb5kdc/kadm5.acl |
1918 | + key_stash_file = /etc/krb5kdc/stash |
1919 | + kdc_ports = 750,88 |
1920 | + max_life = 10h 0m 0s |
1921 | + max_renewable_life = 7d 0h 0m 0s |
1922 | + master_key_type = des3-hmac-sha1 |
1923 | + #supported_enctypes = aes256-cts:normal aes128-cts:normal |
1924 | + default_principal_flags = +preauth |
1925 | + } |
1926 | +EOF |
1927 | + |
1928 | + cat > /etc/krb5.conf <<EOF |
1929 | +[libdefaults] |
1930 | + default_realm = ${realm_name} |
1931 | + kdc_timesync = 1 |
1932 | + ccache_type = 4 |
1933 | + forwardable = true |
1934 | + proxiable = true |
1935 | + fcc-mit-ticketflags = true |
1936 | +[realms] |
1937 | + ${realm_name} = { |
1938 | + kdc = ${kerberos_server} |
1939 | + admin_server = ${kerberos_server} |
1940 | + } |
1941 | +EOF |
1942 | + echo "# */admin *" > /etc/krb5kdc/kadm5.acl |
1943 | + |
1944 | + # create the realm |
1945 | + kdb5_util create -s -P secretpassword |
1946 | + |
1947 | + # restart services |
1948 | + systemctl restart krb5-kdc.service krb5-admin-server.service |
1949 | +} |
1950 | + |
1951 | +create_krb_principal() { |
1952 | + local principal="$1" |
1953 | + local password="$2" |
1954 | + |
1955 | + kadmin.local -q "addprinc -pw ${password} ${principal}" 2>/dev/null |
1956 | +} |
1957 | + |
1958 | +create_krb_svc_principal() { |
1959 | + local principal="$1" |
1960 | + |
1961 | + kadmin.local -q "addprinc -randkey ${principal}" 2>/dev/null |
1962 | +} |
1963 | + |
1964 | +extract_principal_key_into_keytab() { |
1965 | + local principal="$1" |
1966 | + |
1967 | + kadmin.local -q "ktadd ${principal}" |
1968 | +} |
1969 | + |
1970 | diff --git a/debian/tests/v3-mount b/debian/tests/v3-mount |
1971 | new file mode 100755 |
1972 | index 0000000..7eb5e6b |
1973 | --- /dev/null |
1974 | +++ b/debian/tests/v3-mount |
1975 | @@ -0,0 +1,34 @@ |
1976 | +#!/bin/sh |
1977 | + |
1978 | +set -e |
1979 | + |
1980 | +cleanup() { |
1981 | + umount /mnt || : |
1982 | +} |
1983 | + |
1984 | +hello="Hello from NFS server $$" |
1985 | +mkdir -p /storage |
1986 | +echo "${hello}" > /storage/hello.txt |
1987 | + |
1988 | +echo "/storage *(sec=sys,rw,sync,no_subtree_check)" > /etc/exports |
1989 | +exportfs -rav |
1990 | + |
1991 | +# stop statd if it's running, because we will check later if it |
1992 | +# was started automatically for the NFSv3 mount as it should |
1993 | +if pidof rpc.statd > /dev/null 2>&1; then |
1994 | + systemctl stop rpc-statd.service > /dev/null 2>&1 || : |
1995 | + pidof rpc.statd > /dev/null 2>&1 && { |
1996 | + echo "couldn't kill rpc.statd before the NFSv3 test" |
1997 | + exit 1 |
1998 | + } |
1999 | +fi |
2000 | + |
2001 | +mount localhost:/storage /mnt -o vers=3 |
2002 | +grep "${hello}" /mnt/hello.txt |
2003 | + |
2004 | +pidof rpc.statd > /dev/null 2>&1 || { |
2005 | + echo "rpc.statd isn't running after the NVSv3 mount, and it should..." |
2006 | + exit 1 |
2007 | +} |
2008 | + |
2009 | +findmnt -n -t nfs | grep -E "/storage.*vers=3.*sec=sys" |
Thanks, Andreas.
Results: (from http:// autopkgtest. ubuntu. com/results/ autopkgtest- lunar-ahasenack -lunar- nfs-utils- merge/? format= plain) 1:2.6.2- 4ubuntu1~ ppa1 1:2.6.2- 4ubuntu1~ ppa1 1:2.6.2- 4ubuntu1~ ppa1 1:2.6.2- 4ubuntu1~ ppa1 1:2.6.2- 4ubuntu1~ ppa1
nfs-utils @ amd64:
19.02.23 19:23:40 Log 🗒️ ✅ Triggers: nfs-utils/
nfs-utils @ arm64:
19.02.23 21:16:36 Log 🗒️ ✅ Triggers: nfs-utils/
nfs-utils @ armhf:
19.02.23 18:51:42 Log 🗒️ ✅ Triggers: nfs-utils/
nfs-utils @ ppc64el:
19.02.23 19:06:40 Log 🗒️ ✅ Triggers: nfs-utils/
nfs-utils @ s390x:
19.02.23 18:58:25 Log 🗒️ ✅ Triggers: nfs-utils/
Tests are OK. Package builds fine. The commits look good.
Regarding the unresponded Debian MRs, I believe it's worth filing bugs against the package too. Something I also do is ping the maintainer in the MR; sometimes they miss the notifications.
LGTM, +1.