Attached is the patch with which I'm going to be doing an NMU in a moment. Anthony looked at it and said on IRC that it looked OK. Apart from fixing the does-not-use-invoke-rc.d bug, the patch also does some other, minor changes.
-- Though spring is here, to me it is still September
diff -u netkit-base-0.10/inetd/inetd.8 netkit-base-0.10/inetd/inetd.8 --- netkit-base-0.10/inetd/inetd.8 +++ netkit-base-0.10/inetd/inetd.8 @@ -130,7 +130,6 @@ can simply be a single numeric argument or a range of versions. A range is bounded by the low version to the high version - .Dq rusers/1-3 . - .Pp The .Em socket-type @@ -157,7 +156,6 @@ or .Dq rpc/udp service type. - .Pp The .Em wait/nowait diff -u netkit-base-0.10/debian/preinst netkit-base-0.10/debian/preinst --- netkit-base-0.10/debian/preinst +++ netkit-base-0.10/debian/preinst @@ -19,7 +19,7 @@ echo -n "Killing extraneous inetd processes:" for pid in $pids; do echo -n " $pid" - kill -9 $pid >/dev/null 2>&1 || echo -n "(failed)" + kill -s KILL $pid >/dev/null 2>&1 || echo -n "(failed)" done echo "." fi diff -u netkit-base-0.10/debian/postinst netkit-base-0.10/debian/postinst --- netkit-base-0.10/debian/postinst +++ netkit-base-0.10/debian/postinst @@ -36,10 +36,17 @@ update-rc.d inetd defaults 20 >/dev/null 2>&1 if [ "$2" = "" ]; then - /etc/init.d/inetd start >&2 + action=start else - /etc/init.d/inetd restart >&2 + action=restart fi + + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d inetd $action >&2 + else + /etc/init.d/inetd $action >&2 + fi + fi ##DEBHELPER## diff -u netkit-base-0.10/debian/netkit-ping.files netkit-base-0.10/debian/netkit-ping.files --- netkit-base-0.10/debian/netkit-ping.files +++ netkit-base-0.10/debian/netkit-ping.files @@ -2,0 +3,2 @@ +usr/share/lintian/overrides/netkit-ping +usr/share/linda/overrides/netkit-ping diff -u netkit-base-0.10/debian/rules netkit-base-0.10/debian/rules --- netkit-base-0.10/debian/rules +++ netkit-base-0.10/debian/rules @@ -52,6 +52,12 @@ rm debian/tmp/usr/share/man/man1/rpcgen.1 install -o root -g root -m 644 debian/inetd.conf.5 debian/tmp/usr/share/man/man5/inetd.conf.5 install -o root -g root -m 755 debian/inetd.init.d debian/tmp/etc/init.d/inetd + + install -m 0644 debian/lintian-overrides \ + debian/tmp/usr/share/lintian/overrides/netkit-ping + install -m 0644 debian/linda-overrides \ + debian/tmp/usr/share/linda/overrides/netkit-ping + dh_movefiles rmdir --ignore-fail-on-non-empty `find debian/tmp/ -type d` @@ -59,8 +65,6 @@ # Pass -i to all debhelper commands in this target to reduce clutter. binary-indep: DH_OPTIONS=-i binary-indep: build install - # Need this version of debhelper for DH_OPTIONS to work. - dh_testversion 1.1.17 dh_testdir dh_testroot # dh_installdebconf @@ -89,8 +93,6 @@ # Pass -a to all debhelper commands in this target to reduce clutter. binary-arch: DH_OPTIONS=-a binary-arch: build install - # Need this version of debhelper for DH_OPTIONS to work. - dh_testversion 1.1.17 dh_testdir dh_testroot dh_installdebconf diff -u netkit-base-0.10/debian/dirs netkit-base-0.10/debian/dirs --- netkit-base-0.10/debian/dirs +++ netkit-base-0.10/debian/dirs @@ -7,0 +8,2 @@ +usr/share/lintian/overrides +usr/share/linda/overrides diff -u netkit-base-0.10/debian/copyright netkit-base-0.10/debian/copyright --- netkit-base-0.10/debian/copyright +++ netkit-base-0.10/debian/copyright @@ -3,7 +3,7 @@ It was downloaded from ftp://ftp.uk.linux.org/pub/linux/Networking/base/ -Upstream Author(s): David A. Holland +Upstream Author: David A. Holland Copyright: diff -u netkit-base-0.10/debian/changelog netkit-base-0.10/debian/changelog --- netkit-base-0.10/debian/changelog +++ netkit-base-0.10/debian/changelog @@ -1,3 +1,25 @@ +netkit-base (0.10-10.3) unstable; urgency=low + + * Non-maintainer upload. + (With prior review on IRC by maintainer of changes.) + * debian/postinst: Use invoke-rc.d if available. Closes: #262627 + (my change is a bit different in details from the patch by + Junichi Uekawa). + * debian/control: Bumped Standards-Version to 3.6.2. No changes needed. + * debian/copyright: Changed "Upstream Author(s):" to "Upstream Author:", + which is both correct and silences a lintian warning. + * debian/dirs, debian/rules, debian/netkit-ping.files, + debian/lintian-overrides, debian/linda-overrides: Added overrides + for lintian and linda so that they don't complain about ping being setuid. + * debian/inet.conf.5, inetd/inetd.8: Removed empty lines that causes + useless paragraph breaks in the output. + * debian/preinst: Use "kill -s KILL" instead of "kill -9", because Posix + says so. + * debian/rules: Removed use of now-obsoleted dh_testversion. Build-Depends + replaces it (and was being used already). + + -- Lars Wirzenius <[EMAIL PROTECTED]> Mon, 6 Feb 2006 21:10:00 +0200 + netkit-base (0.10-10.2) unstable; urgency=low * Non-maintainer upload. diff -u netkit-base-0.10/debian/control netkit-base-0.10/debian/control --- netkit-base-0.10/debian/control +++ netkit-base-0.10/debian/control @@ -2,7 +2,7 @@ Section: net Priority: standard Maintainer: Anthony Towns <[EMAIL PROTECTED]> -Standards-Version: 3.5.4 +Standards-Version: 3.6.2 Build-Depends: debhelper (>= 4.1.16) Package: netkit-inetd only in patch2: unchanged: --- netkit-base-0.10.orig/debian/inetd.conf.5 +++ netkit-base-0.10/debian/inetd.conf.5 @@ -98,7 +98,6 @@ can simply be a single numeric argument or a range of versions. A range is bounded by the low version to the high version - .Dq rusers/1-3 . - .Pp The .Em socket-type @@ -125,7 +124,6 @@ or .Dq rpc/udp service type. - .Pp The .Em wait/nowait only in patch2: unchanged: --- netkit-base-0.10.orig/debian/lintian-overrides +++ netkit-base-0.10/debian/lintian-overrides @@ -0,0 +1 @@ +netkit-ping binary: setuid-binary only in patch2: unchanged: --- netkit-base-0.10.orig/debian/linda-overrides +++ netkit-base-0.10/debian/linda-overrides @@ -0,0 +1,3 @@ +Tag: incorrect-file-perms +Data: /bin/ping +
