Package: dnsmasq
Version: 2.90-5
Severity: normal
Tags: patch
X-Debbugs-Cc: sl...@ubuntu.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu plucky ubuntu-patch
Dear Maintainer,
There have been discussions to switch ifupdown from using ISC dhclient to
dhcpcd, which comes with some slight differences in behavior. dnsmasq's
autopkgtests should be able to deal with both situations.
In Ubuntu, the attached patch was applied to achieve the following:
* d/t/{get-address+query-dns+lua+alt,ip-addr.patterns}: dhcpcd compat.
It does not send the hostname in its default configuration, provides
slightly different lease lifetimes and adds the 'noprefixroute' tag to
the test address from ip-addr.patterns (compared to ISC dhclient).
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers noble-updates
APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'),
(100, 'noble-proposed'), (100, 'noble-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.8.0-49-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de_DE:en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru dnsmasq-2.90/debian/tests/functions.d/ip-addr.patterns
dnsmasq-2.90/debian/tests/functions.d/ip-addr.patterns
--- dnsmasq-2.90/debian/tests/functions.d/ip-addr.patterns 2024-11-23
18:50:11.000000000 +0100
+++ dnsmasq-2.90/debian/tests/functions.d/ip-addr.patterns 2024-12-09
12:50:13.000000000 +0100
@@ -1,6 +1,6 @@
*: veth1@if*: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state
UP group default qlen 1000
link/ether ??:??:??:??:??:?? brd ff:ff:ff:ff:ff:ff link-netnsid 0
- inet 192.168.142.?/29 brd 192.168.142.7 scope global dynamic veth1
- valid_lft 3[56][0-9][0-9]sec preferred_lft 3[56][0-9][0-9]sec
+ inet 192.168.142.?/29 brd 192.168.142.7 scope global dynamic* veth1
+ valid_lft 3[56][0-9][0-9]sec preferred_lft 3[0-9][0-9][0-9]sec
inet6 fe80::*:*:*:*/64 scope link*
valid_lft forever preferred_lft forever
diff -Nru dnsmasq-2.90/debian/tests/get-address+query-dns+lua+alt
dnsmasq-2.90/debian/tests/get-address+query-dns+lua+alt
--- dnsmasq-2.90/debian/tests/get-address+query-dns+lua+alt 2024-11-23
18:50:11.000000000 +0100
+++ dnsmasq-2.90/debian/tests/get-address+query-dns+lua+alt 2024-12-09
12:50:13.000000000 +0100
@@ -4,6 +4,7 @@
. debian/tests/functions
+echo "hostname" >> /etc/dhcpcd.conf # Make it work on dhcpcd
stop_dnsmasq_bind_networking
configure_and_start_networking
configure_and_start_bind
