Bug#995655: dnsmasq breaks systemd autopkgtest: b'megasearch.net: 192.168.42.1' not found in b'megasearch.net: 207.148.248.143
Control: tags -1 + patch
Hi Simon
On 10.11.21 20:44, Michael Biebl wrote:
Simon,
any news here?
Would you mind if I prepare an NMU with
26bbf5a314d833beaf0f147d24409969f05f3dba ?
I decided to follow the rules in [1] and uploaded a fixed package to
DELAYED/2. Please holler if you want me to cancel the NMU.
debdiff is attached.
Regards,
Michael
[1] https://www.debian.org/doc/manuals/developers-reference/pkgs.en.html#nmu
diff -u dnsmasq-2.86/debian/changelog dnsmasq-2.86/debian/changelog
--- dnsmasq-2.86/debian/changelog
+++ dnsmasq-2.86/debian/changelog
@@ -1,3 +1,10 @@
+dnsmasq (2.86-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix --address=/#/.. which was lost in 2.86. (closes: #995655)
+
+ -- Michael Biebl Wed, 10 Nov 2021 22:05:45 +0100
+
dnsmasq (2.86-1) unstable; urgency=low
* Fix debian/changelog format error. (closes: #986626)
only in patch2:
unchanged:
--- dnsmasq-2.86.orig/CHANGELOG
+++ dnsmasq-2.86/CHANGELOG
@@ -1,3 +1,11 @@
+version 2.87
+Allow arbitrary prefix lengths in --rev-server and
+ --domain=,local
+
+ Replace --address=/#/. functionality which got
+ missed in the 2.86 domain search rewrite.
+
+
version 2.86
Handle DHCPREBIND requests in the DHCPv6 server code.
Thanks to Aichun Li for spotting this omission, and the initial
only in patch2:
unchanged:
--- dnsmasq-2.86.orig/src/network.c
+++ dnsmasq-2.86/src/network.c
@@ -1623,7 +1623,8 @@
continue;
if ((serv->flags & SERV_LITERAL_ADDRESS) &&
- !(serv->flags & (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS)))
+ !(serv->flags & (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS)) &&
+ strlen(serv->domain))
{
count--;
if (++locals <= LOCALS_LOGGED)
only in patch2:
unchanged:
--- dnsmasq-2.86.orig/src/option.c
+++ dnsmasq-2.86/src/option.c
@@ -2684,7 +2684,7 @@
if (!arg || !*arg)
flags = SERV_LITERAL_ADDRESS;
- else if (option == 'A')
+ else if (option != 'S')
{
/* # as literal address means return zero address for 4 and 6 */
if (strcmp(arg, "#") == 0)
@@ -2708,11 +2708,18 @@
while (1)
{
/* server=//1.2.3.4 is special. */
- if (strlen(domain) == 0 && lastdomain)
- flags |= SERV_FOR_NODOTS;
- else
- flags &= ~SERV_FOR_NODOTS;
+ if (lastdomain)
+ {
+ if (strlen(domain) == 0)
+ flags |= SERV_FOR_NODOTS;
+ else
+ flags &= ~SERV_FOR_NODOTS;
+ /* address=/#/ matches the same as without domain */
+ if (option != 'S' && domain[0] == '#' && domain[1] == 0)
+ domain[0] = 0;
+ }
+
if (!add_update_server(flags, &serv_addr, &source_addr, interface,
domain, &addr))
ret_err(gen_err);
OpenPGP_signature
Description: OpenPGP digital signature
Bug#995655: dnsmasq breaks systemd autopkgtest: b'megasearch.net: 192.168.42.1' not found in b'megasearch.net: 207.148.248.143
Simon, any news here? Would you mind if I prepare an NMU with 26bbf5a314d833beaf0f147d24409969f05f3dba ? Regards, Michael On Sun, 3 Oct 2021 21:32:53 +0200 Michael Biebl wrote: > Control: reassign -1 dnsmasq/2.86-1 > > It's a (known) regression in dnsmasq 2.86-1 > > CCing what I sent Simon privately a couple of days ago > > > Hi Simon, > > > > as you probably know, the recent update of dnsmasq 2.86 to unstable broke the systemd autopkgtests, namely test-networkd.py, and more specifically > > > > == > > ERROR: test_resolved_domain_restricted_dns (__main__.DnsmasqClientTest) > > resolved: domain-restricted DNS servers > > -- > > Traceback (most recent call last): > > File "/tmp/autopkgtest- lxc.knebmh6r/downtmp/build.00t/src/test/networkd-test.py", line 659, in test_resolved_domain_restricted_dns > > out = subprocess.check_output(['resolvectl', 'query', 'search.example.com']) > > File "/usr/lib/python3.9/subprocess.py", line 424, in check_output > > return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, > > File "/usr/lib/python3.9/subprocess.py", line 528, in run > > raise CalledProcessError(retcode, process.args, > > subprocess.CalledProcessError: Command '['resolvectl', 'query', 'search.example.com']' returned non-zero exit status 1. > > > > -- > > Ran 35 tests in 143.025s > > > > FAILED (errors=1, skipped=2) > > > > > > Afaics, this is a regression introduced by > > https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=12a9aa7c628e2d7dcd34949603848a3fb53fce9c > > > > and should be fixed by > > https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=26bbf5a314d833beaf0f147d24409969f05f3dba > > > > Am 03.10.21 um 19:23 schrieb Paul Gevers: > > Source: dnsmasq, systemd > > Control: found -1 dnsmasq/2.86-1 > > Control: found -1 systemd/247.9-1 > > Severity: serious > > Tags: sid bookworm > > X-Debbugs-CC: debian...@lists.debian.org > > User: debian...@lists.debian.org > > Usertags: breaks needs-update > > > > Dear maintainer(s), > > > > With a recent upload of dnsmasq the autopkgtest of systemd fails in > > testing when that autopkgtest is run with the binary packages of dnsmasq > > from unstable. It passes when run with only packages from testing. In > > tabular form: > > > > pass fail > > dnsmasq from testing 2.86-1 > > systemd from testing 247.9-1 > > all others from testing from testing > > > > I copied some of the output at the bottom of this report. signature.asc Description: This is a digitally signed message part
Bug#995655: dnsmasq breaks systemd autopkgtest: b'megasearch.net: 192.168.42.1' not found in b'megasearch.net: 207.148.248.143
Control: reassign -1 dnsmasq/2.86-1 It's a (known) regression in dnsmasq 2.86-1 CCing what I sent Simon privately a couple of days ago Hi Simon, as you probably know, the recent update of dnsmasq 2.86 to unstable broke the systemd autopkgtests, namely test-networkd.py, and more specifically == ERROR: test_resolved_domain_restricted_dns (__main__.DnsmasqClientTest) resolved: domain-restricted DNS servers -- Traceback (most recent call last): File "/tmp/autopkgtest-lxc.knebmh6r/downtmp/build.00t/src/test/networkd-test.py", line 659, in test_resolved_domain_restricted_dns out = subprocess.check_output(['resolvectl', 'query', 'search.example.com']) File "/usr/lib/python3.9/subprocess.py", line 424, in check_output return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, File "/usr/lib/python3.9/subprocess.py", line 528, in run raise CalledProcessError(retcode, process.args, subprocess.CalledProcessError: Command '['resolvectl', 'query', 'search.example.com']' returned non-zero exit status 1. -- Ran 35 tests in 143.025s FAILED (errors=1, skipped=2) Afaics, this is a regression introduced by https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=12a9aa7c628e2d7dcd34949603848a3fb53fce9c and should be fixed by https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=26bbf5a314d833beaf0f147d24409969f05f3dba Am 03.10.21 um 19:23 schrieb Paul Gevers: Source: dnsmasq, systemd Control: found -1 dnsmasq/2.86-1 Control: found -1 systemd/247.9-1 Severity: serious Tags: sid bookworm X-Debbugs-CC: debian...@lists.debian.org User: debian...@lists.debian.org Usertags: breaks needs-update Dear maintainer(s), With a recent upload of dnsmasq the autopkgtest of systemd fails in testing when that autopkgtest is run with the binary packages of dnsmasq from unstable. It passes when run with only packages from testing. In tabular form: passfail dnsmasqfrom testing2.86-1 systemdfrom testing247.9-1 all others from testingfrom testing I copied some of the output at the bottom of this report. Currently this regression is blocking the migration of dnsmasq to testing [1]. Due to the nature of this issue, I filed this bug report against both packages. Can you please investigate the situation and reassign the bug to the right package? More information about this bug and the reason for filing it can be found on https://wiki.debian.org/ContinuousIntegration/RegressionEmailInformation Paul [0] You can see what packages were added from the second line of the log file quoted below. The migration software adds source package from unstable to the list if they are needed to install packages from dnsmasq/2.86-1. I.e. due to versioned dependencies or breaks/conflicts. [1] https://qa.debian.org/excuses.php?package=dnsmasq https://ci.debian.net/data/autopkgtest/testing/amd64/s/systemd/15711756/log.gz == FAIL: test_resolved_domain_restricted_dns (__main__.DnsmasqClientTest) resolved: domain-restricted DNS servers -- Traceback (most recent call last): File "/tmp/autopkgtest-lxc.re_u3b37/downtmp/build.aCg/src/test/networkd-test.py", line 660, in test_resolved_domain_restricted_dns self.assertIn(b'megasearch.net: 192.168.42.1', out) AssertionError: b'megasearch.net: 192.168.42.1' not found in b'megasearch.net: 207.148.248.143 -- link: eth0\n\n-- Information acquired via protocol DNS in 123.2ms.\n-- Data is authenticated: no\n' -- OpenPGP_signature Description: OpenPGP digital signature
Bug#995655: dnsmasq breaks systemd autopkgtest: b'megasearch.net: 192.168.42.1' not found in b'megasearch.net: 207.148.248.143
Source: dnsmasq, systemd Control: found -1 dnsmasq/2.86-1 Control: found -1 systemd/247.9-1 Severity: serious Tags: sid bookworm X-Debbugs-CC: debian...@lists.debian.org User: debian...@lists.debian.org Usertags: breaks needs-update Dear maintainer(s), With a recent upload of dnsmasq the autopkgtest of systemd fails in testing when that autopkgtest is run with the binary packages of dnsmasq from unstable. It passes when run with only packages from testing. In tabular form: passfail dnsmasqfrom testing2.86-1 systemdfrom testing247.9-1 all others from testingfrom testing I copied some of the output at the bottom of this report. Currently this regression is blocking the migration of dnsmasq to testing [1]. Due to the nature of this issue, I filed this bug report against both packages. Can you please investigate the situation and reassign the bug to the right package? More information about this bug and the reason for filing it can be found on https://wiki.debian.org/ContinuousIntegration/RegressionEmailInformation Paul [0] You can see what packages were added from the second line of the log file quoted below. The migration software adds source package from unstable to the list if they are needed to install packages from dnsmasq/2.86-1. I.e. due to versioned dependencies or breaks/conflicts. [1] https://qa.debian.org/excuses.php?package=dnsmasq https://ci.debian.net/data/autopkgtest/testing/amd64/s/systemd/15711756/log.gz == FAIL: test_resolved_domain_restricted_dns (__main__.DnsmasqClientTest) resolved: domain-restricted DNS servers -- Traceback (most recent call last): File "/tmp/autopkgtest-lxc.re_u3b37/downtmp/build.aCg/src/test/networkd-test.py", line 660, in test_resolved_domain_restricted_dns self.assertIn(b'megasearch.net: 192.168.42.1', out) AssertionError: b'megasearch.net: 192.168.42.1' not found in b'megasearch.net: 207.148.248.143 -- link: eth0\n\n-- Information acquired via protocol DNS in 123.2ms.\n-- Data is authenticated: no\n' -- OpenPGP_signature Description: OpenPGP digital signature
