Since <https://release.debian.org/proposed-updates/stable.html> posed
some reservations about the suitability of changes since 9.4.1-22,
here's the debdiff compared to that.
It should also be noted that src:dhcpcd5 has been replaced by
src:dhcpcd in testing/unstable, which ships a newer upstream release,
thus the version of this bookworm update is not higher.
Martin-Éric
diff -Nru dhcpcd5-9.4.1/debian/changelog dhcpcd5-9.4.1/debian/changelog
--- dhcpcd5-9.4.1/debian/changelog 2023-05-24 15:03:22.000000000 +0300
+++ dhcpcd5-9.4.1/debian/changelog 2023-07-13 07:56:52.000000000 +0300
@@ -1,3 +1,31 @@
+dhcpcd5 (9.4.1-24+deb12u1) bookworm; urgency=medium
+
+ * Backported Wheezy upgrade mitigation from unstable (Closes: #1037190).
+ + Include /usr/share/dpkg/pkg-info.mk needed for target version mingling.
+ + Add epoch to bin:dhcpcd via override_dh_gencontrol.
+ Wheezy had (1:3.2.3-11+deb7u1) so reintroduce the epoch for one target.
+ + Add dhcpcd.preinst by Andreas Beckmann to clean up upgrade leftovers.
+
+ -- Martin-Éric Racine <martin-eric.rac...@iki.fi> Thu, 13 Jul 2023 07:56:52
+0300
+
+dhcpcd5 (9.4.1-24) unstable; urgency=medium
+
+ * Upload to unstable.
+
+ -- Martin-Éric Racine <martin-eric.rac...@iki.fi> Mon, 29 May 2023 15:45:31
+0800
+
+dhcpcd5 (9.4.1-23) experimental; urgency=medium
+
+ [ Martin-Éric Racine ]
+ * Migrate both VCS addresses to 5-less ones.
+
+ [ Shengjing Zhu ]
+ * Drop Conflicts/Replaces dhcp-client (Closes: #1036085).
+ * Drop deprecated ntpd integration (Closes: #1036092).
+ No longer working since ntpd was superseded by ntpsec.
+
+ -- Martin-Éric Racine <martin-eric.rac...@iki.fi> Sun, 28 May 2023 06:02:59
+0300
+
dhcpcd5 (9.4.1-22) unstable; urgency=medium
[ Martin-Éric Racine ]
diff -Nru dhcpcd5-9.4.1/debian/control dhcpcd5-9.4.1/debian/control
--- dhcpcd5-9.4.1/debian/control 2023-05-24 15:03:22.000000000 +0300
+++ dhcpcd5-9.4.1/debian/control 2023-05-28 05:57:38.000000000 +0300
@@ -8,15 +8,13 @@
pkg-config
Rules-Requires-Root: no
Standards-Version: 4.6.2
-Vcs-Browser: https://salsa.debian.org/debian/dhcpcd5
-Vcs-Git: https://salsa.debian.org/debian/dhcpcd5.git
+Vcs-Browser: https://salsa.debian.org/debian/dhcpcd
+Vcs-Git: https://salsa.debian.org/debian/dhcpcd.git
Package: dhcpcd-base
Architecture: any
-Conflicts: dhcp-client
Provides: dhcp-client
-Replaces: dhcp-client,
- dhcpcd5 (<< 9.4.1-2)
+Replaces: dhcpcd5 (<< 9.4.1-2)
Breaks: dhcpcd5 (<< 9.4.1-2)
Depends: adduser,
${misc:Depends},
diff -Nru dhcpcd5-9.4.1/debian/copyright dhcpcd5-9.4.1/debian/copyright
--- dhcpcd5-9.4.1/debian/copyright 2023-05-24 15:03:22.000000000 +0300
+++ dhcpcd5-9.4.1/debian/copyright 2023-07-09 22:09:15.000000000 +0300
@@ -4,7 +4,7 @@
Upstream-Contact: Roy Marples <r...@marples.name>
Files: *
-Copyright: 2006-2018 Roy Marples <r...@marples.name>
+Copyright: 2006-2023 Roy Marples <r...@marples.name>
1999, 2016 The NetBSD Foundation, Inc.
2005 Colin Percival
2005 The DragonFly Project. All rights reserved.
@@ -68,6 +68,7 @@
2015 Daniel Echeverry <epsilo...@gmail.com>
2018 Scott Leggett <sc...@sl.id.au>
2022-2023 Martin-Éric Racine <martin-eric.rac...@iki.fi>
+ 2023 Andreas Beckmann <a...@debian.org>
License: BSD-2
Files: debian/hooks/*
diff -Nru dhcpcd5-9.4.1/debian/dhcpcd.preinst
dhcpcd5-9.4.1/debian/dhcpcd.preinst
--- dhcpcd5-9.4.1/debian/dhcpcd.preinst 1970-01-01 02:00:00.000000000 +0200
+++ dhcpcd5-9.4.1/debian/dhcpcd.preinst 2023-07-09 22:07:22.000000000 +0300
@@ -0,0 +1,14 @@
+#!/bin/sh
+# As per Debian bug #1037190.
+# Copyright 2023 Andreas Beckmann <a...@debian.org>
+set -e
+if dpkg --compare-versions "$2" lt-nl "1:9.4.1-24+deb12u1~" ; then
+ # Cleanup leftovers from dhcpcd 1:3.* in Wheezy.
+ # Can be removed after Trixie is released.
+ update-alternatives --remove dhcpcd /sbin/dhcpcd3
+ if [ -d /etc/dhcpc ]; then
+ test ! -h /etc/dhcpc/resolv.conf || rm -fv /etc/dhcpc/resolv.conf
+ rmdir --ignore-fail-on-non-empty /etc/dhcpc
+ fi
+fi
+#DEBHELPER#
diff -Nru dhcpcd5-9.4.1/debian/hooks/66-ntp.conf
dhcpcd5-9.4.1/debian/hooks/66-ntp.conf
--- dhcpcd5-9.4.1/debian/hooks/66-ntp.conf 2023-05-24 15:03:22.000000000
+0300
+++ dhcpcd5-9.4.1/debian/hooks/66-ntp.conf 1970-01-01 02:00:00.000000000
+0200
@@ -1,34 +0,0 @@
-# vi: ft=sh
-
-SERVERFILE_IPV4="/run/ntp.conf.dhcp"
-SERVERFILE_IPV6="$SERVERFILE_IPV4"
-
-add_servers() {
- # exit early if there's nothing to do
- if [ "$new_ntp_servers" = "$old_ntp_servers" ]; then
- return
- fi
-
- insert_servers iburst
- reload_config
-}
-
-remove_servers() {
- SERVERFILE=$SERVERFILE_IPV4
-
- # exit early if there's nothing to do
- if [ ! -f $SERVERFILE ]; then
- return
- fi
-
- withdraw_servers
- reload_config
-}
-
-reload_config() {
- invoke-rc.d ntp try-restart || :
-}
-
-if [ -e /etc/ntp.conf ]; then
- handle_reason
-fi
diff -Nru dhcpcd5-9.4.1/debian/rules dhcpcd5-9.4.1/debian/rules
--- dhcpcd5-9.4.1/debian/rules 2023-05-24 15:03:22.000000000 +0300
+++ dhcpcd5-9.4.1/debian/rules 2023-07-09 22:14:37.000000000 +0300
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -12,8 +13,12 @@
--libexecdir=/usr/lib/dhcpcd \
--rundir=/run/dhcpcd
-# avoid starting the unconfigured service as it may break connectivity
+# Wheezy had (1:3.2.3-11+deb7u1) so reintroduce the epoch for one target.
+override_dh_gencontrol:
+ dh_gencontrol --package=dhcpcd -- -v1:$(DEB_VERSION_UPSTREAM_REVISION)
+ dh_gencontrol --remaining-packages
+# Avoid starting the unconfigured service as it may break connectivity.
override_dh_installinit:
dh_installinit --name=dhcpcd --no-start
diff -Nru dhcpcd5-9.4.1/debian/tests/control dhcpcd5-9.4.1/debian/tests/control
--- dhcpcd5-9.4.1/debian/tests/control 2023-05-24 15:03:22.000000000 +0300
+++ dhcpcd5-9.4.1/debian/tests/control 2023-05-29 10:45:31.000000000 +0300
@@ -13,13 +13,13 @@
@
Restrictions: isolation-machine, needs-root, breaks-testbed
-Tests: ntpd-ntp-servers-from-dhcp
-Depends: dnsmasq,
- ethtool,
- iproute2,
- ntp,
- @
-Restrictions: isolation-machine, needs-root, breaks-testbed
+# Tests: ntpd-ntp-servers-from-dhcp
+# Depends: dnsmasq,
+# ethtool,
+# iproute2,
+# ntp,
+# @
+# Restrictions: isolation-machine, needs-root, breaks-testbed
Tests: openntpd-ntp-servers-from-dhcp
Depends: dnsmasq,
