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

Proposed by Nick Rosbrook
Status: Merged
Merge reported by: Lukas Märdian
Merged at revision: 1bec01746ec5b0e1613f23b3da1dfe1866af4b52
Proposed branch: ~enr0n/ubuntu/+source/systemd:ubuntu-lunar-next
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-lunar
Diff against target: 120 lines (+92/-0)
4 files modified
debian/changelog (+13/-0)
debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch (+55/-0)
debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch (+22/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Lukas Märdian Approve
Review via email: mp+438554@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Lukas Märdian (slyon) wrote (last edit ):

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
Revision history for this message
Lukas Märdian (slyon) wrote :
Revision history for this message
Nick Rosbrook (enr0n) wrote :

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

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches