Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: juli...@ubuntu.com, sl...@ubuntu.com
Please unblock package networkd-dispatcher [ Reason ] networkd-dispatcher provides invalid IP addresses to hooks in its JSON, such as "172.25.117.104 (DHCP4)", which breaks hooks relying on proper IP addresses in the IP address field :) [ Impact ] Hooks are broken for IPv4 addressing. Might break automatization people have written as networkd-dispatcher hooks for systemd-networkd. [ Tests ] Unit tests: Added the erronous DHCP4 part to the test input, and hence test ensures it is stripped properly when testing. [ Risks ] The way the normalization happens there shouldn't really be any risk, it's trivial, and just removes the DHCPv4 string from the address. My understanding is that it's a leaf package and not installed by default, 80 Inst reports on popcon, so even if it broke, who's going to notice? [ 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 ] We understand parsing networkctl human-readable output is bad, future versions will eventually make use of networkctl's JSON support. unblock networkd-dispatcher/2.1-2 -- debian developer - deb.li/jak | jak-linux.org - free software dev ubuntu core developer i speak de, en
diff -Nru networkd-dispatcher-2.1/debian/changelog networkd-dispatcher-2.1/debian/changelog --- networkd-dispatcher-2.1/debian/changelog 2020-11-10 14:35:05.000000000 +0100 +++ networkd-dispatcher-2.1/debian/changelog 2021-07-12 12:56:03.000000000 +0200 @@ -1,3 +1,14 @@ +networkd-dispatcher (2.1-2) unstable; urgency=medium + + [ Lukas Märdian ] + * Add d/p/0003-Normalize-parsed-IP-address-value.patch to handle IP address + networkctl output of systemd v244+ + + [ Julian Andres Klode ] + * debian/gbp.conf: Point to debian/bullseye + + -- Julian Andres Klode <j...@debian.org> Mon, 12 Jul 2021 12:56:03 +0200 + networkd-dispatcher (2.1-1) unstable; urgency=medium * New upstream release 2.1 (Closes: #968941) diff -Nru networkd-dispatcher-2.1/debian/gbp.conf networkd-dispatcher-2.1/debian/gbp.conf --- networkd-dispatcher-2.1/debian/gbp.conf 2020-11-10 14:35:05.000000000 +0100 +++ networkd-dispatcher-2.1/debian/gbp.conf 2021-07-12 12:56:03.000000000 +0200 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/master +debian-branch = debian/bullseye upstream-branch = upstream upstream-tag = %(version)s debian-tag= debian/%(version)s diff -Nru networkd-dispatcher-2.1/debian/patches/0003-Normalize-parsed-IP-address-value.patch networkd-dispatcher-2.1/debian/patches/0003-Normalize-parsed-IP-address-value.patch --- networkd-dispatcher-2.1/debian/patches/0003-Normalize-parsed-IP-address-value.patch 1970-01-01 01:00:00.000000000 +0100 +++ networkd-dispatcher-2.1/debian/patches/0003-Normalize-parsed-IP-address-value.patch 2021-07-12 12:56:03.000000000 +0200 @@ -0,0 +1,48 @@ +From: Lukas Märdian <sl...@ubuntu.com> +Date: Mon, 12 Jul 2021 12:19:12 +0200 +Subject: Normalize parsed IP address value + +Origin: vendor, Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1884248 +Forwarded: https://gitlab.com/craftyguy/networkd-dispatcher/-/merge_requests/56 +--- + networkd-dispatcher | 5 +++++ + tests/inputs/test_get_networkctl_status | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/networkd-dispatcher b/networkd-dispatcher +index 82bf7ad..cc5f485 100755 +--- a/networkd-dispatcher ++++ b/networkd-dispatcher +@@ -15,6 +15,7 @@ import errno + import json + import logging + import os ++import re + import socket + import stat + import subprocess +@@ -110,6 +111,10 @@ def get_networkctl_status(iface_name): + if not v: + continue + ++ # normalize some values that changed in v244 & v246 ++ if k == 'Address': ++ v = re.sub(r' \(DHCP4.*\)$', '', v) ++ + oldk = k + + if k in SINGLETONS: +diff --git a/tests/inputs/test_get_networkctl_status b/tests/inputs/test_get_networkctl_status +index 6a70279..3439162 100644 +--- a/tests/inputs/test_get_networkctl_status ++++ b/tests/inputs/test_get_networkctl_status +@@ -8,7 +8,7 @@ + Vendor: Intel Corporation + Model: Wireless 8265 / 8275 (Dual Band Wireless-AC 8265) + HW Address: dd:ee:aa:dd:12:34 (Intel Corporate) +- Address: 1.1.1.100 ++ Address: 1.1.1.100 (DHCP4 via 1.1.1.42) + + Gateway: 1.1.1.1 + DNS: 10.10.10.1 diff -Nru networkd-dispatcher-2.1/debian/patches/series networkd-dispatcher-2.1/debian/patches/series --- networkd-dispatcher-2.1/debian/patches/series 2020-11-10 14:35:05.000000000 +0100 +++ networkd-dispatcher-2.1/debian/patches/series 2021-07-12 12:56:03.000000000 +0200 @@ -1,2 +1,3 @@ 0001-Patch-etc-conf.d-p.conf-to-etc-default-p.patch 0002-networkd-dispatcher.conf-Run-startup-triggers-by-def.patch +0003-Normalize-parsed-IP-address-value.patch