Merge ~enr0n/ubuntu/+source/systemd:ubuntu-lunar-next into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-lunar

[Nick Rosbrook]

PPA: https://launchpad.net/~enr0n/+archive/ubuntu/systemd/+packages

autopkgtest results:

systemd 252.5-2ubuntu2~ppa5 (amd64) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-lunar-enr0n-systemd/lunar/amd64/s/systemd/20230308_180324_612c4@/log.gz
systemd 252.5-2ubuntu2~ppa5 (armhf) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-lunar-enr0n-systemd/lunar/armhf/s/systemd/20230308_200705_e35e8@/log.gz
systemd 252.5-2ubuntu2~ppa5 (ppc64el) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-lunar-enr0n-systemd/lunar/ppc64el/s/systemd/20230308_202029_96d42@/log.gz
systemd 252.5-2ubuntu2~ppa5 (arm64) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-lunar-enr0n-systemd/lunar/arm64/s/systemd/20230308_203104_612c4@/log.gz
systemd 252.5-2ubuntu2~ppa5 (s390x) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-lunar-enr0n-systemd/lunar/s390x/s/systemd/20230308_220936_96d42@/log.gz

[Lukas Märdian (slyon)]

Okay, so this is a post feature freeze upload. It only contains a targeted fix for bug #2004478 and also a drive-by fix for the test system, which is part of a bigger PR upstream, which can be dropped after v253 lands in Ubuntu: https://github.com/systemd/systemd/pull/25986

LGTM overall.

But I had some trouble connecting the dots on d/p/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch (it seemed a bit out of context). So I added some additional DEP3 headers to that patch, to make clear where it comes from and when it can be dropped exactly.

```diff
$ git diff enr0n/ubuntu-lunar-next
diff --git a/debian/changelog b/debian/changelog
index 3aaba0e14d3..bc515ad1742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ systemd (252.5-2ubuntu2) lunar; urgency=medium
     This has already been fixed upstream by a larger commit, so this patch
     can be dropped when we have a new enough upstream version.
     File: debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
- https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d047ef91f356f3998ac46cab677e0ec4abc197da
+ https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=195985ee5aa2cfdbbac178a07e5b43b83f0550d0

  -- Nick Rosbrook <email address hidden> Wed, 08 Mar 2023 12:51:51 -0500

diff --git a/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch b/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
index b0e852b94db..9ce7b03b85f 100644
--- a/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
+++ b/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
@@ -1,8 +1,13 @@
 From: Nick Rosbrook <email address hidden>
 Date: Thu, 2 Mar 2023 10:07:00 -0500
-Subject: sd-netlink: skip test_rtnl_set_link_name when altnames are not
- supported
-
+Subject: sd-netlink: skip test_rtnl_set_link_name when altnames are not supported
+Origin: vendor, Ubuntu
+Applied-Upstream: https://github.com/systemd/systemd/pull/25986 (v253)
+Acked-by: Lukas Märdian <email address hidden>
+Forwarded: not-needed
+Last-Update: 2023-03-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 ---
  src/libsystemd/sd-netlink/test-netlink.c | 2 ++
  1 file changed, 2 insertions(+)
```

review: Approve

[Lukas Märdian (slyon)]

https://launchpad.net/ubuntu/+source/systemd/252.5-2ubuntu2

[Nick Rosbrook (enr0n)]

Thanks, Lukas! Sorry about the missing DEP3 headers, and thanks for catching that.

