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