On Thu, 25 Dec 2025 11:58:34 +0200 =?utf-8?q?Martin-=C3=89ric_Racine?= <[email protected]> wrote: > Package: release.debian.org > Severity: normal > Tags: trixie > X-Debbugs-Cc: [email protected], [email protected] > Control: affects -1 + src:dhcpcd > User: [email protected] > Usertags: pu > > [ Reason ] > Upstream ships its default configuration with DHCP 'option ntp_servers' > disabled. Cyril filed bug #1123962 requesting this be fixed in Unstable and > Stable. > > [ Impact ] > Without this, dhcpcd still won't succesfully pass any NTP server it gets to > timesyncd. > > [ Tests ] > Merely enabling this option was manually verified by Cyril to fix this issue. > > [ Risks ] > None. dhcpcd is just requesting an additional DHCP option. > > [ 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 (old)stable > [x] the issue is verified as fixed in unstable > > [ Changes ] > Uncomment one DHCP option that upstream ships commented out.
Sure enough, it seems that the latest dpkg-dev is a lot more fuzzy about patch fuzz. Here's an updated debdiff. Martin-Éric
diff --git a/debian/changelog b/debian/changelog index efc01e7c..a6659189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dhcpcd (1:10.1.0-11+deb13u2) trixie; urgency=medium + + * [patches] + + Uncomment 'ntp_servers' in dhcpcd.conf (Closes: #1123962). + + -- Martin-Éric Racine <[email protected]> Thu, 25 Dec 2025 11:40:14 +0200 + dhcpcd (1:10.1.0-11+deb13u1) trixie; urgency=medium * [patches] diff --git a/debian/patches/5db90127b1c3128480a52559a9cdbd4949a0fed4.patch b/debian/patches/5db90127b1c3128480a52559a9cdbd4949a0fed4.patch index 850da716..80601947 100644 --- a/debian/patches/5db90127b1c3128480a52559a9cdbd4949a0fed4.patch +++ b/debian/patches/5db90127b1c3128480a52559a9cdbd4949a0fed4.patch @@ -14,8 +14,8 @@ Fixes #423 Index: dhcpcd/src/dhcpcd.8.in =================================================================== ---- dhcpcd.orig/src/dhcpcd.8.in 2025-05-08 20:07:34.775256276 +0300 -+++ dhcpcd/src/dhcpcd.8.in 2025-05-08 20:07:34.771256235 +0300 +--- dhcpcd.orig/src/dhcpcd.8.in 2025-12-25 12:13:13.270167489 +0200 ++++ dhcpcd/src/dhcpcd.8.in 2025-12-25 12:13:13.266167446 +0200 @@ -523,18 +523,19 @@ Timeout after .Ar seconds , @@ -45,8 +45,8 @@ Index: dhcpcd/src/dhcpcd.8.in .Ar class . Index: dhcpcd/src/dhcpcd.c =================================================================== ---- dhcpcd.orig/src/dhcpcd.c 2025-05-08 20:07:34.775256276 +0300 -+++ dhcpcd/src/dhcpcd.c 2025-05-08 20:07:34.771256235 +0300 +--- dhcpcd.orig/src/dhcpcd.c 2025-12-25 12:13:13.270167489 +0200 ++++ dhcpcd/src/dhcpcd.c 2025-12-25 12:13:13.266167446 +0200 @@ -198,7 +198,7 @@ ctx = arg; diff --git a/debian/patches/6acf895a66b143c42308777e085c1511cdebe5e0.patch b/debian/patches/6acf895a66b143c42308777e085c1511cdebe5e0.patch index cba0c63a..b1ba8778 100644 --- a/debian/patches/6acf895a66b143c42308777e085c1511cdebe5e0.patch +++ b/debian/patches/6acf895a66b143c42308777e085c1511cdebe5e0.patch @@ -13,8 +13,8 @@ Initial fix for #423 Index: dhcpcd/src/dhcpcd.c =================================================================== ---- dhcpcd.orig/src/dhcpcd.c 2025-05-08 20:07:34.895257487 +0300 -+++ dhcpcd/src/dhcpcd.c 2025-05-08 20:07:34.891257446 +0300 +--- dhcpcd.orig/src/dhcpcd.c 2025-12-25 12:13:07.890111273 +0200 ++++ dhcpcd/src/dhcpcd.c 2025-12-25 12:13:07.886111231 +0200 @@ -208,7 +208,8 @@ eloop_exit(ctx->eloop, EXIT_FAILURE); return; @@ -36,8 +36,8 @@ Index: dhcpcd/src/dhcpcd.c return; Index: dhcpcd/src/if-options.h =================================================================== ---- dhcpcd.orig/src/if-options.h 2025-05-08 20:07:34.895257487 +0300 -+++ dhcpcd/src/if-options.h 2025-05-08 20:07:34.891257446 +0300 +--- dhcpcd.orig/src/if-options.h 2025-12-25 12:13:07.890111273 +0200 ++++ dhcpcd/src/if-options.h 2025-12-25 12:13:07.886111231 +0200 @@ -85,7 +85,7 @@ #define DHCPCD_ANONYMOUS (1ULL << 21) #define DHCPCD_BACKGROUND (1ULL << 22) diff --git a/debian/patches/79c195b92f892c6f22fa07332c10fd9c2a8b679a.patch b/debian/patches/79c195b92f892c6f22fa07332c10fd9c2a8b679a.patch index ebbc6664..2f554caf 100644 --- a/debian/patches/79c195b92f892c6f22fa07332c10fd9c2a8b679a.patch +++ b/debian/patches/79c195b92f892c6f22fa07332c10fd9c2a8b679a.patch @@ -12,13 +12,13 @@ Fixes #499. src/dhcpcd.conf | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/src/dhcpcd.conf b/src/dhcpcd.conf -index 916e82dae..19de37fbe 100644 ---- a/src/dhcpcd.conf -+++ b/src/dhcpcd.conf -@@ -34,11 +34,6 @@ option host_name +Index: dhcpcd/src/dhcpcd.conf +=================================================================== +--- dhcpcd.orig/src/dhcpcd.conf 2025-12-25 12:13:02.454054469 +0200 ++++ dhcpcd/src/dhcpcd.conf 2025-12-25 12:13:02.450054426 +0200 +@@ -34,11 +34,6 @@ # Most distributions have NTP support. - #option ntp_servers + option ntp_servers -# Rapid commit support. -# Safe to enable by default because it requires the equivalent option set diff --git a/debian/patches/Debian_uncomment_hostname_in_dhcpcd_conf.patch b/debian/patches/Debian_uncomment_hostname_in_dhcpcd_conf.patch index f1c35d50..5359824e 100644 --- a/debian/patches/Debian_uncomment_hostname_in_dhcpcd_conf.patch +++ b/debian/patches/Debian_uncomment_hostname_in_dhcpcd_conf.patch @@ -6,8 +6,10 @@ Last-Update: 2025-01-24 Debian really wants DDNS to work out of the box, so let's uncomment 'hostname' in /etc/dhcpcd.conf until this has been fixed upstream. ---- dhcpcd-10.1.0.orig/src/dhcpcd.conf -+++ dhcpcd-10.1.0/src/dhcpcd.conf +Index: dhcpcd/src/dhcpcd.conf +=================================================================== +--- dhcpcd.orig/src/dhcpcd.conf 2025-12-25 11:45:29.344483026 +0200 ++++ dhcpcd/src/dhcpcd.conf 2025-12-25 11:45:34.000000000 +0200 @@ -5,7 +5,7 @@ #controlgroup wheel diff --git a/debian/patches/Debian_uncomment_ntp_servers_dhcpcd_conf.patch b/debian/patches/Debian_uncomment_ntp_servers_dhcpcd_conf.patch new file mode 100644 index 00000000..905686a2 --- /dev/null +++ b/debian/patches/Debian_uncomment_ntp_servers_dhcpcd_conf.patch @@ -0,0 +1,21 @@ +Description: Uncomment 'ntp_servers' in dhcpcd.conf (Closes: #1123962) +Author: Martin-Éric Racine <[email protected]> +Forwarded: not-needed +Last-Update: 2025-12-25 + +Debian really wants NTP to work out of the box, so let's uncomment +'ntp_servers' in /etc/dhcpcd.conf until this got fixed upstream. + +Index: dhcpcd/src/dhcpcd.conf +=================================================================== +--- dhcpcd.orig/src/dhcpcd.conf 2025-12-25 12:09:38.715924208 +0200 ++++ dhcpcd/src/dhcpcd.conf 2025-12-25 12:09:38.715924208 +0200 +@@ -32,7 +32,7 @@ + option host_name + + # Most distributions have NTP support. +-#option ntp_servers ++option ntp_servers + + # Rapid commit support. + # Safe to enable by default because it requires the equivalent option set diff --git a/debian/patches/e9e40400003db2e4f12dba85acabbaf2212a520f.patch b/debian/patches/e9e40400003db2e4f12dba85acabbaf2212a520f.patch index 01f70320..dd8f5ec7 100644 --- a/debian/patches/e9e40400003db2e4f12dba85acabbaf2212a520f.patch +++ b/debian/patches/e9e40400003db2e4f12dba85acabbaf2212a520f.patch @@ -10,11 +10,11 @@ Fixes #421. src/privsep-linux.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 8357904c..e3485a2e 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -409,6 +409,9 @@ static struct sock_filter ps_seccomp_filter[] = { +Index: dhcpcd/src/privsep-linux.c +=================================================================== +--- dhcpcd.orig/src/privsep-linux.c 2025-12-25 11:45:29.352483114 +0200 ++++ dhcpcd/src/privsep-linux.c 2025-12-25 12:12:35.000000000 +0200 +@@ -409,6 +409,9 @@ #ifdef __NR_recvmsg SECCOMP_ALLOW(__NR_recvmsg), #endif diff --git a/debian/patches/eac7152ec04f5a330f01ab9504514a03f873b35c.patch b/debian/patches/eac7152ec04f5a330f01ab9504514a03f873b35c.patch index cca1cbf6..9f2065e7 100644 --- a/debian/patches/eac7152ec04f5a330f01ab9504514a03f873b35c.patch +++ b/debian/patches/eac7152ec04f5a330f01ab9504514a03f873b35c.patch @@ -8,11 +8,11 @@ Fixes #455 src/ipv4.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/src/ipv4.c b/src/ipv4.c -index a5fe4900..ce67bfec 100644 ---- a/src/ipv4.c -+++ b/src/ipv4.c -@@ -524,6 +524,7 @@ ipv4_deladdr(struct ipv4_addr *addr, int keeparp) +Index: dhcpcd/src/ipv4.c +=================================================================== +--- dhcpcd.orig/src/ipv4.c 2025-12-25 12:13:16.966206104 +0200 ++++ dhcpcd/src/ipv4.c 2025-12-25 12:13:16.962206062 +0200 +@@ -524,6 +524,7 @@ struct ipv4_state *state; struct ipv4_addr *ap; @@ -20,7 +20,7 @@ index a5fe4900..ce67bfec 100644 logdebugx("%s: deleting IP address %s", addr->iface->name, addr->saddr); -@@ -760,7 +761,9 @@ ipv4_applyaddr(void *arg) +@@ -760,7 +761,9 @@ (DHCPCD_EXITING | DHCPCD_PERSISTENT)) { if (state->added) { diff --git a/debian/patches/series b/debian/patches/series index a5066e1a..da1c2074 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ Debian_uncomment_hostname_in_dhcpcd_conf.patch +Debian_uncomment_ntp_servers_dhcpcd_conf.patch 25689325f81c7a61bd48f5727eaae1d6f16e1328.patch 2870767a79537b5d6918e7de80358b406fea0898.patch fdeb8c7945211d424c3a30912004eeb56e009865.patch
