Merge ~ahasenack/ubuntu/+source/nfs-utils:jammy-nfs-utils-merge into ubuntu/+source/nfs-utils:debian/experimental
- Git
- lp:~ahasenack/ubuntu/+source/nfs-utils
- jammy-nfs-utils-merge
- Merge into debian/experimental
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merge reported by: | Andreas Hasenack | ||||||||||||
Merged at revision: | 1fb81f5516f01eb26e001c2ea6a89f3d339572b8 | ||||||||||||
Proposed branch: | ~ahasenack/ubuntu/+source/nfs-utils:jammy-nfs-utils-merge | ||||||||||||
Merge into: | ubuntu/+source/nfs-utils:debian/experimental | ||||||||||||
Diff against target: |
1586 lines (+1254/-79) 12 files modified
debian/NEWS (+22/-0) debian/README.Ubuntu (+8/-0) debian/changelog (+1125/-1) debian/control (+5/-5) debian/libnfsidmap1.docs (+1/-0) debian/libnfsidmap1.install (+3/-1) debian/nfs-common.docs (+1/-1) debian/nfs-common.postinst (+4/-0) debian/not-installed (+5/-0) debian/patches/remove-regex-from-docs.patch (+79/-0) debian/patches/series (+1/-0) dev/null (+0/-71) |
||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Canonical Server | Pending | ||
Review via email: mp+415545@code.launchpad.net |
Commit message
Description of the change
This is the bug nfs-utils version bump, based on debian/
PPA, with reverse-
Remaining work:
- handle /etc/default/nfs-* to /etc/nfs.conf migration (bug #1960829)
- add more DEP8 tests (bug #1960828)
- future MIR for the regex plugin (bug #1960824)
With this upload, we are obsoleting src:libnfsidmap and its binaries. I'll request their removals from the archive.
One change that is a bit unfortunate is that we have src:libnfsidmap
I could also keep building the regex plugin in src:nfs-utils, but would need a new bin:libnfsidmap
I dropped delta touching /etc/default/nfs-* files, as they are ignored. Still in the TODO list, and part of #1960829, is to actually remove these files.
We also had delta for gssproxy, which I dropped, and I tested gssproxy integration, which works.
The other delta I dropped was for bug #1871214 (export iscsi mount). Upstream adopted the changes, and I retested the scenario to confirm.
All of these drops, and others, I mentioned in d/changelog with the reason for the drop in [brackets].
This upload is also closing an libnfsidmap bug[2], which I tested.
1. https:/
2. https:/
Andreas Hasenack (ahasenack) wrote : | # |
> For the NEWS entry, since the regex plugin is effectively a new feature, maybe it's not as
> necessary to explain why it was omitted,
Hm, interesting point. I wanted to explain somewhere why we are the only ones who ship nfs-utils without this plugin. I even had to patch the idmapd.conf.5 manpage to point at the package in universe. Maybe README.Debian is more appropriate then?
> Does the libnfsidmap-regex package provide man page info similar to what's being dropped with
> this merge?
Yes. It has an extra bit about two different config keys (Group-Map-File and Group-Map-Section) but I couldn't find evidence in the code that they exist, nor could I get them to work. They are not mentioned in the nfs-utils' idmapd.conf.5 manpage.
My patch for nfsutils' idmapd.conf.5 mentions the other manpage in the regex package, called libnfsidmap-
> Do you think it would be worthwhile to mention the nfsconvert.py script in the section of the
> NEWS file explaining the config changes,
This script is not part of the upstream source, it's a script made by Fedora and shipped only in their package. If we decide to involve that script somehow, then it will for sure be mentioned in NEWS and probably also README.Debian.
About apport, good catch, I had forgotten about that. I need to update the debian/*.bug-script files to use /etc/nfs.conf too. I'm not sure if apport uses those, but a bug is the right place to check. bug #1961058
Andreas Hasenack (ahasenack) wrote : | # |
Just let me know if you think we should remove the regex mention from NEWS, and/or put it in a new debian/
While looking at debian/*README*, I also noticed that the existing debian/
Bryce Harrington (bryce) wrote : | # |
README.Debian does seem like a better place for that rationale, although this also seems to fall into the category of things one may refer to d/changelog and/or a lp# to learn about; any of these would be fine.
Good to hear the cross-reference about the regex feature, that seems sufficient breadcrumbs to ensure the info is discoverable for those who need it.
Agreed the nfsv4 readme is probably too dated to be of use. +1 to dropping it in our delta but also let Debian know in case they'd prefer updating/replacing it.
Speaking of nfsv4 documentation, do you already have a bug report or card for a follow up task of revising the nfs docs in the server guide? At a quick glance it looks like it doesn't cover nfsv4. It does point to https:/
Andreas Hasenack (ahasenack) wrote : | # |
The server guide docs are very shallow in this area indeed. I did add a task to bug #1878601 for release notes, but not server guide. We need one, and I'm up for writing/updating it in that regard.
Andreas Hasenack (ahasenack) wrote : | # |
I added a serverguide task to the merge bug, let's see how that tracking works out.
- 9b3a9f7... by Andreas Hasenack
-
- Update README files:
+ d/README.Ubuntu: explains some of the packaging decisions
+ d/README.Debian. nfsv4: removed as the content is out of date
+ d/nfs-common.docs: install README.Ubuntu instead of
README. Debian. nfsv4
+ d/libnfsidmap1.docs: install README.Ubuntu - 1569889... by Andreas Hasenack
-
merge-changelogs
- 63ed865... by Andreas Hasenack
-
reconstruct-
changelog - 914b367... by Andreas Hasenack
-
update-maintainer
Andreas Hasenack (ahasenack) wrote : | # |
I removed the bit about libnfsidmap-regex from d/NEWS, but then I might have gone overboard with the README files.
I think the README.Debian.nfsv4 has to be removed, that's ok. Then I added README.Ubuntu explaining why in Ubuntu we use regex from libnfsidmap-regex instead of src:nfs-utils. I wanted that in the libnfsidmap1 package, because that's where you would find regex in Debian, but debhelper doesn't install <package>
Phew. All that, and the libnfsidmap-regex story is also in d/changelog, with a MIR bug reference too. (MIR to be started yet, but at least the reference bug number is stable).
Let me know what you think, I can just as easy drop this README.Ubuntu idea, since d/changelog mentions it too.
Bryce Harrington (bryce) wrote : | # |
Yep, new changes LGTM, +1.
Andreas Hasenack (ahasenack) wrote : | # |
Thanks Bryce!
Uploaded
$ dput ubuntu ../nfs-
D: Setting host argument.
Checking signature on .changes
gpg: ../nfs-
Checking signature on .dsc
gpg: ../nfs-
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading nfs-utils_
Uploading nfs-utils_
Uploading nfs-utils_
Uploading nfs-utils_
Uploading nfs-utils_
Successfully uploaded packages.
Andreas Hasenack (ahasenack) wrote : | # |
This migrated
Preview Diff
1 | diff --git a/debian/NEWS b/debian/NEWS |
2 | new file mode 100644 |
3 | index 0000000..1204d13 |
4 | --- /dev/null |
5 | +++ b/debian/NEWS |
6 | @@ -0,0 +1,22 @@ |
7 | +nfs-utils (1:2.6.1-1~exp1ubuntu1) jammy; urgency=medium |
8 | + |
9 | + The configuration of the NFS related services has been moved to /etc/nfs.conf. |
10 | + This package still installs /etc/default/nfs-common and |
11 | + /etc/default/nfs-kernel-server, but they are ignored. A future version of this |
12 | + package will handle the migration somehow[1]. |
13 | + . |
14 | + Due to the above, the old nfs-config.service unit file has been deprecated and |
15 | + removed. |
16 | + . |
17 | + All NFS related services are enabled by default. This means that depending on |
18 | + the NFS version that you intend to use, some services might be superfluous. |
19 | + For example, if you never intend to serve NFSv3, then you can safely disable |
20 | + the rpc-statd.service unit. Note that some NFSv4 service units will start |
21 | + only if Kerberos is setup. |
22 | + . |
23 | + libnfsidmapMAJOR and libnfsidmap-dev are now built from the nfs-utils source |
24 | + package. This change deprecates the source package src:libnfsidmap. |
25 | + . |
26 | + 1. https://bugs.launchpad.net/bugs/1960829 |
27 | + |
28 | + -- Andreas Hasenack <andreas@canonical.com> Tue, 25 Jan 2022 16:30:49 -0300 |
29 | diff --git a/debian/README.Debian.nfsv4 b/debian/README.Debian.nfsv4 |
30 | deleted file mode 100644 |
31 | index 453e2f8..0000000 |
32 | --- a/debian/README.Debian.nfsv4 |
33 | +++ /dev/null |
34 | @@ -1,71 +0,0 @@ |
35 | -NFSv4 in Debian |
36 | -=============== |
37 | - |
38 | -NFSv4 support in Debian is rather new, and not fully supported yet. If you want |
39 | -to experiment, make sure you have: |
40 | - |
41 | - - a recent 2.6 kernel on both client and server; newer is better. You might |
42 | - even want to use CITI's patch set from |
43 | - http://www.citi.umich.edu/projects/nfsv4/linux/ on the server, and/or Trond |
44 | - Myklebust's patch set from http://client.linux-nfs.org/ . |
45 | - - a recent enough version of nfs-utils on both client and server (you probably |
46 | - have on at least one of them, since you're reading this file!). |
47 | - - enabled idmapd on both sides (see /etc/default/nfs-common). |
48 | - - The following lines in /etc/services on the client (if not, you will receive |
49 | - the message "broken /etc/services" when starting rpc.gssd; this will usually |
50 | - only happen if you upgrade netbase without letting it replace /etc/services |
51 | - with the new version): |
52 | - |
53 | - nfs 2049/tcp # Network File System |
54 | - nfs 2049/udp # Network File System |
55 | - |
56 | -The export structure might be a bit confusing if you're already familiar with |
57 | -NFSv2 or NFSv3. The biggest difference is that you will need to export an |
58 | -explicit root of your pseudofilesystem, like this /etc/exports fragment: |
59 | - |
60 | - /nfs4 hostname(rw,sync,fsid=0,crossmnt) |
61 | - |
62 | -(It doesn't need to be named "nfs4".) Then you can mount other volumes under |
63 | -that, like: |
64 | - |
65 | - /nfs4/music hostname(rw,sync) |
66 | - /nfs4/movies hostname(rw,sync) |
67 | - |
68 | -Then your client can mount shares like this: |
69 | - |
70 | - mount -t nfs4 server:/music /mnt/music |
71 | - |
72 | -Since you might not have everything under one root, you might want /nfs4/* on |
73 | -the server to be bind mounts, ie.: |
74 | - |
75 | - mount --bind /srv/music /nfs4/music |
76 | - |
77 | -or in /etc/fstab: |
78 | - |
79 | - /srv/music /nfs4/music none bind 0 0 |
80 | - |
81 | -Note that this special export structure might be handled transparently by |
82 | -rpc.mountd at some time in the future, in which case you will probably get the |
83 | -traditional (NFSv3-style) behaviour if and only if you have no share with |
84 | -fsid=0. |
85 | - |
86 | -If you do not wish to use host-based authentication, you can specify "gss/krb5" |
87 | -instead of a hostname to get Kerberos-based authentication instead. For this, |
88 | -you will need an "nfs/hostname@REALM" entry in /etc/krb5.keytab, as well as |
89 | -rpc.gssd running on both client and rpc.svcgssd on the server (enable them |
90 | -manually in /etc/default/nfs-common and /etc/default/nfs-kernel-server if the |
91 | -autodetection fails). On the client, you will need to add "-o sec=krb5" to |
92 | -the mount call. |
93 | - |
94 | -If you use "gss/krb5i" (and correspondingly "-o sec=krb5i" on the client), you |
95 | -will also get integrity (ie. authentication), and with "gss/krb5p", you'll also |
96 | -get privacy (ie. encryption). Make sure your kernel supports this; not all |
97 | -kernels do. |
98 | - |
99 | -If you receive messages on the server complaining about "client ID already in |
100 | -use" when mounting from more than one client, check that you have at least |
101 | -mount version 2.12r-14. Also, connecting from behind different NATs could cause |
102 | -this kind of issue currently, as two or more clients would believe they had the |
103 | -same IP. |
104 | - |
105 | - -- Steinar H. Gunderson <sesse@debian.org>, Wed, 11 Oct 2006 15:18:03 +0200 |
106 | diff --git a/debian/README.Ubuntu b/debian/README.Ubuntu |
107 | new file mode 100644 |
108 | index 0000000..58eb6b7 |
109 | --- /dev/null |
110 | +++ b/debian/README.Ubuntu |
111 | @@ -0,0 +1,8 @@ |
112 | +nfs-utils upstream pulled[1] in the regex plugin from libnfsidmap-regex[2], but |
113 | +that plugin is already packaged in Ubuntu Universe[3]. For now, to use the |
114 | +regex plugin, please continue to install libnfsidmap-regex from Ubuntu |
115 | +Universe. |
116 | + |
117 | +1. http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=940caffdfb9953a2ccfecec81664e4a179753461 |
118 | +2. https://github.com/isginf/libnfsidmap-regex |
119 | +3. https://launchpad.net/ubuntu/+source/libnfsidmap-regex |
120 | diff --git a/debian/changelog b/debian/changelog |
121 | index 6f230fe..e7676d9 100644 |
122 | --- a/debian/changelog |
123 | +++ b/debian/changelog |
124 | @@ -1,3 +1,62 @@ |
125 | +nfs-utils (1:2.6.1-1~exp1ubuntu1) jammy; urgency=medium |
126 | + |
127 | + * Merge with Debian experimental (LP: #1878601, #1812280). Remaining |
128 | + changes: |
129 | + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
130 | + the #DEBHELPER# section can do its job if needed |
131 | + * Dropped: |
132 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
133 | + [Ubuntu has it, but not in main] |
134 | + - debian/nfs-common.default: remove NEED_STATD and related comment. |
135 | + [/etc/default/nfs-* files are no longer used] |
136 | + - debian/nfs-common.default: always start idmapd automatically; drop the |
137 | + configuration option. |
138 | + [/etc/default/nfs-* files are no longer used] |
139 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
140 | + argument of the serialize_krb5_ctx() function. |
141 | + [Was only needed when libgssglue-dev was used for build, which it |
142 | + isn't since nfs-utils 1:1.2.8-7] |
143 | + - Fixing nfs-mountd dependency on rpcbind (race condition) by adding |
144 | + "rpcbind.socket" to "nfs-mountd.service" as a dependency to avoid race |
145 | + conditions: |
146 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
147 | + [Fixed upstream] |
148 | + - truncate_gid*.patch: Backports from upstream to prevent truncating UIDs |
149 | + and GIDs over 65536 on certain architectures |
150 | + [Fixed upstream] |
151 | + - d/p/fix-start-ordering-1.patch, d/p/fix-start-ordering-2.patch, d/p/fix- |
152 | + start-ordering-3.patch, d/nfs-kernel-server.install: Fix systemd service |
153 | + start ordering |
154 | + [Fixed upstream. Patch 3 we don't need anymore because now the pkg |
155 | + is built with --with-systemd] |
156 | + - Depend on network-online.target when starting services. |
157 | + - d/p/lp1918141-use-network-online-target-01.patch: Declare a |
158 | + Wants=network-online.target on all NFS server services. |
159 | + - d/p/lp1918141-use-network-online-target-02.patch: Declare a |
160 | + After=network-online.target on all NFS server services. Thanks to |
161 | + Niklas Edmundsson for helping with the reproducer. |
162 | + [Fixed upstream] |
163 | + * Added: |
164 | + - d/control: don't provide libnfsidmap2 in libnfsidmap1 |
165 | + - d/NEWS: explain some of the major changes in 2.6.x |
166 | + - Don't install the regex module, as it's built by |
167 | + src:libnfsidmap-regex which is in Universe (MIR: #1960824) |
168 | + + d/control: don't conflict/break/etc with libnfsidmap-regex |
169 | + + d/libnfsidmap1.install: don't install regex.so |
170 | + + d/not-installed: mark files we knowingly don't include in the |
171 | + packaging |
172 | + + d/p/remove-regex-from-docs.patch: remove the regex section from |
173 | + the idmapd.conf(5) manpage, as we are not building that plugin in |
174 | + this package |
175 | + - Update README files: |
176 | + + d/README.Ubuntu: explains some of the packaging decisions |
177 | + + d/README.Debian.nfsv4: removed as the content is out of date |
178 | + + d/nfs-common.docs: install README.Ubuntu instead of |
179 | + README.Debian.nfsv4 |
180 | + + d/libnfsidmap1.docs: install README.Ubuntu |
181 | + |
182 | + -- Andreas Hasenack <andreas@canonical.com> Wed, 16 Feb 2022 20:20:26 +0000 |
183 | + |
184 | nfs-utils (1:2.6.1-1~exp1) experimental; urgency=medium |
185 | |
186 | [ Romain Perier ] |
187 | @@ -119,6 +178,50 @@ nfs-utils (1:2.5.4-1~exp1) experimental; urgency=medium |
188 | |
189 | -- Anibal Monsalve Salazar <anibal@debian.org> Sun, 05 Sep 2021 23:50:09 +1000 |
190 | |
191 | +nfs-utils (1:1.3.4-6ubuntu1) impish; urgency=medium |
192 | + |
193 | + * Merge from Debian unstable (LP: #1929406). Remaining changes: |
194 | + - debian/nfs-common.default: always start idmapd automatically; drop the |
195 | + configuration option. |
196 | + - debian/nfs-common.default: remove NEED_STATD and related comment. |
197 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
198 | + argument of the serialize_krb5_ctx() function. |
199 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
200 | + - Fixing nfs-mountd dependency on rpcbind (race condition) by adding |
201 | + "rpcbind.socket" to "nfs-mountd.service" as a dependency to avoid race |
202 | + conditions: |
203 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
204 | + - truncate_gid*.patch: Backports from upstream to prevent truncating UIDs |
205 | + and GIDs over 65536 on certain architectures |
206 | + - d/p/fix-start-ordering-1.patch, d/p/fix-start-ordering-2.patch, d/p/fix- |
207 | + start-ordering-3.patch, d/nfs-kernel-server.install: Fix systemd service |
208 | + start ordering |
209 | + - Depend on network-online.target when starting services. |
210 | + - d/p/lp1918141-use-network-online-target-01.patch: Declare a |
211 | + Wants=network-online.target on all NFS server services. |
212 | + - d/p/lp1918141-use-network-online-target-02.patch: Declare a |
213 | + After=network-online.target on all NFS server services. Thanks to |
214 | + Niklas Edmundsson for helping with the reproducer. |
215 | + - d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
216 | + the #DEBHELPER# section can do its job if needed |
217 | + * Removed patches obsoleted/merged by upstream: |
218 | + - Remove hard-coded dep on libtirpc1; already merged upstream, but |
219 | + previously un-noted |
220 | + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
221 | + which is the variable name expected by the rpc-svcgssd systemd service; |
222 | + already merged upstream, but previously un-noted |
223 | + - d/p/python3.diff obsoleted by |
224 | + d/p/Convert-remaining-python-scripts-to-python3.patch |
225 | + * d/p/nfsiostat-replace-list-reserved-word.patch: re-instated after |
226 | + previous merge removed a patch already merged upstream |
227 | + * d/p/01-sm-notify-in-sbin.patch, |
228 | + d/p/03-handle-mtab-symlink.patch, |
229 | + d/p/17-multiarch-kerberos-paths.patch, |
230 | + d/p/unbreak-blkmapd-rpc_pipefs-run.patch: |
231 | + reverted unnecessary refresh of patches |
232 | + |
233 | + -- Dave Jones <dave.jones@canonical.com> Tue, 06 Jul 2021 11:47:33 +0100 |
234 | + |
235 | nfs-utils (1:1.3.4-6) unstable; urgency=medium |
236 | |
237 | * mountstats: Remove a shebang |
238 | @@ -136,6 +239,59 @@ nfs-utils (1:1.3.4-5) unstable; urgency=medium |
239 | |
240 | -- Salvatore Bonaccorso <carnil@debian.org> Tue, 09 Mar 2021 17:17:42 +0100 |
241 | |
242 | +nfs-utils (1:1.3.4-4ubuntu3) impish; urgency=medium |
243 | + |
244 | + * d/nfs-common.postinst: always start nfs-utils.service, so the restart in |
245 | + the #DEBHELPER# section can do its job if needed (LP: #1928259) |
246 | + |
247 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 24 May 2021 17:59:39 -0300 |
248 | + |
249 | +nfs-utils (1:1.3.4-4ubuntu2) hirsute; urgency=medium |
250 | + |
251 | + * Depend on network-online.target when starting services. (LP: #1918141) |
252 | + - d/p/lp1918141-use-network-online-target-01.patch: Declare a |
253 | + Wants=network-online.target on all NFS server services. |
254 | + - d/p/lp1918141-use-network-online-target-02.patch: Declare a |
255 | + After=network-online.target on all NFS server services. |
256 | + Thanks to Niklas Edmundsson for helping with the reproducer. |
257 | + |
258 | + -- Sergio Durigan Junior <sergio.durigan@canonical.com> Mon, 15 Mar 2021 18:26:22 -0400 |
259 | + |
260 | +nfs-utils (1:1.3.4-4ubuntu1) hirsute; urgency=low |
261 | + |
262 | + * Merge from Debian unstable. Remaining changes: |
263 | + - debian/nfs-common.default: always start idmapd automatically; drop |
264 | + the configuration option. |
265 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
266 | + argument of the serialize_krb5_ctx() function. |
267 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
268 | + - Fixing nfs-mountd dependency on rpcbind (race condition) |
269 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
270 | + to avoid race conditions: |
271 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
272 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
273 | + python3 instead of python. |
274 | + - truncate_gid*.patch: Backports from upstream to prevent truncating |
275 | + UIDs and GIDs over 65536 on certain architectures |
276 | + - Remove hard-coded dep on libtirpc1. |
277 | + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
278 | + which is the variable name expected by the rpc-svcgssd systemd service. |
279 | + - d/p/fix-start-ordering-1.patch, |
280 | + d/p/fix-start-ordering-2.patch, |
281 | + d/p/fix-start-ordering-3.patch, |
282 | + d/nfs-kernel-server.install: |
283 | + Fix systemd service start ordering |
284 | + * Dropped changes, included in Debian: |
285 | + - Allow compilation to succeed with -fno-common |
286 | + - debian/nfs-common.postinst: don't make /var/lib/nfs owned by statd. |
287 | + - debian/patches/CVE-2019-3689.patch: take user-id from |
288 | + /var/lib/nfs/sm in support/nsm/file.c, utils/statd/sm-notify.man, |
289 | + utils/statd/statd.man. |
290 | + - d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due |
291 | + to using 'list' as a variable name. |
292 | + |
293 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 26 Oct 2020 09:25:58 -0700 |
294 | + |
295 | nfs-utils (1:1.3.4-4) unstable; urgency=medium |
296 | |
297 | * Allow compilation to succeed with -fno-common (Closes: #957608) |
298 | @@ -174,6 +330,73 @@ nfs-utils (1:1.3.4-3) unstable; urgency=medium |
299 | |
300 | -- Salvatore Bonaccorso <carnil@debian.org> Fri, 13 Mar 2020 05:16:46 +0100 |
301 | |
302 | +nfs-utils (1:1.3.4-2.5ubuntu6) groovy; urgency=medium |
303 | + |
304 | + * Allow compilation to succeed with -fno-common (Closes: #957608) |
305 | + (cherry picked from 1:1.3.4-4) |
306 | + |
307 | + -- Julian Andres Klode <juliank@ubuntu.com> Wed, 16 Sep 2020 16:20:55 +0200 |
308 | + |
309 | +nfs-utils (1:1.3.4-2.5ubuntu5) groovy; urgency=medium |
310 | + |
311 | + * SECURITY UPDATE: privilege escalation via directory permissions |
312 | + - debian/patches/CVE-2019-3689.patch: take user-id from |
313 | + /var/lib/nfs/sm in support/nsm/file.c, utils/statd/sm-notify.man, |
314 | + utils/statd/statd.man. |
315 | + - debian/nfs-common.postinst: don't make /var/lib/nfs owned by statd. |
316 | + - CVE-2019-3689 |
317 | + |
318 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 17 Jun 2020 08:42:59 -0400 |
319 | + |
320 | +nfs-utils (1:1.3.4-2.5ubuntu4) groovy; urgency=medium |
321 | + |
322 | + [ Rodrigo Barbieri ] |
323 | + * d/p/fix-start-ordering-1.patch, |
324 | + d/p/fix-start-ordering-2.patch, |
325 | + d/p/fix-start-ordering-3.patch, |
326 | + d/nfs-kernel-server.install: |
327 | + - Fix systemd service start ordering (LP: #1871214) |
328 | + |
329 | + -- Dariusz Gadomski <dariusz.gadomski@canonical.com> Thu, 28 May 2020 17:45:23 -0400 |
330 | + |
331 | +nfs-utils (1:1.3.4-2.5ubuntu3) focal; urgency=medium |
332 | + |
333 | + * No-change rebuild for libevent soname changes. |
334 | + |
335 | + -- Matthias Klose <doko@ubuntu.com> Sat, 19 Oct 2019 19:57:12 +0000 |
336 | + |
337 | +nfs-utils (1:1.3.4-2.5ubuntu2) eoan; urgency=medium |
338 | + |
339 | + * No-change upload with strops.h and sys/strops.h removed in glibc. |
340 | + |
341 | + -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 11:04:05 +0000 |
342 | + |
343 | +nfs-utils (1:1.3.4-2.5ubuntu1) eoan; urgency=low |
344 | + |
345 | + * Merge from Debian unstable. Remaining changes: |
346 | + - debian/nfs-common.default: always start idmapd automatically; drop |
347 | + the configuration option. |
348 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
349 | + argument of the serialize_krb5_ctx() function. |
350 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
351 | + - Fixing nfs-mountd dependency on rpcbind (race condition) |
352 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
353 | + to avoid race conditions: |
354 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
355 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
356 | + python3 instead of python. |
357 | + - truncate_gid*.patch: Backports from upstream to prevent truncating |
358 | + UIDs and GIDs over 65536 on certain architectures |
359 | + - Remove hard-coded dep on libtirpc1. |
360 | + - d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
361 | + which is the variable name expected by the rpc-svcgssd systemd service. |
362 | + - d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due |
363 | + to using 'list' as a variable name. |
364 | + * Dropped changes, included in Debian: |
365 | + - glibc-2.28-compat.patch: Include <sys/sysmacros.h> for major/minor. |
366 | + |
367 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 May 2019 22:43:12 -0700 |
368 | + |
369 | nfs-utils (1:1.3.4-2.5) unstable; urgency=medium |
370 | |
371 | * Non-maintainer upload. |
372 | @@ -199,6 +422,43 @@ nfs-utils (1:1.3.4-2.4) unstable; urgency=medium |
373 | |
374 | -- Hilko Bengen <bengen@debian.org> Sat, 09 Feb 2019 15:26:27 +0100 |
375 | |
376 | +nfs-utils (1:1.3.4-2.3ubuntu3) disco; urgency=medium |
377 | + |
378 | + * d/p/nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due to |
379 | + using 'list' as a variable name. (LP: #1821261) |
380 | + |
381 | + -- Matthew Ruffell <matthew.ruffell@canonical.com> Tue, 02 Apr 2019 11:09:15 +1300 |
382 | + |
383 | +nfs-utils (1:1.3.4-2.3ubuntu2) disco; urgency=medium |
384 | + |
385 | + * d/nfs-utils_env.sh: alongside RPCSVCGSSDARGS, also export SVCGSSDARGS, |
386 | + which is the variable name expected by the rpc-svcgssd systemd service. |
387 | + (LP: #1616123) |
388 | + |
389 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 25 Mar 2019 09:24:29 -0300 |
390 | + |
391 | +nfs-utils (1:1.3.4-2.3ubuntu1) disco; urgency=low |
392 | + |
393 | + * Merge from Debian unstable. Remaining changes: |
394 | + - debian/nfs-common.default: always start idmapd automatically; drop |
395 | + the configuration option. |
396 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
397 | + argument of the serialize_krb5_ctx() function. |
398 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
399 | + (LP: #1446851) |
400 | + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
401 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
402 | + to avoid race conditions: |
403 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
404 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
405 | + python3 instead of python. |
406 | + - glibc-2.28-compat.patch: Include <sys/sysmacros.h> for major/minor. |
407 | + - truncate_gid*.patch: Backports from upstream to prevent truncating |
408 | + UIDs and GIDs over 65536 on certain architectures |
409 | + - Remove hard-coded dep on libtirpc1. |
410 | + |
411 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Jan 2019 23:18:10 -0800 |
412 | + |
413 | nfs-utils (1:1.3.4-2.3) unstable; urgency=medium |
414 | |
415 | * Non-maintainer upload. |
416 | @@ -218,6 +478,51 @@ nfs-utils (1:1.3.4-2.3) unstable; urgency=medium |
417 | |
418 | -- Laurent Bigonville <bigon@debian.org> Sat, 20 Oct 2018 15:04:07 +0200 |
419 | |
420 | +nfs-utils (1:1.3.4-2.2ubuntu5) disco; urgency=medium |
421 | + |
422 | + * Remove hard-coded dep on libtirpc1. |
423 | + |
424 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 13 Nov 2018 17:03:07 -0800 |
425 | + |
426 | +nfs-utils (1:1.3.4-2.2ubuntu4) disco; urgency=medium |
427 | + |
428 | + * No-change rebuild against latest libtirpc |
429 | + |
430 | + -- Jeremy Bicha <jbicha@ubuntu.com> Sat, 10 Nov 2018 07:54:17 -0500 |
431 | + |
432 | +nfs-utils (1:1.3.4-2.2ubuntu3) cosmic; urgency=medium |
433 | + |
434 | + * truncate_gid*.patch: Backports from upstream to prevent truncating |
435 | + UIDs and GIDs over 65536 on certain architectures (LP: #1779962) |
436 | + |
437 | + -- Adam Conrad <adconrad@ubuntu.com> Tue, 16 Oct 2018 06:06:43 -0600 |
438 | + |
439 | +nfs-utils (1:1.3.4-2.2ubuntu2) cosmic; urgency=medium |
440 | + |
441 | + * glibc-2.28-compat.patch: Include <sys/sysmacros.h> for major/minor. |
442 | + |
443 | + -- Adam Conrad <adconrad@ubuntu.com> Tue, 16 Oct 2018 05:24:40 -0600 |
444 | + |
445 | +nfs-utils (1:1.3.4-2.2ubuntu1) cosmic; urgency=medium |
446 | + |
447 | + * Merge from Debian unstable. Remaining changes: |
448 | + - debian/nfs-common.default: always start idmapd automatically; drop |
449 | + the configuration option. |
450 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
451 | + argument of the serialize_krb5_ctx() function. |
452 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
453 | + (LP: #1446851) |
454 | + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
455 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
456 | + to avoid race conditions: |
457 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
458 | + - Convert mountstats and nfsiostat scripts to Python3 and recommend |
459 | + python3 instead of python. |
460 | + * Dropped already integrated changes: |
461 | + - Provide UINT16_MAX definition if not provided by glibc. |
462 | + |
463 | + -- Balint Reczey <rbalint@ubuntu.com> Thu, 23 Aug 2018 16:16:30 +0200 |
464 | + |
465 | nfs-utils (1:1.3.4-2.2) unstable; urgency=medium |
466 | |
467 | * Non-maintainer upload. |
468 | @@ -229,6 +534,55 @@ nfs-utils (1:1.3.4-2.2) unstable; urgency=medium |
469 | |
470 | -- Adrian Bunk <bunk@debian.org> Tue, 06 Feb 2018 21:20:36 +0200 |
471 | |
472 | +nfs-utils (1:1.3.4-2.1ubuntu5) bionic; urgency=medium |
473 | + |
474 | + * Drop obsoleted 20-ticket-expired-error.patch (LP: #1709129) |
475 | + The original issue is fixed in the kernel starting with version 3.10. |
476 | + * Refresh patches |
477 | + * Remove whitespace after '=' in service files |
478 | + |
479 | + -- Balint Reczey <rbalint@ubuntu.com> Tue, 16 Jan 2018 23:49:38 +0100 |
480 | + |
481 | +nfs-utils (1:1.3.4-2.1ubuntu4) bionic; urgency=medium |
482 | + |
483 | + * Convert mountstats and nfsiostat scripts to Python3 and recommend |
484 | + python3 instead of python. LP: #1735458. |
485 | + * Provide UINT16_MAX definition if not provided by glibc. |
486 | + |
487 | + -- Matthias Klose <doko@ubuntu.com> Fri, 01 Dec 2017 03:49:39 +0100 |
488 | + |
489 | +nfs-utils (1:1.3.4-2.1ubuntu2) artful; urgency=medium |
490 | + |
491 | + * Fix flaky autopkgtest: a 'sync' after an update on the server does not |
492 | + guarantee that the change is visible on the client. For that, we need |
493 | + to flush the inode/dentry cache instead. |
494 | + |
495 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Aug 2017 23:08:25 -0700 |
496 | + |
497 | +nfs-utils (1:1.3.4-2.1ubuntu1) artful; urgency=low |
498 | + |
499 | + * Merge from Debian unstable. Remaining changes: |
500 | + - debian/nfs-common.default: always start idmapd automatically; drop |
501 | + the configuration option. |
502 | + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) |
503 | + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel |
504 | + on ticket expiry. (LP: #794112) |
505 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
506 | + argument of the serialize_krb5_ctx() function. (LP: #1331201) |
507 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
508 | + (LP: #1446851) |
509 | + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart |
510 | + jobs) on upgrades. This needs to be kept until after 18.04 LTS. |
511 | + - Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
512 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
513 | + to avoid race conditions: |
514 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
515 | + * Dropped already integrated changes: |
516 | + - Add a dependency on keyutils to nfs-common, so that idmapping will work |
517 | + under systemd. (LP: #1449074) |
518 | + |
519 | + -- Balint Reczey <rbalint@ubuntu.com> Thu, 03 Aug 2017 20:50:38 +0200 |
520 | + |
521 | nfs-utils (1:1.3.4-2.1) unstable; urgency=medium |
522 | |
523 | * Non-maintainer upload. |
524 | @@ -262,6 +616,22 @@ nfs-utils (1:1.3.4-1) unstable; urgency=medium |
525 | |
526 | -- Daniel Pocock <daniel@pocock.pro> Tue, 13 Dec 2016 19:37:42 +0100 |
527 | |
528 | +nfs-utils (1:1.2.8-9.2ubuntu2) zesty; urgency=medium |
529 | + |
530 | + * Fixing nfs-mountd dependency on rpcbind (race condition) (LP: #1590799) |
531 | + by adding "rpcbind.socket" to "nfs-mountd.service" as a dependency |
532 | + to avoid race conditions: |
533 | + - Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch |
534 | + - Add systemd-unit-files-fix-up-dependencies-on-rpcbind.patch |
535 | + |
536 | + -- Rafael David Tinoco <rafael.tinoco@canonical.com> Fri, 17 Mar 2017 12:19:53 +0100 |
537 | + |
538 | +nfs-utils (1:1.2.8-9.2ubuntu1) yakkety; urgency=medium |
539 | + |
540 | + * Merge fixes from Debian. |
541 | + |
542 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 12 Sep 2016 23:18:00 +0200 |
543 | + |
544 | nfs-utils (1:1.2.8-9.2) unstable; urgency=medium |
545 | |
546 | * Non-maintainer upload. |
547 | @@ -277,6 +647,27 @@ nfs-utils (1:1.2.8-9.2) unstable; urgency=medium |
548 | |
549 | -- Andreas Henriksson <andreas@fatal.se> Thu, 11 Aug 2016 18:50:24 +0200 |
550 | |
551 | +nfs-utils (1:1.2.8-9.1ubuntu1) yakkety; urgency=medium |
552 | + |
553 | + * Drop upstart jobs, upstart is not in yakkety any more. |
554 | + * Drop libgssglue-dev build dep, --with-gssglue got dropped a while ago. |
555 | + * Merge with Debian unstable. Remaining Ubuntu changes: |
556 | + - debian/nfs-common.default: always start idmapd automatically; drop |
557 | + the configuration option. |
558 | + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) |
559 | + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel |
560 | + on ticket expiry. (LP: #794112) |
561 | + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx |
562 | + argument of the serialize_krb5_ctx() function. (LP: #1331201) |
563 | + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu |
564 | + (LP: #1446851) |
565 | + - Add a dependency on keyutils to nfs-common, so that idmapping will work |
566 | + under systemd. (LP: #1449074) |
567 | + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart |
568 | + jobs) on upgrades. This needs to be kept until after 18.04 LTS. |
569 | + |
570 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 28 Jul 2016 15:21:53 +0200 |
571 | + |
572 | nfs-utils (1:1.2.8-9.1) unstable; urgency=medium |
573 | |
574 | Partial sync from ubuntu, included changes: |
575 | @@ -341,6 +732,149 @@ nfs-utils (1:1.2.8-9.1) unstable; urgency=medium |
576 | |
577 | -- Andreas Henriksson <andreas@fatal.se> Tue, 28 Jun 2016 02:05:16 +0200 |
578 | |
579 | +nfs-utils (1:1.2.8-9ubuntu13) yakkety; urgency=medium |
580 | + |
581 | + * Drop obsolete versioned initscripts dependency. (Closes: #804990) |
582 | + |
583 | + -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 22 Jun 2016 16:09:37 +0200 |
584 | + |
585 | +nfs-utils (1:1.2.8-9ubuntu12) xenial; urgency=medium |
586 | + |
587 | + * Drop gssproxy as it's not in Ubuntu (LP: #1446851) |
588 | + * Fix no nfs doesn't show failed units on client (LP: #1452667) |
589 | + |
590 | + -- Bryan Quigley <bryan.quigley@canonical.com> Wed, 02 Mar 2016 15:01:29 -0500 |
591 | + |
592 | +nfs-utils (1:1.2.8-9ubuntu11) xenial; urgency=medium |
593 | + |
594 | + * Drop obsolete and no-op dh_installinit --upstart-only option. |
595 | + (LP: #1519228) |
596 | + |
597 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 24 Nov 2015 09:39:56 +0100 |
598 | + |
599 | +nfs-utils (1:1.2.8-9ubuntu10) wily; urgency=medium |
600 | + |
601 | + * debian/nfs-common.links: Add naming compatibility symlinks for |
602 | + gssd.service → rpc-gssd.service and idmapd.service → /dev/null (as this |
603 | + is bound to/handled by nfs-server.service) to provide a match for the |
604 | + upstart job names. (LP: #1476010). |
605 | + |
606 | + -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 28 Aug 2015 09:59:48 +0200 |
607 | + |
608 | +nfs-utils (1:1.2.8-9ubuntu9) wily; urgency=medium |
609 | + |
610 | + * Drop versioned mountall dependency. Trusty's is already newer and we don't |
611 | + need it with systemd under Ubuntu 15.04 and newer. |
612 | + |
613 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 27 Jul 2015 10:37:24 +0200 |
614 | + |
615 | +nfs-utils (1:1.2.8-9ubuntu8.1) vivid; urgency=medium |
616 | + |
617 | + * Add a dependency on keyutils to nfs-common, so that idmapping will work |
618 | + under systemd. LP: #1449074. |
619 | + |
620 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 27 Apr 2015 17:46:03 +0200 |
621 | + |
622 | +nfs-utils (1:1.2.8-9ubuntu8) vivid; urgency=medium |
623 | + |
624 | + * Ship missing .override files |
625 | + * Ensure we only remove the manual flag from the statd-mounting.override |
626 | + file, and potentially, remove it if empty. |
627 | + |
628 | + -- Didier Roche <didrocks@ubuntu.com> Wed, 01 Apr 2015 08:22:59 +0200 |
629 | + |
630 | +nfs-utils (1:1.2.8-9ubuntu7) vivid; urgency=medium |
631 | + |
632 | + * 27-systemd-enable-with-systemctl-statd.patch: let the admin |
633 | + enable/disable statd via systemd tools. (LP: #1428486) |
634 | + * debian/nfs-common.default: remove NEED_STATD and related comment. |
635 | + * debian/statd{,-mounting}.upstart: remove the usage of NEED_STATD, we'll |
636 | + directly disable the jobs now. |
637 | + * debian/rules: don't start statd by default (or it will trigger upstart |
638 | + and systemd statd unit startup). |
639 | + * debian/nfs-common.{preinst,postinst}: transition the conffile to the new |
640 | + template and enable statd services in both upstart and systemd if |
641 | + NEED_STATD was set to yes. |
642 | + * debian/control, debian/*install: move nfs-utils.service to nfs-common |
643 | + package. (LP: #1436304) |
644 | + |
645 | + -- Didier Roche <didrocks@ubuntu.com> Thu, 12 Mar 2015 09:13:06 +0100 |
646 | + |
647 | +nfs-utils (1:1.2.8-9ubuntu6) vivid; urgency=medium |
648 | + |
649 | + * Revert previous upload; per upstream, rpc.idmapd is not used when the |
650 | + nfsidmap utility is available and configured for use in request-key |
651 | + upcalls. So rpc.idmapd does not need to be started on clients anymore. |
652 | + |
653 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 06 Mar 2015 10:19:57 -0800 |
654 | + |
655 | +nfs-utils (1:1.2.8-9ubuntu5) vivid; urgency=medium |
656 | + |
657 | + * Add 27-systemd-start-nfs-idmapd-also-on-clients.patch: idmapd is needed |
658 | + for clients too, so start it from nfs-client.target and stop binding to it |
659 | + in nfs-server.service. (LP: #1428961) |
660 | + |
661 | + -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 06 Mar 2015 11:56:46 +0100 |
662 | + |
663 | +nfs-utils (1:1.2.8-9ubuntu4) vivid; urgency=medium |
664 | + |
665 | + * Add autopkgtest for installing server and client on localhost, setting up |
666 | + two exports, rebooting, and ensuring that the NFS mounts work. |
667 | + * Add 23-systemd-relax-dependencies.patch: Stop depending on basic.target in |
668 | + the daemons which still do; i. e. add DefaultDependencies=no. This makes |
669 | + it possible to run NFS during early boot, helps if you e. g. have /var |
670 | + on NFS, and avoids dependency cycles with rcS init.d scripts which depend |
671 | + on $remote_fs. (LP: #1428487) |
672 | + * Shift number prefixes of other systemd patches accordingly, and adjust |
673 | + them to the above patch. |
674 | + |
675 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Mar 2015 10:43:54 +0100 |
676 | + |
677 | +nfs-utils (1:1.2.8-9ubuntu3) vivid; urgency=medium |
678 | + |
679 | + * Add 00git-start-statd-systemd.patch: Latest start-statd script from |
680 | + 1.3.2 to start rpc-statd.service under systemd. |
681 | + * Add 23-systemd-pipefs_in_run.patch: systemd: Mount rpc_pipefs in /run instead of |
682 | + /var/lib/nfs/, like in the upstart units. |
683 | + * Add 24-systemd-daemon-paths.patch: Adjust program paths in systemd units. |
684 | + * debian/nfs-kernel-server.links: Add nfs-kernel-server.service alias |
685 | + symlink, to match SysV init script. |
686 | + * Add 25-systemd-server-before-client.patch: Order NFS server before client, |
687 | + to make mounting NFS shares from localhost work reliably. |
688 | + * Add debian/nfs-utils_env.sh: Translate our /etc/default files into runtime |
689 | + configuration for nfs-config.service. |
690 | + * debian/nfs-{common,kernel-server}.install: Install systemd units. |
691 | + * debian/rules: Enable/start systemd units. (LP: #1312976) |
692 | + |
693 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Mar 2015 07:46:41 +0100 |
694 | + |
695 | +nfs-utils (1:1.2.8-9ubuntu2) vivid; urgency=medium |
696 | + |
697 | + * debian/nfs-common.statd.upstart: wait for rpcbind job instead of |
698 | + relying on portmap compatibility event. (LP: #1391296) |
699 | + |
700 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 18 Nov 2014 19:07:15 -0500 |
701 | + |
702 | +nfs-utils (1:1.2.8-9ubuntu1) utopic; urgency=medium |
703 | + |
704 | + * Merge from Debian usntable, remaining changes: |
705 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
706 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
707 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
708 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
709 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
710 | + - debian/nfs-common.default: always start idmapd automatically; drop |
711 | + the configuration option. |
712 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
713 | + - Allow issuing options to rpc.nfsd |
714 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
715 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
716 | + - drop nfs-kernel-server's LSB dependency on nfs-common. |
717 | + - Add patch to adjust for changes to the ctx argument of the |
718 | + serialize_krb5_ctx() function. |
719 | + |
720 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 21 Aug 2014 11:29:38 -0700 |
721 | + |
722 | nfs-utils (1:1.2.8-9) unstable; urgency=medium |
723 | |
724 | * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc- |
725 | @@ -349,6 +883,26 @@ nfs-utils (1:1.2.8-9) unstable; urgency=medium |
726 | |
727 | -- Steve Langasek <vorlon@debian.org> Tue, 12 Aug 2014 17:12:38 -0700 |
728 | |
729 | +nfs-utils (1:1.2.8-8ubuntu1) utopic; urgency=medium |
730 | + |
731 | + * Merge from Debian unstable, remaining changes: |
732 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
733 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
734 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
735 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
736 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
737 | + - debian/nfs-common.default: always start idmapd automatically; drop |
738 | + the configuration option. |
739 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
740 | + - Allow issuing options to rpc.nfsd |
741 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
742 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
743 | + - drop nfs-kernel-server's LSB dependency on nfs-common. |
744 | + - Add patch to adjust for changes to the ctx argument of the |
745 | + serialize_krb5_ctx() function. |
746 | + |
747 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Aug 2014 01:10:28 -0700 |
748 | + |
749 | nfs-utils (1:1.2.8-8) unstable; urgency=medium |
750 | |
751 | * Upload to unstable where this belongs. |
752 | @@ -369,6 +923,38 @@ nfs-utils (1:1.2.8-7) experimental; urgency=medium |
753 | |
754 | -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 02 Aug 2014 12:25:47 +0100 |
755 | |
756 | +nfs-utils (1:1.2.8-6ubuntu4) utopic; urgency=medium |
757 | + |
758 | + * Add patch from Sergio Gelato to adjust for changes to the ctx |
759 | + argument of the serialize_krb5_ctx() function (LP: #1331201) |
760 | + |
761 | + -- Adam Conrad <adconrad@ubuntu.com> Wed, 25 Jun 2014 12:23:09 -0600 |
762 | + |
763 | +nfs-utils (1:1.2.8-6ubuntu3) utopic; urgency=medium |
764 | + |
765 | + * Soon nfs-common.init is going to be split on the Debian side, and |
766 | + nfs-kernel-server init.d's LSB depends on "nfs-common" has never done |
767 | + anything in Ubuntu. Drop it to avoid breaking insserv. (LP: #1323274) |
768 | + |
769 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 27 May 2014 11:38:51 +0200 |
770 | + |
771 | +nfs-utils (1:1.2.8-6ubuntu1) trusty; urgency=medium |
772 | + |
773 | + * Merge from Debian unstable, remaining changes: |
774 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
775 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
776 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
777 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
778 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
779 | + - debian/nfs-common.default: always start idmapd automatically; drop |
780 | + the configuration option. |
781 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
782 | + - Allow issuing options to rpc.nfsd |
783 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
784 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
785 | + |
786 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 25 Feb 2014 09:18:47 -0800 |
787 | + |
788 | nfs-utils (1:1.2.8-6) unstable; urgency=medium |
789 | |
790 | * Fix the sec=krb5* handling in debian/nfs-common.init to properly match |
791 | @@ -395,6 +981,29 @@ nfs-utils (1:1.2.8-6) unstable; urgency=medium |
792 | |
793 | -- Steve Langasek <vorlon@debian.org> Mon, 24 Feb 2014 18:11:17 +0000 |
794 | |
795 | +nfs-utils (1:1.2.8-5ubuntu1) trusty; urgency=medium |
796 | + |
797 | + * Merge from Debian unstable, remaining changes: |
798 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
799 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
800 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
801 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
802 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
803 | + - debian/nfs-common.default: always start idmapd automatically; drop |
804 | + the configuration option. |
805 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
806 | + - Allow issuing options to rpc.nfsd |
807 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs |
808 | + due to EKEYEXPIRED error from kernel on ticket expiry. |
809 | + * Dropped changes, included in Debian: |
810 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
811 | + in /var/lib. |
812 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
813 | + in the postinst, this is redundant anyway and the nfs-common init script |
814 | + is gone now. |
815 | + |
816 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 13 Jan 2014 21:13:11 -0800 |
817 | + |
818 | nfs-utils (1:1.2.8-5) unstable; urgency=medium |
819 | |
820 | [ Ben Hutchings ] |
821 | @@ -411,6 +1020,37 @@ nfs-utils (1:1.2.8-5) unstable; urgency=medium |
822 | |
823 | -- Steve Langasek <vorlon@debian.org> Mon, 13 Jan 2014 22:07:53 +0000 |
824 | |
825 | +nfs-utils (1:1.2.8-4ubuntu1) trusty; urgency=low |
826 | + |
827 | + * Merge from Debian unstable, remaining changes: |
828 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
829 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
830 | + debian/rules: drop nfs-common init script in favor of upstart jobs. |
831 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
832 | + - Depend on mountall (>= 2.41) to avoid deadlocks on boot. |
833 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
834 | + in the postinst, this is redundant anyway and the nfs-common init script |
835 | + is gone now. |
836 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
837 | + - Allow issuing options to rpc.nfsd |
838 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
839 | + the configuration option. |
840 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
841 | + in /var/lib. |
842 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due |
843 | + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 |
844 | + - Fix the stop conditions: never stop on 'runlevel [06]' since that gives |
845 | + the system no time to cleanly unmount nfs mounts; instead, stop only on |
846 | + the unmounted-remote-filesystems event. LP: #569094. |
847 | + * Dropped changes: |
848 | + - build-depend on debhelper (>= 7.3.15ubuntu3): all supported debhelper |
849 | + versions meet this requirement now, so it's not worth carrying a delta |
850 | + for. |
851 | + * Drop removal handling for rpc_pipefs.conf, which has been obsolete since |
852 | + before the 12.04 release. |
853 | + |
854 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 21 Nov 2013 13:35:20 -0800 |
855 | + |
856 | nfs-utils (1:1.2.8-4) unstable; urgency=low |
857 | |
858 | * The configure option name is --with-gssglue, not --with-libgssglue. |
859 | @@ -429,6 +1069,64 @@ nfs-utils (1:1.2.8-3) unstable; urgency=low |
860 | |
861 | -- Steve Langasek <vorlon@debian.org> Fri, 31 May 2013 17:59:53 -0700 |
862 | |
863 | +nfs-utils (1:1.2.8-2ubuntu2) saucy; urgency=low |
864 | + |
865 | + * Start statd on virtual-filesystems instead of on local-filesystems; |
866 | + this works and avoids a deadlock in the nfsroot case. Also, adjust |
867 | + idmapd to not block MOUNTPOINT=/ for the same reason. This isn't a |
868 | + perfect fix since idmapd would be needed if we ever wanted nfsv4 |
869 | + nfsroot, but implementing that can wait until we have /usr mounting from |
870 | + the initramfs. LP: #537133. |
871 | + |
872 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 11 Sep 2013 15:00:02 -0700 |
873 | + |
874 | +nfs-utils (1:1.2.8-2ubuntu1) saucy; urgency=low |
875 | + |
876 | + [ Stéphane Graber ] |
877 | + * Merge from Debian unstable. |
878 | + - includes upstream fix for gssd -R. LP: #1179992. |
879 | + - includes upstream fix for an exportfs crash when using long paths. |
880 | + LP: #1062022. |
881 | + * Remaining changes: |
882 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
883 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
884 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
885 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
886 | + init handling. |
887 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
888 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
889 | + in the postinst, this is redundant anyway and the nfs-common init script |
890 | + is gone now. |
891 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
892 | + - Allow issuing options to rpc.nfsd |
893 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
894 | + the configuration option. |
895 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
896 | + in /var/lib. |
897 | + - Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due |
898 | + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 |
899 | + - Adjust upstart jobs to treat TYPE=nfs and TYPE=nfs4 mounts identically, |
900 | + since TYPE=nfs4 is considered deprecated. |
901 | + - Fix various boot-time race conditions between mountall and nfs-utils by |
902 | + moving handling of the 'mounting' events to separate gssd-mounting and |
903 | + idmapd-mounting jobs. Requires mountall 2.41 or better to avoid deadlock |
904 | + on boot. LP: #643289, LP: #611397. |
905 | + - Fix the stop conditions: never stop on 'runlevel [06]' since that gives |
906 | + the system no time to cleanly unmount nfs mounts; instead, stop only on |
907 | + the unmounted-remote-filesystems event. LP: #569094. |
908 | + - Newer versions of gssd don't talk to portmap, so don't make the upstart |
909 | + job depend on it. |
910 | + - Add an instance to statd-mounting, and change it to just wait for statd |
911 | + instead of trying to trigger it potentially out of order. This also |
912 | + means we don't need to try to force portmap to start from statd. |
913 | + |
914 | + [ Steve Langasek ] |
915 | + * Build --with-gssglue; linking directly against libgssapi-krb5 results in |
916 | + rpc.gssd trying to incorrectly pass opaque pointers between two different |
917 | + gss implementations (via libtirpc). |
918 | + |
919 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 31 May 2013 18:05:03 -0700 |
920 | + |
921 | nfs-utils (1:1.2.8-2) unstable; urgency=medium |
922 | |
923 | * Fix reportbug scripts to use rpcinfo in /usr/sbin. |
924 | @@ -458,12 +1156,80 @@ nfs-utils (1:1.2.8-1) unstable; urgency=low |
925 | |
926 | -- Luk Claes <luk@zomers.be> Fri, 10 May 2013 14:27:47 +0200 |
927 | |
928 | +nfs-utils (1:1.2.6-3ubuntu2) quantal; urgency=low |
929 | + |
930 | + [ Steve Langasek ] |
931 | + * Adjust upstart jobs to treat TYPE=nfs and TYPE=nfs4 mounts identically, |
932 | + since TYPE=nfs4 is considered deprecated. |
933 | + * Fix various boot-time race conditions between mountall and nfs-utils by |
934 | + moving handling of the 'mounting' events to separate gssd-mounting and |
935 | + idmapd-mounting jobs. Requires mountall 2.41 or better to avoid deadlock |
936 | + on boot. LP: #643289, LP: #611397. |
937 | + * Fix the stop conditions: never stop on 'runlevel [06]' since that gives |
938 | + the system no time to cleanly unmount nfs mounts; instead, stop only on |
939 | + the unmounted-remote-filesystems event. LP: #569094. |
940 | + * Newer versions of gssd don't talk to portmap, so don't make the upstart |
941 | + job depend on it. |
942 | + * Add an instance to statd-mounting, and change it to just wait for statd |
943 | + instead of trying to trigger it potentially out of order. This also means |
944 | + we don't need to try to force portmap to start from statd. |
945 | + |
946 | + [ Matthew L. Dailey ] |
947 | + * Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due |
948 | + to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112 |
949 | + |
950 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 28 Sep 2012 13:58:43 -0400 |
951 | + |
952 | +nfs-utils (1:1.2.6-3ubuntu1) quantal; urgency=low |
953 | + |
954 | + * Merge from Debian unstable. Remaining changes: |
955 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
956 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
957 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
958 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
959 | + init handling. |
960 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
961 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
962 | + in the postinst, this is redundant anyway and the nfs-common init script |
963 | + is gone now. |
964 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
965 | + - Allow issuing options to rpc.nfsd |
966 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
967 | + the configuration option. |
968 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
969 | + in /var/lib. |
970 | + |
971 | + -- Logan Rosen <logatronico@gmail.com> Sun, 05 Aug 2012 00:56:05 -0400 |
972 | + |
973 | nfs-utils (1:1.2.6-3) unstable; urgency=low |
974 | |
975 | * Iterate through exports.d to look for expors (Closes: #676604). |
976 | |
977 | -- Luk Claes <luk@zomers.be> Tue, 10 Jul 2012 19:38:22 +0200 |
978 | |
979 | +nfs-utils (1:1.2.6-2ubuntu1) quantal; urgency=low |
980 | + |
981 | + * Merge from Debian unstable, remaining changes: |
982 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
983 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
984 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
985 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
986 | + init handling. |
987 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
988 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
989 | + in the postinst, this is redundant anyway and the nfs-common init script |
990 | + is gone now. |
991 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
992 | + - Allow issuing options to rpc.nfsd |
993 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
994 | + the configuration option. |
995 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
996 | + in /var/lib. |
997 | + * Dropped changes, included in Debian: |
998 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
999 | + |
1000 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 22 Jun 2012 11:25:28 -0700 |
1001 | + |
1002 | nfs-utils (1:1.2.6-2) unstable; urgency=low |
1003 | |
1004 | * Move open-iscsi and watchdog to Suggests. |
1005 | @@ -491,6 +1257,44 @@ nfs-utils (1:1.2.5-4) unstable; urgency=low |
1006 | |
1007 | -- Luk Claes <luk@debian.org> Sun, 22 Jan 2012 15:46:25 +0100 |
1008 | |
1009 | +nfs-utils (1:1.2.5-3ubuntu3) precise; urgency=low |
1010 | + |
1011 | + * In some cases, /var/lib/nfs/rpc_pipefs is successfully unmounted on |
1012 | + upgrade but the directory still has contents within it. Since this is |
1013 | + /var/lib we shouldn't assume it's ok for delete these; instead, pass |
1014 | + --ignore-fail-on-non-empty to rmdir. LP: #954619. |
1015 | + |
1016 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 08 Apr 2012 22:44:40 -0700 |
1017 | + |
1018 | +nfs-utils (1:1.2.5-3ubuntu2) precise; urgency=low |
1019 | + |
1020 | + * Fix wrong path to rpcinfo in the init script, which breaks use of nfs |
1021 | + v3 support in the server. LP: #945651. |
1022 | + |
1023 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 27 Mar 2012 10:44:03 -0700 |
1024 | + |
1025 | +nfs-utils (1:1.2.5-3ubuntu1) precise; urgency=low |
1026 | + |
1027 | + * Merge from Debian testing, remaining changes: |
1028 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1029 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1030 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1031 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1032 | + init handling. |
1033 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1034 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1035 | + in the postinst, this is redundant anyway and the nfs-common init script |
1036 | + is gone now. |
1037 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1038 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1039 | + - Allow issuing options to rpc.nfsd |
1040 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1041 | + the configuration option. |
1042 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1043 | + in /var/lib. |
1044 | + |
1045 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 04 Jan 2012 09:20:27 -0800 |
1046 | + |
1047 | nfs-utils (1:1.2.5-3) unstable; urgency=low |
1048 | |
1049 | [ Roger Leigh ] |
1050 | @@ -509,6 +1313,33 @@ nfs-utils (1:1.2.5-3) unstable; urgency=low |
1051 | |
1052 | -- Luk Claes <luk@debian.org> Fri, 09 Dec 2011 11:55:31 +0100 |
1053 | |
1054 | +nfs-utils (1:1.2.5-2ubuntu1) precise; urgency=low |
1055 | + |
1056 | + * Merge from Debian testing, remaining changes: |
1057 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1058 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1059 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1060 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1061 | + init handling. |
1062 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1063 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1064 | + in the postinst, this is redundant anyway and the nfs-common init script |
1065 | + is gone now. |
1066 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1067 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1068 | + - Allow issuing options to rpc.nfsd |
1069 | + - debian/nfs-common.defaults: always start idmapd automatically; drop |
1070 | + the configuration option. |
1071 | + - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1072 | + in /var/lib. |
1073 | + * Dropped changes, superseded in Debian/upstream: |
1074 | + - debian/patches/multiarch-kerberos-paths: Search for kerberos libs |
1075 | + in multiarch locations. |
1076 | + - ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel |
1077 | + version numbers. |
1078 | + |
1079 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 30 Oct 2011 00:12:50 +0000 |
1080 | + |
1081 | nfs-utils (1:1.2.5-2) unstable; urgency=low |
1082 | |
1083 | * debian/patches/18-dont-use-PAGE_SIZE.patch |
1084 | @@ -551,6 +1382,57 @@ nfs-utils (1:1.2.4-2) UNRELEASED; urgency=low |
1085 | |
1086 | -- Luk Claes <luk@debian.org> Sat, 06 Aug 2011 07:38:48 +0200 |
1087 | |
1088 | +nfs-utils (1:1.2.4-1ubuntu4) precise; urgency=low |
1089 | + |
1090 | + * debian/nfs-common.postinst: handle the case when /var/lib/nfs/rpc_pipefs |
1091 | + is not already mounted on upgrade - dpkg will already remove the |
1092 | + directory for us on upgrade, so don't fail when it's missing. |
1093 | + LP: #882799. |
1094 | + |
1095 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 27 Oct 2011 16:21:22 -0700 |
1096 | + |
1097 | +nfs-utils (1:1.2.4-1ubuntu3) precise; urgency=low |
1098 | + |
1099 | + * debian/nfs-common.defaults, debian/nfs-common.idmapd.upstart: idmapd |
1100 | + should always be started automatically, because we can no longer assume |
1101 | + that a mount of type 'nfs' in /etc/fstab is not nfs4. This also lets |
1102 | + things work by default with nfs4 autofs. LP: #662711. |
1103 | + * Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong |
1104 | + in /var/lib. |
1105 | + * Ignore errors from mount if the filesystem is already mounted. |
1106 | + LP: #811823. |
1107 | + |
1108 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 27 Oct 2011 12:04:58 -0700 |
1109 | + |
1110 | +nfs-utils (1:1.2.4-1ubuntu2) oneiric; urgency=low |
1111 | + |
1112 | + * Allow issuing options to rpc.nfsd |
1113 | + (LP: #567491) |
1114 | + |
1115 | + -- Bryce Harrington <bryce@ubuntu.com> Mon, 08 Aug 2011 16:37:26 -0700 |
1116 | + |
1117 | +nfs-utils (1:1.2.4-1ubuntu1) oneiric; urgency=low |
1118 | + |
1119 | + * Merge from Debian unstable (LP: #728586, LP: #789117), remaining |
1120 | + changes: |
1121 | + - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart, |
1122 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1123 | + debian/rules: drop nfs-common init script in favor of upstart jobs, |
1124 | + and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart |
1125 | + init handling. |
1126 | + - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support. |
1127 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1128 | + in the postinst, this is redundant anyway and the nfs-common init script |
1129 | + is gone now. |
1130 | + - nfs-kernel-server.default: Add comment about how to disable nfs4. |
1131 | + - debian/patches/multiarch-kerberos-paths: Search for kerberos libs |
1132 | + in multiarch locations. |
1133 | + - nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1134 | + - ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel |
1135 | + version numbers. |
1136 | + |
1137 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 23 Jul 2011 17:54:36 +0200 |
1138 | + |
1139 | nfs-utils (1:1.2.4-1) unstable; urgency=low |
1140 | |
1141 | * New upstream version |
1142 | @@ -638,6 +1520,93 @@ nfs-utils (1:1.2.2-5) unstable; urgency=low |
1143 | |
1144 | -- Luk Claes <luk@debian.org> Wed, 16 Mar 2011 23:10:15 +0100 |
1145 | |
1146 | +nfs-utils (1:1.2.2-4ubuntu8) oneiric; urgency=low |
1147 | + |
1148 | + * debian/nfs-common.idmapd.upstart: don't use a script unnecessarily for |
1149 | + our job when we can exec directly - making the job more resilient in |
1150 | + the face of races with /usr being mounted. LP: #811823. |
1151 | + * Drop rpc_pipefs.conf; this has gotten far more complicated than it |
1152 | + should be, just do the mount in-line in each of the gssd and idmapd |
1153 | + jobs. |
1154 | + |
1155 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 17 Jul 2011 02:23:01 -0700 |
1156 | + |
1157 | +nfs-utils (1:1.2.2-4ubuntu7) oneiric; urgency=low |
1158 | + |
1159 | + [ Andy Whitcroft ] |
1160 | + * ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel |
1161 | + version numbers. (LP: #796611) |
1162 | + |
1163 | + -- Evan Dandrea <ev@ubuntu.com> Tue, 14 Jun 2011 17:13:14 +0100 |
1164 | + |
1165 | +nfs-utils (1:1.2.2-4ubuntu6) oneiric; urgency=low |
1166 | + |
1167 | + * nfs-kernel-server.init: Unmount nfsd fs when init script stops |
1168 | + (LP: #251026) |
1169 | + |
1170 | + -- Bryce Harrington <bryce@ubuntu.com> Mon, 06 Jun 2011 19:18:16 -0700 |
1171 | + |
1172 | +nfs-utils (1:1.2.2-4ubuntu5) natty; urgency=low |
1173 | + |
1174 | + * Search kerberos libs in multiarch locations. |
1175 | + |
1176 | + -- Matthias Klose <doko@ubuntu.com> Fri, 01 Apr 2011 12:35:30 +0200 |
1177 | + |
1178 | +nfs-utils (1:1.2.2-4ubuntu4) natty; urgency=low |
1179 | + |
1180 | + * nvs-kernel-server.default: Add comment about how to disable nfs4. |
1181 | + There are corner cases where the server providing nfsv4 as the default |
1182 | + can confuse the client (117957, 680680) or even cause kernel problems |
1183 | + (716811), so it is worthwhile to document how to fallback to nfs3 only. |
1184 | + |
1185 | + -- Bryce Harrington <bryce@ubuntu.com> Mon, 14 Feb 2011 13:20:27 -0800 |
1186 | + |
1187 | +nfs-utils (1:1.2.2-4ubuntu3) natty; urgency=low |
1188 | + |
1189 | + * debian/nfs-common.statd.upstart: pass a new WAITER= variable |
1190 | + to portmap-wait, so that multiple jobs can wait in parallel, fixing |
1191 | + another subtle race condition; and bump the portmap dependency again for |
1192 | + the necessary instance support. |
1193 | + * also fix the grouping in the start condition, so that restarts work |
1194 | + correctly when portmap is restarted. |
1195 | + * debian/nfs-common.rpc_pipefs.upstart: instantiate this job separately for |
1196 | + gssd and idmapd, so that the filesystem gets mounted and unmounted |
1197 | + correctly even if both of gssd and idmapd aren't being run, or if one of |
1198 | + the two tries to start before the filesystem is fully mounted. Though |
1199 | + it may be simpler now to move this logic back into the gssd and idmapd |
1200 | + jobs directly, leave that for a later date. |
1201 | + |
1202 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 18 Jan 2011 17:45:45 -0800 |
1203 | + |
1204 | +nfs-utils (1:1.2.2-4ubuntu2) natty; urgency=low |
1205 | + |
1206 | + * debian/nfs-common.statd.upstart, |
1207 | + debian/nfs-common.statd-mounting.upstart: refactor startup to wait for |
1208 | + local-filesystems. (LP: #525154) |
1209 | + * debian/control: depend on portmap version that sets ON_BOOT=y and |
1210 | + has the portmap-wait job. |
1211 | + * debian/rules: install new statd-mounting upstart job |
1212 | + |
1213 | + -- Clint Byrum <clint@ubuntu.com> Wed, 05 Jan 2011 12:27:32 -0800 |
1214 | + |
1215 | +nfs-utils (1:1.2.2-4ubuntu1) natty; urgency=low |
1216 | + |
1217 | + * Merge from debian unstable (LP: #685860), remaining changes: |
1218 | + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, |
1219 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1220 | + debian/rules: drop nfs-common init script in favor of upstart jobs, and |
1221 | + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1222 | + handling. |
1223 | + - debian/control: |
1224 | + + depend on the upstart-using version of portmap, 6.0-10ubuntu1; and |
1225 | + drop the alternative depends on rpcbind, which hasn't been converted. |
1226 | + + depend on portmap 6.0-10ubuntu1. |
1227 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1228 | + in the postinst, this is redundant anyway and the nfs-common init script |
1229 | + is gone now. |
1230 | + |
1231 | + -- Lorenzo De Liso <blackz@ubuntu.com> Wed, 15 Dec 2010 21:42:55 +0100 |
1232 | + |
1233 | nfs-utils (1:1.2.2-4) unstable; urgency=low |
1234 | |
1235 | * mountd: fix path comparison for v4 crossmnt (Closes: #578317) |
1236 | @@ -664,7 +1633,29 @@ nfs-utils (1:1.2.2-2) unstable; urgency=low |
1237 | * Fix out-of-date-standards-version |
1238 | |
1239 | -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 13 Jul 2010 15:20:17 +1000 |
1240 | - |
1241 | + |
1242 | +nfs-utils (1:1.2.2-1ubuntu1) maverick; urgency=low |
1243 | + |
1244 | + * Merge from Debian unstable, remaining changes: |
1245 | + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, |
1246 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1247 | + debian/rules: drop nfs-common init script in favor of upstart jobs, and |
1248 | + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1249 | + handling. |
1250 | + - debian/control: depend on the upstart-using version of portmap, |
1251 | + 6.0-10ubuntu1; and drop the alternative depends on rpcbind, which |
1252 | + hasn't been converted. |
1253 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1254 | + in the postinst, this is redundant anyway and the nfs-common init script |
1255 | + is gone now. |
1256 | + * Dropped changes, included in Debian: |
1257 | + - debian/control: add ${misc:Depends} line for nfs-common, for the |
1258 | + upstart deps |
1259 | + - debian/nfs-kernel-server.init: updated check for presence of nfsd |
1260 | + support |
1261 | + |
1262 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 04 Jun 2010 09:55:28 +0000 |
1263 | + |
1264 | nfs-utils (1:1.2.2-1) unstable; urgency=low |
1265 | |
1266 | [ Anibal Monsalve Salazar ] |
1267 | @@ -736,6 +1727,51 @@ nfs-utils (1:1.2.0-4.1) unstable; urgency=low |
1268 | |
1269 | -- Ben Hutchings <ben@decadent.org.uk> Wed, 16 Dec 2009 22:14:01 +0000 |
1270 | |
1271 | +nfs-utils (1:1.2.0-4ubuntu4) lucid; urgency=low |
1272 | + |
1273 | + * debian/nfs-common.gssd.upstart: |
1274 | + - fix the OPTIONS= match for the start condition (missing a leading '*') |
1275 | + so that we actually match on nfs4 mounts |
1276 | + - drop the 'script' for a straight exec of rpc.gssd; if /usr is a separate |
1277 | + partition then nfs4 mounts might be attempted in parallel, and upstart |
1278 | + gets mightily confused when this happens. LP: #545673 |
1279 | + |
1280 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 23 Mar 2010 22:26:07 -0700 |
1281 | + |
1282 | +nfs-utils (1:1.2.0-4ubuntu3) lucid; urgency=low |
1283 | + |
1284 | + * debian/nfs-common.*.upstart: start on new 'mounting' signal instead of |
1285 | + obsolete 'mount' signal. |
1286 | + |
1287 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 25 Feb 2010 06:41:46 -0800 |
1288 | + |
1289 | +nfs-utils (1:1.2.0-4ubuntu2) lucid; urgency=low |
1290 | + |
1291 | + * debian/nfs-kernel-server.init: 2.6.32 kernels no longer export the |
1292 | + same symbols. Switch symbol check to nfsd_serv which has been present |
1293 | + since 2005. LP: #493145. |
1294 | + |
1295 | + -- Andy Whitcroft <apw@canonical.com> Mon, 07 Dec 2009 16:56:56 +0000 |
1296 | + |
1297 | +nfs-utils (1:1.2.0-4ubuntu1) lucid; urgency=low |
1298 | + |
1299 | + * Merge from Debian testing, remaining changes: |
1300 | + - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart, |
1301 | + debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm}, |
1302 | + debian/rules: drop nfs-common init script in favor of upstart jobs, and |
1303 | + build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1304 | + handling. |
1305 | + - debian/control: depend on the upstart-using version of portmap, |
1306 | + 6.0-10ubuntu1; and drop the alternative depends on rpcbind, which |
1307 | + hasn't been converted. |
1308 | + - debian/control: add ${misc:Depends} line for nfs-common, for the |
1309 | + upstart deps |
1310 | + - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common" |
1311 | + in the postinst, this is redundant anyway and the nfs-common init script |
1312 | + is gone now. |
1313 | + |
1314 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 04 Dec 2009 18:37:48 -0800 |
1315 | + |
1316 | nfs-utils (1:1.2.0-4) unstable; urgency=low |
1317 | |
1318 | * Removing myself from uploaders. |
1319 | @@ -750,6 +1786,94 @@ nfs-utils (1:1.2.0-3) unstable; urgency=low |
1320 | |
1321 | -- Steinar H. Gunderson <sesse@debian.org> Sun, 09 Aug 2009 12:47:00 +0200 |
1322 | |
1323 | +nfs-utils (1:1.2.0-2ubuntu9) lucid; urgency=low |
1324 | + |
1325 | + * debian/nfs-common.statd.upstart: check for a started portmap in a |
1326 | + non-racy manner. LP: #484209. |
1327 | + |
1328 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 17 Nov 2009 11:27:37 -0600 |
1329 | + |
1330 | +nfs-utils (1:1.2.0-2ubuntu8) karmic; urgency=low |
1331 | + |
1332 | + * debian/control: add missing ${misc:Depends} for nfs-common, else we don't |
1333 | + get the dependency on upstart that we should have. LP: #456281. |
1334 | + |
1335 | + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 20 Oct 2009 13:10:01 +0000 |
1336 | + |
1337 | +nfs-utils (1:1.2.0-2ubuntu7) karmic; urgency=low |
1338 | + |
1339 | + * debian/rules: now that the jobs will exit cleanly on their own when |
1340 | + 'start' is called but the job is a no-op, remove the --error-handler |
1341 | + option to dh_installinit so that we don't accidentally ignore other |
1342 | + kinds of errors that could point to real problems. |
1343 | + |
1344 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 11 Oct 2009 08:51:39 +0000 |
1345 | + |
1346 | +nfs-utils (1:1.2.0-2ubuntu6) karmic; urgency=low |
1347 | + |
1348 | + * Drop the gssd upstart job's dependency on "local-filesystems"; at boot |
1349 | + time this is always implied transitively by the dep on portmap, and using |
1350 | + a combination of 'or' and 'and' operators in the dependency list seems |
1351 | + to confuse upstart quite badly, causing kerberized mounts to hang at boot. |
1352 | + LP: #447654. |
1353 | + |
1354 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 10 Oct 2009 20:12:11 +0000 |
1355 | + |
1356 | +nfs-utils (1:1.2.0-2ubuntu5) karmic; urgency=low |
1357 | + |
1358 | + * Set upstart jobs to also start on mount attempt, in the event that |
1359 | + mountall gets to them before the daemons are done starting. Really-fixes |
1360 | + LP: #431248. |
1361 | + * Call 'stop' in the pre-start scripts for all jobs when we want to prevent |
1362 | + the job from starting; this lets upstart know that it's a clean stop, |
1363 | + and avoids boot-time messages about service start failures |
1364 | + |
1365 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 09 Oct 2009 19:17:34 +0000 |
1366 | + |
1367 | +nfs-utils (1:1.2.0-2ubuntu4) karmic; urgency=low |
1368 | + |
1369 | + * Mounting rpc_pipefs also requires the sunrpc module, so move this |
1370 | + modprobe to the right upstart job. |
1371 | + |
1372 | + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 05 Oct 2009 22:04:28 -0700 |
1373 | + |
1374 | +nfs-utils (1:1.2.0-2ubuntu3) karmic; urgency=low |
1375 | + |
1376 | + * nfs-kernel-server: don't call invoke-rc.d nfs-common in the postinst, |
1377 | + this is redundant anyway and the nfs-common init script is gone now. |
1378 | + LP: #441855. |
1379 | + |
1380 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 03 Oct 2009 23:07:09 -0700 |
1381 | + |
1382 | +nfs-utils (1:1.2.0-2ubuntu2) karmic; urgency=low |
1383 | + |
1384 | + * Configure gssd and idmapd upstart jobs to stop on runlevels 0 and 6; this |
1385 | + is consistent with previous initscript-based behavior, and spares upstart |
1386 | + trying to restart the jobs repeatedly when sendsigs runs. |
1387 | + * When autodetecting gssd, handle the case of 'sec=krb5' being embedded in |
1388 | + the middle of the options list in /etc/fstab. LP: #364861. |
1389 | + * Fix transition idempotency error when stopping old nfs-common init |
1390 | + script, in case the postinst fails to finish afterwards (e.g., failure to |
1391 | + restart the daemons). |
1392 | + * Fix statd upstart job to properly honor NEED_STATD=no and not get stuck |
1393 | + respawning indefinitely. |
1394 | + * Ignore failures to start the daemons on upgrade, since if they aren't |
1395 | + needed we don't *want* them to start. LP: #441055. |
1396 | + * Fix up the rpc_pipefs job, the wrong version of the file slipped into |
1397 | + the previous upload. |
1398 | + |
1399 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 03 Oct 2009 01:52:21 +0000 |
1400 | + |
1401 | +nfs-utils (1:1.2.0-2ubuntu1) karmic; urgency=low |
1402 | + |
1403 | + * Drop nfs-common init script in favor of new upstart jobs. LP: #431248. |
1404 | + * Build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init |
1405 | + handling. |
1406 | + * Depend the upstart-using version of portmap, 6.0-10ubuntu1; and drop the |
1407 | + alternative depends on rpcbind, which hasn't been converted. |
1408 | + |
1409 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 02 Oct 2009 19:23:19 +0000 |
1410 | + |
1411 | nfs-utils (1:1.2.0-2) unstable; urgency=low |
1412 | |
1413 | * Merge from Ubuntu |
1414 | diff --git a/debian/control b/debian/control |
1415 | index b5a7882..1119090 100644 |
1416 | --- a/debian/control |
1417 | +++ b/debian/control |
1418 | @@ -1,7 +1,8 @@ |
1419 | Source: nfs-utils |
1420 | Priority: optional |
1421 | Section: net |
1422 | -Maintainer: Debian kernel team <debian-kernel@lists.debian.org> |
1423 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1424 | +XSBC-Original-Maintainer: Debian kernel team <debian-kernel@lists.debian.org> |
1425 | Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <benh@debian.org>, Steve Langasek <vorlon@debian.org>, Salvatore Bonaccorso <carnil@debian.org> |
1426 | Build-Depends: debhelper-compat (= 13), libwrap0-dev, libevent-dev, libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 1.0.2), libdevmapper-dev, libmount-dev, libsqlite3-dev |
1427 | Standards-Version: 4.6.0 |
1428 | @@ -61,10 +62,9 @@ Architecture: any |
1429 | Multi-Arch: same |
1430 | Pre-Depends: ${misc:Pre-Depends} |
1431 | Depends: ${shlibs:Depends}, ${misc:Depends} |
1432 | -Conflicts: libnfsidmap2, libnfsidmap-regex |
1433 | -Provides: libnfsidmap2, libnfsidmap-regex |
1434 | -Breaks: nfs-common (<< 1:1.2.2-1), libnfsidmap2 (<< 0.25-7~), libnfsidmap-regex |
1435 | -Replaces: nfs-common (<< 1:1.2.2-1), libnfsidmap2 (<< 0.25-7~), libnfsidmap-regex |
1436 | +Conflicts: libnfsidmap2 |
1437 | +Breaks: nfs-common (<< 1:1.2.2-1), libnfsidmap2 (<< 0.25-7~) |
1438 | +Replaces: nfs-common (<< 1:1.2.2-1), libnfsidmap2 (<< 0.25-7~) |
1439 | Description: NFS idmapping library |
1440 | libnfsidmap provides functions to map between NFSv4 names (which are |
1441 | of the form user@domain) and local uid's and gid's. |
1442 | diff --git a/debian/libnfsidmap1.docs b/debian/libnfsidmap1.docs |
1443 | new file mode 100644 |
1444 | index 0000000..747afb7 |
1445 | --- /dev/null |
1446 | +++ b/debian/libnfsidmap1.docs |
1447 | @@ -0,0 +1 @@ |
1448 | +debian/README.Ubuntu |
1449 | diff --git a/debian/libnfsidmap1.install b/debian/libnfsidmap1.install |
1450 | index 2573d9e..a64297a 100644 |
1451 | --- a/debian/libnfsidmap1.install |
1452 | +++ b/debian/libnfsidmap1.install |
1453 | @@ -1,3 +1,5 @@ |
1454 | usr/lib/*/lib*.so.* |
1455 | -usr/lib/*/libnfsidmap/*.so |
1456 | +usr/lib/*/libnfsidmap/nsswitch.so |
1457 | +usr/lib/*/libnfsidmap/static.so |
1458 | +usr/lib/*/libnfsidmap/umich_ldap.so |
1459 | usr/share/man/man5/idmapd.conf.5 |
1460 | diff --git a/debian/nfs-common.docs b/debian/nfs-common.docs |
1461 | index a3a23b3..747afb7 100644 |
1462 | --- a/debian/nfs-common.docs |
1463 | +++ b/debian/nfs-common.docs |
1464 | @@ -1 +1 @@ |
1465 | -debian/README.Debian.nfsv4 |
1466 | +debian/README.Ubuntu |
1467 | diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst |
1468 | index f33d494..9235637 100644 |
1469 | --- a/debian/nfs-common.postinst |
1470 | +++ b/debian/nfs-common.postinst |
1471 | @@ -44,6 +44,10 @@ case "$1" in |
1472 | if [ -f /lib/init/rw/sendsigs.omit.d/statd ]; then |
1473 | mv /lib/init/rw/sendsigs.omit.d/statd /run/sendsigs.omit.d/statd |
1474 | fi |
1475 | + |
1476 | + # always "start" nfs-utils.service, so package upgrades will restart it, |
1477 | + # see LP: #1928259 |
1478 | + systemctl start nfs-utils.service > /dev/null || true |
1479 | ;; |
1480 | esac |
1481 | |
1482 | diff --git a/debian/not-installed b/debian/not-installed |
1483 | new file mode 100644 |
1484 | index 0000000..ffd516b |
1485 | --- /dev/null |
1486 | +++ b/debian/not-installed |
1487 | @@ -0,0 +1,5 @@ |
1488 | +# the regex module comes from src:libnfsidmap-regex |
1489 | +usr/lib/*/libnfsidmap/regex.so |
1490 | +usr/lib/*/libnfsidmap/*.a |
1491 | +usr/lib/*/libnfsidmap/*.la |
1492 | +usr/lib/*/libnfsidmap.la |
1493 | diff --git a/debian/patches/remove-regex-from-docs.patch b/debian/patches/remove-regex-from-docs.patch |
1494 | new file mode 100644 |
1495 | index 0000000..f862102 |
1496 | --- /dev/null |
1497 | +++ b/debian/patches/remove-regex-from-docs.patch |
1498 | @@ -0,0 +1,79 @@ |
1499 | +--- a/support/nfsidmap/idmapd.conf.5 |
1500 | ++++ b/support/nfsidmap/idmapd.conf.5 |
1501 | +@@ -158,49 +158,7 @@ |
1502 | + .nf |
1503 | + |
1504 | + .fi |
1505 | +-If the "regex" translation method is specified, the following |
1506 | +-variables within the [REGEX] section are used to map between NFS4 names and local IDs. |
1507 | +-.TP |
1508 | +-.B User-Regex |
1509 | +-Case-insensitive regular expression that extracts the local user name from an NFSv4 name. Multiple expressions may be concatenated with '|'. The first match will be used. |
1510 | +-There is no default. A basic regular expression for domain DOMAIN.ORG and realm MY.DOMAIN.ORG would be: |
1511 | +-.nf |
1512 | +-^DOMAIN\\([^@]+)@MY.DOMAIN.ORG$ |
1513 | +-.fi |
1514 | +-.TP |
1515 | +-.B Group-Regex |
1516 | +-Case-insensitive regular expression that extracts the local group name from an NFSv4 name. Multiple expressions may be concatenated with '|'. The first match will be used. |
1517 | +-There is no default. A basic regular expression for domain DOMAIN.ORG and realm MY.DOMAIN.ORG would be: |
1518 | +-.nf |
1519 | +-^([^@]+)@DOMAIN.ORG@MY.DOMAIN.ORG$|^DOMAIN\\([^@]+)@MY.DOMAIN.ORG$ |
1520 | +-.fi |
1521 | +-.TP |
1522 | +-.B Prepend-Before-User |
1523 | +-Constant string to put before a local user name when building an NFSv4 name. Usually this is the short domain name followed by '\'. |
1524 | +-(Default: none) |
1525 | +-.TP |
1526 | +-.B Append-After-User |
1527 | +-Constant string to put after a local user name when building an NFSv4 name. Usually this is '@' followed by the default realm. |
1528 | +-(Default: none) |
1529 | +-.TP |
1530 | +-.B Prepend-Before-Group |
1531 | +-Constant string to put before a local group name when building an NFSv4 name. Usually not used. |
1532 | +-(Default: none) |
1533 | +-.TP |
1534 | +-.B Append-After-Group |
1535 | +-Constant string to put before a local group name when building an NFSv4 name. Usually this is '@' followed by the domain name followed by another '@' and the default realm. |
1536 | +-(Default: none) |
1537 | +-.TP |
1538 | +-.B Group-Name-Prefix |
1539 | +-Constant string that is prepended to a local group name when converting it to an NFSv4 name. If an NFSv4 group name has this prefix it is removed when converting it to a local group name. |
1540 | +-With this group names of a central directory can be shortened for an isolated organizational unit if all groups have a common prefix. |
1541 | +-(Default: none) |
1542 | +-.TP |
1543 | +-.B Group-Name-No-Prefix-Regex |
1544 | +-Case-insensitive regular expression to exclude groups from adding and removing the prefix set by |
1545 | +-.BR Group-Name-Prefix . |
1546 | +-The regular expression must match both the remote and local group names. Multiple expressions may be concatenated with '|'. |
1547 | +-(Default: none) |
1548 | ++In Ubuntu, the regex plugin is shipped in the libnfsidmap-regex package. If you want to use this plugin, please install that package and consult the libnfsidmap-regex(5) manpage. |
1549 | + .\" |
1550 | + .\" ------------------------------------------------------------------- |
1551 | + .\" The [UMICH_SCHEMA] section |
1552 | +@@ -370,23 +328,13 @@ |
1553 | + |
1554 | + [Translation] |
1555 | + |
1556 | +-Method = umich_ldap,regex,nsswitch |
1557 | +-GSS-Methods = umich_ldap,regex,static |
1558 | ++Method = umich_ldap,nsswitch |
1559 | ++GSS-Methods = umich_ldap,static |
1560 | + |
1561 | + [Static] |
1562 | + |
1563 | + johndoe@OTHER.DOMAIN.ORG = johnny |
1564 | + |
1565 | +-[Regex] |
1566 | +- |
1567 | +-User-Regex = ^DOMAIN\\([^@]+)@DOMAIN.ORG$ |
1568 | +-Group-Regex = ^([^@]+)@DOMAIN.ORG@DOMAIN.ORG$|^DOMAIN\\([^@]+)@DOMAIN.ORG$ |
1569 | +-Prepend-Before-User = DOMAIN\ |
1570 | +-Append-After-User = @DOMAIN.ORG |
1571 | +-Append-After-Group = @domain.org@domain.org |
1572 | +-Group-Name-Prefix = sales- |
1573 | +-Group-Name-No-Prefix-Regex = -personal-group$ |
1574 | +- |
1575 | + [UMICH_SCHEMA] |
1576 | + |
1577 | + LDAP_server = ldap.domain.org |
1578 | diff --git a/debian/patches/series b/debian/patches/series |
1579 | index cc5eab2..127f3e1 100644 |
1580 | --- a/debian/patches/series |
1581 | +++ b/debian/patches/series |
1582 | @@ -3,3 +3,4 @@ |
1583 | multiarch-kerberos-paths.patch |
1584 | nfs-utils-fix-man-page-syntax-errors.patch |
1585 | tests-skip-test-if-dev-log-is-missing.patch |
1586 | +remove-regex-from-docs.patch |
For the NEWS entry, since the regex plugin is effectively a new feature, maybe it's not as necessary to explain why it was omitted, and instead just give mention that it's being kept an opt-in functionality available when the universe package is installed.
In any case, I'd also suggest a few sentences explaining what the regex plugin is, and why the reader might care to have (or not have) it. This email has some decent explanation text that could be cribbed from:
https:/ /www.spinics. net/lists/ linux-nfs/ msg77160. html
Indeed, one thing I'm a bit confused by is if I *want* the feature, do I just do `apt install libnfsidmap-regex` and then configure it in idmapd.conf? The NEWS file might be a good place to answer that.
Does the libnfsidmap-regex package provide man page info similar to what's being dropped with this merge? If it doesn't, then would it make sense rather than delete it, to instead just mention that a separate package needs installed first?
Do you think it would be worthwhile to mention the nfsconvert.py script in the section of the NEWS file explaining the config changes, so users can start converting? Or does it make more sense to wait until a conversion strategy is decided on?
The drops all LGTM. With such a big version jump it's no surprise that so much can drop, and I didn't dig far into those. Your explanations and rationale all sound sensible, and I verified all the delta items mentioned in the prior merge are addressed here.
The autopkgtests against the PPA pass:
Results from https:/ /autopkgtest. ubuntu. com/results/ autopkgtest- jammy-ahasenack -nfs-utils- merge/? format= plain: 1:2.6.1- 1~exp1ubuntu1~ ppa9'] server- client PASS ✅ 1:2.6.1- 1~exp1ubuntu1~ ppa9'] server- client PASS ✅ 1:2.6.1- 1~exp1ubuntu1~ ppa9'] 1:2.6.1- 1~exp1ubuntu1~ ppa9'] server- client PASS ✅ 1:2.6.1- 1~exp1ubuntu1~ ppa9'] server- client PASS
nfs-utils @ amd64:
16.02.22 01:16:06 Log 🗒️ ✅ Triggers: ['nfs-utils/
local-
nfs-utils @ arm64:
16.02.22 01:08:00 Log 🗒️ ✅ Triggers: ['nfs-utils/
local-
nfs-utils @ armhf:
16.02.22 00:59:41 Log 🗒️ ✅ Triggers: ['nfs-utils/
nfs-utils @ ppc64el:
16.02.22 01:06:25 Log 🗒️ ✅ Triggers: ['nfs-utils/
local-
nfs-utils @ s390x:
16.02.22 01:01:38 Log 🗒️ ✅ Triggers: ['nfs-utils/
local-
I checked that it built fine locally.
Thanks for filing the bugs with the followup work. Can you also file one to add an apport hook for this package?