diff --git a/debian/changelog b/debian/changelog
index 2821604..3aaba0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+systemd (252.5-2ubuntu2) lunar; urgency=medium
+
+  * network/dhcp4: accept local subnet routes from DHCP (LP: #2004478)
+    File: debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b9aaaf37b8ca7c9febe5f0ebc4b82d0f895cbbd3
+  * sd-netlink: skip test_rtnl_set_link_name when altnames are not supported.
+    This has already been fixed upstream by a larger commit, so this patch
+    can be dropped when we have a new enough upstream version.
+    File: debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d047ef91f356f3998ac46cab677e0ec4abc197da
+
+ -- Nick Rosbrook <[e-mail]>  Wed, 08 Mar 2023 12:51:51 -0500
+
 systemd (252.5-2ubuntu1) lunar; urgency=medium
 
   * Merge 252.5-2 from Debian unstable
diff --git a/debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch b/debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch
new file mode 100644
index 0000000..1e75694
--- /dev/null
+++ b/debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch
@@ -0,0 +1,55 @@
+From: Tuetuopay <[e-mail]>
+Date: Fri, 27 Jan 2023 15:10:49 +0100
+Subject: network/dhcp4: accept local subnet routes from DHCP
+
+Origin: upstream, https://github.com/systemd/systemd-stable/commit/b0f514ba567a1f6321f6b7f1ded038f8090c70f0
+Bug-Ubuntu: https://launchpad.net/bugs/2004478
+
+RFC3442 specifies option 121 (Classless Static Routes) that allow a DHCP
+server to push arbitrary routes to a client. It has a Local Subnet
+Routes section expliciting the behavior of routes with a null (0.0.0.0)
+gateway.
+
+Such routes are to be installed on the interface with a Link scope, to
+mark them as directly available on the link without any gateway.
+
+Networkd currently drops those routes, which is against the RFC, as
+Linux has proper support for such routes.
+
+Fixes: 7f20627 ("network: dhcp4: ignore gateway in static routes if destination is link-local or in the same network")
+(cherry picked from commit 1d84a3c7792a8910b05904937c703307ca19740f)
+---
+ src/network/networkd-dhcp4.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
+index c5bddb6..9a22b6f 100644
+--- a/src/network/networkd-dhcp4.c
++++ b/src/network/networkd-dhcp4.c
+@@ -334,15 +334,18 @@ static int dhcp4_request_route_auto(
+                 route->gw = IN_ADDR_NULL;
+                 route->prefsrc.in = address;
+ 
+-        } else {
+-                if (in4_addr_is_null(gw)) {
+-                        log_link_debug(link, "DHCP: requested route destination "IPV4_ADDRESS_FMT_STR"/%u is not in the assigned network "
+-                                       IPV4_ADDRESS_FMT_STR"/%u, but no gateway is specified, ignoring.",
+-                                       IPV4_ADDRESS_FMT_VAL(route->dst.in), route->dst_prefixlen,
+-                                       IPV4_ADDRESS_FMT_VAL(prefix), prefixlen);
+-                        return 0;
+-                }
++        } else if (in4_addr_is_null(gw)) {
++                log_link_debug(link, "DHCP: requested route destination "IPV4_ADDRESS_FMT_STR"/%u is not in the assigned network "
++                               IPV4_ADDRESS_FMT_STR"/%u, but no gateway is specified, using 'link' scope.",
++                               IPV4_ADDRESS_FMT_VAL(route->dst.in), route->dst_prefixlen,
++                               IPV4_ADDRESS_FMT_VAL(prefix), prefixlen);
+ 
++                route->scope = RT_SCOPE_LINK;
++                route->gw_family = AF_UNSPEC;
++                route->gw = IN_ADDR_NULL;
++                route->prefsrc.in = address;
++
++        } else {
+                 r = dhcp4_request_route_to_gateway(link, gw);
+                 if (r < 0)
+                         return r;
diff --git a/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch b/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
new file mode 100644
index 0000000..b0e852b
--- /dev/null
+++ b/debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
@@ -0,0 +1,22 @@
+From: Nick Rosbrook <[e-mail]>
+Date: Thu, 2 Mar 2023 10:07:00 -0500
+Subject: sd-netlink: skip test_rtnl_set_link_name when altnames are not
+ supported
+
+---
+ src/libsystemd/sd-netlink/test-netlink.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c
+index 2d93f9e..736252d 100644
+--- a/src/libsystemd/sd-netlink/test-netlink.c
++++ b/src/libsystemd/sd-netlink/test-netlink.c
+@@ -685,6 +685,8 @@ static void test_rtnl_set_link_name(sd_netlink *rtnl, int ifindex) {
+         r = rtnl_set_link_alternative_names(&rtnl, ifindex, STRV_MAKE("testlongalternativename"));
+         if (r == -EPERM)
+                 return (void) log_tests_skipped("missing required capabilities");
++        if (r == -EOPNOTSUPP)
++                return (void) log_tests_skipped("alternative name is not supported");
+ 
+         assert_se(r >= 0);
+         assert_se(rtnl_set_link_name(&rtnl, ifindex, "testlongalternativename") == -EINVAL);
diff --git a/debian/patches/series b/debian/patches/series
index 654d909..749ad23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,3 +51,5 @@ lp2002445-udev-attempt-device-rename-even-if-interface-is-up.patch
 lp2002445-sd-netlink-add-a-test-for-rtnl_set_link_name.patch
 lp2002445-test-network-add-a-test-for-renaming-device-to-current-al.patch
 Deny-list-TEST-74-AUX-UTILS-on-s390x.patch
+lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch
+sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch