backport of nfs-utils 1.2.5-4 [was: Re: Installation error of nfs-common]
On 10/04/2011 05:35 AM, Thorsten Glaser wrote:
> On Sat, 1 Oct 2011, Luk Claes wrote:
>
>> Probably best to backport insserv and have the backported nfs-utils
>> depend on at least the backported insserv.
>
> insserv (>= …) | file-rc
>
> Otherwise you’ll break peoples’ systems.
Thanks for the advice. I've just uploaded insserv 1.14.0-2.2~bpo60+1
was the first stage for uploading a backport of nfs-utils 1.2.5.
I've also backported libgssglue 0.3-4, which is another dependency of
nfs-utils 1.2.5.
The backports of insserv and libgssglue were trivial work.
I want nfs-utils 1.2.5 available because i want something roughly
contemporaneous with the squeeze-backports kernel, and i also want
rpc.svcgssd available in the nfs-common package instead of just
nfs-kernel-server (so that clients can run it to receive delegations
without having nfs-kernel-server installed, see
http://bugs.debian.org/651588)
the backport of nfs-utils itself was slightly more complex than its
immediate dependencies. In addition to dealing with the insserv
backport, i rolled back the transition to /run (since squeeze and
squeeze-backports haven't made that transition) and removed the reliance
on libmount (i didn't think that backporting util-linux just for
libmount was a good idea).
The debdiff for nfs-utils from 1.2.5-4 to 1.2.5-4~bpo60+1 is attached.
The one missing piece is:
printf '$portmap\trpcbind\n' > /etc/insserv.conf.d/rpcbind
and i'm not sure what to do about that. Backporting rpcbind 0.2.0-7
seems ungainly and excessive, since much of that is about the /run
transition, which i don't think we want in squeeze-backports.
it'd be kind of nice to just backport rpcbind 0.2.0-6 and have nfs-utils
1.2.5 depend on that, but that version of rpcbind is no longer in
testing; i don't think that would be a legitimate backport?
Anyone have any suggestions for the right approach here? I'm tempted to
upload what i've got (it works for me, as i've already created
/etc/insserv.conf.d/rpcbind, and it should also work for people with
other init schemes like file-rc), but that seems a bit ugly with rough
edges.
I'd appreciate feedback!
Regards,
--dkg
diff -Nru nfs-utils-1.2.5/debian/changelog nfs-utils-1.2.5/debian/changelog
--- nfs-utils-1.2.5/debian/changelog 2012-01-22 09:47:19.000000000 -0500
+++ nfs-utils-1.2.5/debian/changelog 2012-02-22 16:49:10.000000000 -0500
@@ -1,3 +1,14 @@
+nfs-utils (1:1.2.5-4~bpo60+1) squeeze-backports; urgency=low
+
+ * Rebuild for squeeze-backports.
+ * add versioned dependency on insserv to avoid #564501
+ * removed dependency on libmount-dev (and removed it from
+ debian/rules) since backporting util-linux seems unreasonable)
+ * reverted /run transition, since squeeze has not made that
+ transition; reduced versioned dependency of initscripts accordingly
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Wed, 22 Feb 2012 15:22:00 -0500
+
nfs-utils (1:1.2.5-4) unstable; urgency=low
* Add libmount-dev to Build-Depends and explicitly enable it.
diff -Nru nfs-utils-1.2.5/debian/control nfs-utils-1.2.5/debian/control
--- nfs-utils-1.2.5/debian/control 2012-01-22 09:37:13.000000000 -0500
+++ nfs-utils-1.2.5/debian/control 2012-02-22 16:47:59.000000000 -0500
@@ -2,8 +2,8 @@
Priority: standard
Section: net
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
-Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Luk Claes <luk@debian.org>
-Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libgssglue-dev (>= 0.3), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, dh-autoreconf, libmount-dev
+Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Luk Claes <luk@debian.org>, Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libgssglue-dev (>= 0.3), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, dh-autoreconf
Standards-Version: 3.9.0
Homepage: http://nfs.sourceforge.net/
Vcs-Git: git://git.debian.org/kernel/nfs-utils.git
@@ -32,7 +32,7 @@
Package: nfs-common
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.86.ds1-38.1), insserv (>= 1.14.0-2.1) | file-rc
Recommends: python
Provides: nfs-client
Conflicts: nfs-client
diff -Nru nfs-utils-1.2.5/debian/nfs-common.init nfs-utils-1.2.5/debian/nfs-common.init
--- nfs-utils-1.2.5/debian/nfs-common.init 2011-12-09 05:26:34.000000000 -0500
+++ nfs-utils-1.2.5/debian/nfs-common.init 2012-02-22 16:47:27.000000000 -0500
@@ -156,10 +156,9 @@
log_end_msg $RET
exit $RET
else
- if [ -d /run/sendsigs.omit.d ]; then
- rm -f /run/sendsigs.omit.d/statd
- ln -s /var/run/rpc.statd.pid /run/sendsigs.omit.d/statd
- fi
+ mkdir -p /lib/init/rw/sendsigs.omit.d
+ rm -f /lib/init/rw/sendsigs.omit.d/statd
+ ln -s /var/run/rpc.statd.pid /lib/init/rw/sendsigs.omit.d/statd
fi
fi
diff -Nru nfs-utils-1.2.5/debian/nfs-common.postinst nfs-utils-1.2.5/debian/nfs-common.postinst
--- nfs-utils-1.2.5/debian/nfs-common.postinst 2012-01-22 09:46:21.000000000 -0500
+++ nfs-utils-1.2.5/debian/nfs-common.postinst 2012-02-22 16:47:27.000000000 -0500
@@ -37,11 +37,6 @@
dpkg-statoverride --remove /sbin/mount.nfs
fi
fi
-
- # Migrate /lib/init/rw/sendsigs.omit.statd to /run.
- if [ -f /lib/init/rw/sendsigs.omit.d/statd ]; then
- mv /lib/init/rw/sendsigs.omit.d/statd /run/sendsigs.omit.d/statd
- fi
;;
esac
diff -Nru nfs-utils-1.2.5/debian/rules nfs-utils-1.2.5/debian/rules
--- nfs-utils-1.2.5/debian/rules 2012-01-22 09:20:36.000000000 -0500
+++ nfs-utils-1.2.5/debian/rules 2012-02-22 15:44:45.000000000 -0500
@@ -26,7 +26,6 @@
--mandir='$${prefix}/share/man' \
--enable-nfsv41 \
--enable-ipv6 \
- --enable-libmount-mount \
--with-tcp-wrappers
$(MAKE) $(MAKEFLAGS)
touch build-stamp
Reply to: