Source: rpcbind Version: 1.2.6-7 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
Please find a patch attached to install rpcbind into /usr, for the currently ongoing UsrMerge effort [1]. It has been build-tested and checked by dumat. Please review it and upload to unstable during the trixie cycle. Note: this should not be backported to bookworm. If you intend to backport, please use dh_movetousr instead. If your package will change for the t64 transition or otherwise rename/split/move its binaries (packages) during trixie, please then upload to experimental and get in touch with the UsrMerge driver, please see the wiki [1]. Chris [1] https://wiki.debian.org/UsrMerge
diff -Nru rpcbind-1.2.6/debian/changelog rpcbind-1.2.6/debian/changelog --- rpcbind-1.2.6/debian/changelog 2023-11-07 00:38:53.000000000 +0100 +++ rpcbind-1.2.6/debian/changelog 2024-01-09 23:23:21.000000000 +0100 @@ -1,3 +1,11 @@ +rpcbind (1.2.6-7.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install rpcbind into /usr/sbin (DEP17 M2). (Closes: #-1) + Update path in init script, systemd unit, et al. + + -- Chris Hofstaedtler <[email protected]> Tue, 09 Jan 2024 23:23:21 +0100 + rpcbind (1.2.6-7) unstable; urgency=medium * Install systemd units only once. Thanks to Helmut Grohne diff -Nru rpcbind-1.2.6/debian/init.d rpcbind-1.2.6/debian/init.d --- rpcbind-1.2.6/debian/init.d 2023-11-07 00:38:53.000000000 +0100 +++ rpcbind-1.2.6/debian/init.d 2024-01-09 23:23:00.000000000 +0100 @@ -16,7 +16,7 @@ # RPC include NFS and NIS. ### END INIT INFO -test -f /sbin/rpcbind || exit 0 +test -f /usr/sbin/rpcbind || exit 0 . /lib/lsb/init-functions @@ -45,15 +45,15 @@ exit 1 fi [ -x /sbin/restorecon ] && /sbin/restorecon $STATEDIR - pid=$( pidofproc /sbin/rpcbind ) + pid=$( pidofproc /usr/sbin/rpcbind ) if [ -n "$pid" ] then log_action_msg "Already running: rpcbind" exit 0 fi log_daemon_msg "Starting RPC port mapper daemon" "rpcbind" - start-stop-daemon --start --quiet --oknodo --exec /sbin/rpcbind -- "$@" - pid=$( pidofproc /sbin/rpcbind ) + start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/rpcbind -- "$@" + pid=$( pidofproc /usr/sbin/rpcbind ) echo -n "$pid" >"$PIDFILE" # /run/sendsigs.omit.d is created by /etc/init.d/mountkernfs.sh ln -sf "$PIDFILE" /run/sendsigs.omit.d/rpcbind @@ -64,7 +64,7 @@ stop () { log_daemon_msg "Stopping RPC port mapper daemon" "rpcbind" - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --oknodo --exec /sbin/rpcbind + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --oknodo --exec /usr/sbin/rpcbind rm -f "$PIDFILE" log_end_msg $? } @@ -90,7 +90,7 @@ start $OPTIONS ;; status) - status_of_proc /sbin/rpcbind rpcbind && exit 0 || exit $? + status_of_proc /usr/sbin/rpcbind rpcbind && exit 0 || exit $? ;; *) log_success_msg "Usage: /etc/init.d/rpcbind {start|stop|force-reload|restart|status}" diff -Nru rpcbind-1.2.6/debian/rpcbind.service rpcbind-1.2.6/debian/rpcbind.service --- rpcbind-1.2.6/debian/rpcbind.service 2023-11-07 00:38:53.000000000 +0100 +++ rpcbind-1.2.6/debian/rpcbind.service 2024-01-09 23:22:28.000000000 +0100 @@ -13,7 +13,7 @@ [Service] Environment="OPTIONS=-w" -ExecStart=/sbin/rpcbind -f $OPTIONS +ExecStart=/usr/sbin/rpcbind -f $OPTIONS EnvironmentFile=-/etc/rpcbind.conf EnvironmentFile=-/etc/default/rpcbind Type=notify diff -Nru rpcbind-1.2.6/debian/rules rpcbind-1.2.6/debian/rules --- rpcbind-1.2.6/debian/rules 2023-11-07 00:38:53.000000000 +0100 +++ rpcbind-1.2.6/debian/rules 2024-01-09 23:22:09.000000000 +0100 @@ -17,7 +17,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- --sbindir=/sbin --enable-warmstarts --enable-libwrap --with-statedir=/run/rpcbind --with-rpcuser=_rpc --enable-debug $(CONFIGURE_EXTRA_FLAGS) + dh_auto_configure -- --enable-warmstarts --enable-libwrap --with-statedir=/run/rpcbind --with-rpcuser=_rpc --enable-debug $(CONFIGURE_EXTRA_FLAGS) execute_after_dh_auto_install: rm -Rf debian/rpcbind/unused diff -Nru rpcbind-1.2.6/debian/tests/check-if-installed rpcbind-1.2.6/debian/tests/check-if-installed --- rpcbind-1.2.6/debian/tests/check-if-installed 2023-11-07 00:38:53.000000000 +0100 +++ rpcbind-1.2.6/debian/tests/check-if-installed 2024-01-09 23:22:22.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/bash -if [ ! -f "/sbin/rpcbind" ]; then +if [ ! -f "/usr/sbin/rpcbind" ]; then >&2 echo "rpcbind is not installed" fi
