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.
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/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..fe97aa77 --- /dev/null +++ b/debian/patches/Debian_uncomment_ntp_servers_dhcpcd_conf.patch @@ -0,0 +1,19 @@ +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. + +--- dhcpcd-10.3.0.orig/src/dhcpcd.conf ++++ dhcpcd-10.3.0/src/dhcpcd.conf +@@ -32,7 +32,7 @@ option interface_mtu + option host_name + + # Most distributions have NTP support. +-#option ntp_servers ++option ntp_servers + + # A ServerID is required by RFC2131. + require dhcp_server_identifier 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
