Bug#893866: stretch-pu: package systemd/232-25+deb9u3

[Michael Biebl]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org at packages.debian.org
Usertags: pu

Hi,

we already briefly discussed this via IRC on #debian-release.

The last stable upload of systemd introduced a rather nasty regression
in networkd, which broke IPv6 support for lots of users.

KiBi was so kind to dig out the relevant upstream commit which fixes
this and got confirmation from the bug reporter(s) that with this patch
applied, networkd behaves properly. I thus would like to get this
update into stable as quickly as possible.

Here's the changelog, debdiff is attached:

systemd (232-25+deb9u3) stretch; urgency=medium

  [ Cyril Brulebois ]
  * networkd-ndisc: Handle missing mtu gracefully.
    The previous upload made networkd respect the MTU field in IPv6 RA but
    unfortunately broke setups where there's no such field. (Closes: #892794)

 -- Michael Biebl <biebl at debian.org>  Fri, 23 Mar 2018 13:55:43 +0100


-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index e7b7ff1..1117655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+systemd (232-25+deb9u3) stretch; urgency=medium
+
+  [ Cyril Brulebois ]
+  * networkd-ndisc: Handle missing mtu gracefully.
+    The previous upload made networkd respect the MTU field in IPv6 RA but
+    unfortunately broke setups where there's no such field. (Closes: #892794)
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 23 Mar 2018 13:55:43 +0100
+
 systemd (232-25+deb9u2) stretch; urgency=medium
 
   * networkd: Handle MTU field in IPv6 RA (Closes: #878162)
diff --git a/debian/patches/networkd-ndisc-handle-missing-mtu-gracefully-4913.patch b/debian/patches/networkd-ndisc-handle-missing-mtu-gracefully-4913.patch
new file mode 100644
index 0000000..59d6808
--- /dev/null
+++ b/debian/patches/networkd-ndisc-handle-missing-mtu-gracefully-4913.patch
@@ -0,0 +1,28 @@
+From: =?utf-8?q?J=C3=B6rg_Thalheim?= <joerg at higgsboson.tk>
+Date: Mon, 19 Dec 2016 15:34:07 +0100
+Subject: networkd-ndisc: handle missing mtu gracefully (#4913)
+
+At least bird's implementation of router advertisement does not
+set MTU option by default (instead it supplies an option to the user).
+In this case just leave MTU as it is.
+
+(cherry picked from commit 29b5ad083a6925efec8e188013d1298742e0baaa)
+---
+ src/network/networkd-ndisc.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
+index 9cfdf01..d3fa56b 100644
+--- a/src/network/networkd-ndisc.c
++++ b/src/network/networkd-ndisc.c
+@@ -117,7 +117,9 @@ static void ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
+         }
+ 
+         r = sd_ndisc_router_get_mtu(rt, &mtu);
+-        if (r < 0) {
++        if (r == -ENODATA)
++                mtu = 0;
++        else if (r < 0) {
+                 log_link_warning_errno(link, r, "Failed to get default router MTU from RA: %m");
+                 return;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 3f93454..2866963 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -78,6 +78,7 @@ networkd-handle-MTU-field-in-IPv6-RA-4719.patch
 shared-Add-a-linker-script-so-that-all-functions-are-tagg.patch
 resolved-fix-loop-on-packets-with-pseudo-dns-types.patch
 machinectl-don-t-output-No-machines.-with-no-legend-optio.patch
+networkd-ndisc-handle-missing-mtu-gracefully-4913.patch
 debian/Use-Debian-specific-config-files.patch
 debian/don-t-try-to-start-autovt-units-when-not-running-wit.patch
 debian/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch