Source: ifupdown
Version: 0.8.41
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi Santiago,
ifupdown still is part of the debootstrap package set. I know you want
to change this, but since it still is, it should be converted for the
/usr-move (DEP17) sooner rather than later. I'm attaching a patch and
note that it wasn't entirely trivial. I expect that dumat will not moan
about it in any way, but giving it some project exposure in experimental
for volunteers to test might not be the worst of ideas. As with similar
patches, this should not be uploaded to bookworm-backports, so you may
want to use dh_movetousr instead.
Helmut
diff --minimal -Nru ifupdown-0.8.41/Makefile ifupdown-0.8.41+nmu1/Makefile
--- ifupdown-0.8.41/Makefile 2021-09-14 15:27:00.000000000 +0200
+++ ifupdown-0.8.41+nmu1/Makefile 2024-01-03 16:50:43.000000000 +0100
@@ -22,13 +22,13 @@
.SECONDARY: link.c ipx.c can.c meta.c inet6.c inet.c
install :
- install -m 0755 -d ${BASEDIR}/sbin
- install -m 0755 ifup ${BASEDIR}/sbin
- ln -s /sbin/ifup ${BASEDIR}/sbin/ifdown
- ln -s /sbin/ifup ${BASEDIR}/sbin/ifquery
- install -D -m 0755 settle-dad.sh $(BASEDIR)/lib/ifupdown/settle-dad.sh
- install -D -m 0755 wait-for-ll6.sh
$(BASEDIR)/lib/ifupdown/wait-for-ll6.sh
- install -D -m 0755 wait-online.sh $(BASEDIR)/lib/ifupdown/wait-online.sh
+ install -m 0755 -d ${BASEDIR}/usr/sbin
+ install -m 0755 ifup ${BASEDIR}/usr/sbin
+ ln -s /sbin/ifup ${BASEDIR}/usr/sbin/ifdown
+ ln -s /sbin/ifup ${BASEDIR}/usr/sbin/ifquery
+ install -D -m 0755 settle-dad.sh
$(BASEDIR)/usr/lib/ifupdown/settle-dad.sh
+ install -D -m 0755 wait-for-ll6.sh
$(BASEDIR)/usr/lib/ifupdown/wait-for-ll6.sh
+ install -D -m 0755 wait-online.sh
$(BASEDIR)/usr/lib/ifupdown/wait-online.sh
clean :
rm -f *.o $(patsubst %.defn,%.c,$(DEFNFILES)) *~
diff --minimal -Nru ifupdown-0.8.41/debian/changelog
ifupdown-0.8.41+nmu1/debian/changelog
--- ifupdown-0.8.41/debian/changelog 2023-01-24 14:07:32.000000000 +0100
+++ ifupdown-0.8.41+nmu1/debian/changelog 2024-01-03 16:50:45.000000000
+0100
@@ -1,3 +1,10 @@
+ifupdown (0.8.41+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 03 Jan 2024 16:50:45 +0100
+
ifupdown (0.8.41) unstable; urgency=high
* networking.service: Improve how to handle hotplug devices. Thanks to kibi,
diff --minimal -Nru ifupdown-0.8.41/debian/ifup@.service
ifupdown-0.8.41+nmu1/debian/ifup@.service
--- ifupdown-0.8.41/debian/ifup@.service 2021-09-14 15:27:00.000000000
+0200
+++ ifupdown-0.8.41+nmu1/debian/ifup@.service 2024-01-03 16:45:35.000000000
+0100
@@ -12,6 +12,6 @@
# avoid stopping on shutdown via stopping system-ifup.slice
Slice=system.slice
ExecStart=/bin/sh -ec 'ifup --allow=hotplug %I; ifquery --state %I'
-ExecStop=/sbin/ifdown %I
+ExecStop=/usr/sbin/ifdown %I
RemainAfterExit=true
TimeoutStartSec=5min
diff --minimal -Nru ifupdown-0.8.41/debian/ifupdown-hotplug
ifupdown-0.8.41+nmu1/debian/ifupdown-hotplug
--- ifupdown-0.8.41/debian/ifupdown-hotplug 2023-01-23 22:14:41.000000000
+0100
+++ ifupdown-0.8.41+nmu1/debian/ifupdown-hotplug 2024-01-03
16:45:58.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
-# run /sbin/{ifup,ifdown} with the --allow=hotplug option.
+# run /usr/sbin/{ifup,ifdown} with the --allow=hotplug option.
#
PATH='/sbin:/bin:/usr/sbin:/usr/bin'
diff --minimal -Nru ifupdown-0.8.41/debian/ifupdown-wait-online.service
ifupdown-0.8.41+nmu1/debian/ifupdown-wait-online.service
--- ifupdown-0.8.41/debian/ifupdown-wait-online.service 2021-09-14
15:27:00.000000000 +0200
+++ ifupdown-0.8.41+nmu1/debian/ifupdown-wait-online.service 2024-01-03
16:47:22.000000000 +0100
@@ -2,11 +2,11 @@
Description=Wait for network to be configured by ifupdown
DefaultDependencies=no
Before=network-online.target
-ConditionFileIsExecutable=/sbin/ifup
+ConditionFileIsExecutable=/usr/sbin/ifup
[Service]
Type=oneshot
-ExecStart=/lib/ifupdown/wait-online.sh
+ExecStart=/usr/lib/ifupdown/wait-online.sh
RemainAfterExit=yes
[Install]
diff --minimal -Nru ifupdown-0.8.41/debian/ifupdown.lintian-overrides
ifupdown-0.8.41+nmu1/debian/ifupdown.lintian-overrides
--- ifupdown-0.8.41/debian/ifupdown.lintian-overrides 2021-09-14
15:27:00.000000000 +0200
+++ ifupdown-0.8.41+nmu1/debian/ifupdown.lintian-overrides 2024-01-03
16:47:46.000000000 +0100
@@ -1,3 +1,3 @@
ifupdown: init.d-script-possible-missing-stop etc/init.d/networking 1
-ifupdown: systemd-service-file-refers-to-unusual-wantedby-target
lib/systemd/system/networking.service network-online.target
-ifupdown: systemd-service-file-refers-to-unusual-wantedby-target
lib/systemd/system/ifupdown-wait-online.service network-online.target
+ifupdown: systemd-service-file-refers-to-unusual-wantedby-target
usr/lib/systemd/system/networking.service network-online.target
+ifupdown: systemd-service-file-refers-to-unusual-wantedby-target
usr/lib/systemd/system/ifupdown-wait-online.service network-online.target
diff --minimal -Nru ifupdown-0.8.41/debian/install
ifupdown-0.8.41+nmu1/debian/install
--- ifupdown-0.8.41/debian/install 2022-12-09 21:37:03.000000000 +0100
+++ ifupdown-0.8.41+nmu1/debian/install 2024-01-03 16:48:01.000000000 +0100
@@ -1,4 +1,4 @@
contrib/* usr/share/doc/ifupdown/contrib
-debian/ifupdown-hotplug lib/udev
+debian/ifupdown-hotplug usr/lib/udev
debian/if-up.d/ etc/network/
debian/if-down.d/ etc/network/
diff --minimal -Nru ifupdown-0.8.41/debian/networking.service
ifupdown-0.8.41+nmu1/debian/networking.service
--- ifupdown-0.8.41/debian/networking.service 2023-01-24 10:23:04.000000000
+0100
+++ ifupdown-0.8.41+nmu1/debian/networking.service 2024-01-03
16:48:51.000000000 +0100
@@ -14,9 +14,9 @@
[Service]
Type=oneshot
EnvironmentFile=-/etc/default/networking
-ExecStart=/sbin/ifup -a --read-environment
-ExecStart=-/bin/sh -c 'if [ -f /run/network/restart-hotplug ]; then /sbin/ifup
-a --read-environment --allow=hotplug; fi'
-ExecStop=/sbin/ifdown -a --read-environment --exclude=lo
+ExecStart=/usr/sbin/ifup -a --read-environment
+ExecStart=-/bin/sh -c 'if [ -f /run/network/restart-hotplug ]; then
/usr/sbin/ifup -a --read-environment --allow=hotplug; fi'
+ExecStop=/usr/sbin/ifdown -a --read-environment --exclude=lo
ExecStopPost=/usr/bin/touch /run/network/restart-hotplug
RemainAfterExit=true
TimeoutStartSec=5min
