Bug#1037076: unblock: dhcpcd5/9.4.1-24
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: dhcpcd5@packages.debian.org
Control: affects -1 + src:dhcpcd5
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please unblock package dhcpcd5
[ Reason ]
Removed unnecessary Conflicts/Replaces.
Removed no longer working Debian addition and corresponding autopkgtest section.
Migrated both Debian VCS in debian/control to current one.
[ Impact ]
If the unblock is not approved, the package will unnecessarily conflict with others providing dhcp-client and ship no longer working NTP daemon support.
[ Tests ]
None required.
1) Changes to debian/control.
2) Removal of Debian addition and corresponding autopkgtest section.
[ Risks ]
Changes to trivial Debian additions. Unlikely risk.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
My sponsor commented out parts of autopkgtest without a proper log entry. Otherwise, every change is documented in changelog.
unblock dhcpcd5/9.4.1-24
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEyJACx3qL7GpObXOQrh+Cd8S017YFAmR7RjwACgkQrh+Cd8S0
17betBAAuRI+GZsSr1K0IdOdb+wFbwx71vDV6aOuo172qh7ysszg6R8kENbemn9W
qmzrAJhKdTXFcTgJHYb0JNqEloPvTnkF6dpG9+2YtAOygysJhQZljm8CJ7SVyrJ6
jWXgChDPaa30OYiLDegiER+15T7iIZ6rWnsH83Pla/rnqgq+EEft3HcJqwe2+IYV
oecVL//givLqa6YHCANFmThdw2tgxIl2yBE+TGE52tf610lzeQxcyRVVteM+/2LN
A67dODS5RE8H7dc8VHCLUtWgPh2o8bt2VFQtGNGfKg7NxrQRKjLnR2Y8y4+dmxJL
s1GHFknbBXCWdrjxgde7s14V35BUrPD23uyHWpRpkbUhzO+8F1QktP0TatjEuxAt
ITOdmFsRuPZi6b9i69zbY03Dckt+VbpnZuToH4J2zYTNJ+jIQNxGY5N37AKPccTd
9tj3neThoqbeRNxwmv6MLVJtUd+Ms9bcuivmNWiVhQ7au4NJQg4F6GcCPomzaVzY
felAyH1JUy2QNLu5XQj7ye2rWi3K6/CGtreMBy6RCLR6q7eSygB0Volo/ijlHGAH
KtMrLaseOeCo1a28rOaViagEYdFeiw3pSydMvY+730BtooiK+FcVdHgYs/JFneiF
k0HJrKAhZADhNWEfcpkjasRwzO8m4NzAQgWeUdOEiKgdLtXNDwc=
=tNOr
-----END PGP SIGNATURE-----
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-05-29 10:45:31.000000000 +0300
@@ -1,3 +1,21 @@
+dhcpcd5 (9.4.1-24) unstable; urgency=medium
+
+ * Upload to unstable
+
+ -- Martin-Éric Racine <martin-eric.racine@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.racine@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/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/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,
Reply to: