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

[Nick Rosbrook]

Stage some changes for upcoming SRU.

[Lukas Märdian (slyon)]

Thanks! LGTM.

I think we should still include fixes for LP: #1930482 in the next Focal SRU and double check if the fix for LP: #1982462 is also needed in Focal, after the lp1978079-efi-pstore-not-cleared-on-boot.patch is included.

review: Approve

[Nick Rosbrook (enr0n)]

Thanks for the review! I will add those LPs to my to-do list for focal.

diff --git a/debian/changelog b/debian/changelog
index a9e1aa0..3df1667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ systemd (245.4-4ubuntu3.18) UNRELEASED; urgency=medium
     (LP: #1966800)
     File: debian/patches/lp1966800-shared-calendarspec-when-mktime-moves-us-backwards-jump-f.patch
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1f063541e44f6ff1a6904676d4264a2e49a09594
+  * network: do not remove localhost address (LP: #1979951)
+    File: debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87f872b8c5451f353601fb606e7fd7a479217cef
 
   [ Mustafa Kemal Gilor ]
   * d/p/lp1978079-efi-pstore-not-cleared-on-boot.patch: pstore: Run after
@@ -18,7 +21,7 @@ systemd (245.4-4ubuntu3.18) UNRELEASED; urgency=medium
     File: debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6e60756f2079d6408abdb967127a1d9b9a0eba8c
 
- -- Lukas Märdian <[e-mail]>  Thu, 23 Jun 2022 18:01:34 +0200
+ -- Nick Rosbrook <[e-mail]>  Fri, 22 Jul 2022 15:30:27 -0400
 
 systemd (245.4-4ubuntu3.17) focal; urgency=medium
 
diff --git a/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch b/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
index 2b282d0..af6a0ca 100644
--- a/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
+++ b/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
@@ -3,6 +3,13 @@ From: Alexander Graf <[e-mail]>
 Date: Thu, 9 Jun 2022 16:20:43 +0200
 Subject: [PATCH] pstore: Run after modules are loaded
 
+Origin: upstream, https://github.com/systemd/systemd/commit/70e74a5997ae2ce7ba72a74ac949c3b2dad1a1d6
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1978079
+Last-Updated: 2022-07-22
+
+The original commit has been modified to not load mtdpstore.
+
+---
 The systemd-pstore service takes pstore files on boot and transfers them
 to disk. It only does it once on boot and only if it finds any. The typical
 location of the pstore on modern systems is the UEFI variable store.
@@ -34,8 +41,8 @@ index 848e311e9642..86de30ad4a72 100644
  DefaultDependencies=no
  Conflicts=shutdown.target
  Before=sysinit.target shutdown.target
-+After=modprobe@efi_pstore.service [e-mail] modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
-+Wants=modprobe@efi_pstore.service [e-mail] modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
++After=modprobe@efi_pstore.service modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
++Wants=modprobe@efi_pstore.service modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
  
  [Service]
  Type=oneshot
diff --git a/debian/patches/lp1979951-network-do-not-remove-localhost-address.patch b/debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
new file mode 100644
index 0000000..8577ef1
--- /dev/null
+++ b/debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
@@ -0,0 +1,69 @@
+From: Yu Watanabe <[e-mail]>
+Date: Mon, 31 Jan 2022 19:26:51 +0900
+Subject: network: do not remove localhost address
+
+Origin: upstream, https://github.com/systemd/systemd/commit/b69bfa43052586cd6894c32d7d3d447195539ec5
+Bug-Ubuntu: https://launchpad.net/bugs/1979951
+
+The original commit was modified to apply to v245, i.e. before link_drop_foreign_addresses existed.
+
+---
+Managing loopback interfaces by networkd is not recommended, but supporeted.
+Even such spurious situation, do not drop the localhost addresses.
+---
+ src/basic/in-addr-util.c    | 13 +++++++++++++
+ src/basic/in-addr-util.h    |  1 +
+ src/network/networkd-link.c |  4 ++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
+index bfe855f..e8c6f41 100644
+--- a/src/basic/in-addr-util.c
++++ b/src/basic/in-addr-util.c
+@@ -92,6 +92,19 @@ int in_addr_is_localhost(int family, const union in_addr_union *u) {
+         return -EAFNOSUPPORT;
+ }
+ 
++int in_addr_is_localhost_one(int family, const union in_addr_union *u) {
++        assert(u);
++
++        if (family == AF_INET)
++                /* 127.0.0.1 */
++                return be32toh(u->in.s_addr) == UINT32_C(0x7F000001);
++
++        if (family == AF_INET6)
++                return IN6_IS_ADDR_LOOPBACK(&u->in6); /* lgtm [cpp/potentially-dangerous-function] */
++
++        return -EAFNOSUPPORT;
++}
++
+ bool in4_addr_equal(const struct in_addr *a, const struct in_addr *b) {
+         assert(a);
+         assert(b);
+diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
+index ae2dad0..5a6d17a 100644
+--- a/src/basic/in-addr-util.h
++++ b/src/basic/in-addr-util.h
+@@ -29,6 +29,7 @@ int in_addr_is_link_local(int family, const union in_addr_union *u);
+ 
+ bool in4_addr_is_localhost(const struct in_addr *a);
+ int in_addr_is_localhost(int family, const union in_addr_union *u);
++int in_addr_is_localhost_one(int family, const union in_addr_union *u);
+ 
+ bool in4_addr_is_non_local(const struct in_addr *a);
+ 
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 5a223c1..6f3096c 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -2610,6 +2610,10 @@ static int link_drop_foreign_config(Link *link) {
+                 if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link))
+                         continue;
+ 
++                /* Do not remove localhost address (127.0.0.1 and ::1) */
++                if (link->flags & IFF_LOOPBACK && in_addr_is_localhost_one(address->family, &address->in_addr) > 0)
++                        continue;
++
+                 if (link_address_is_dynamic(link, address)) {
+                         if (link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP))
+                                 continue;
diff --git a/debian/patches/series b/debian/patches/series
index 56ece03..d1d0127 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -178,3 +178,4 @@ lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
 lp1959475-core-make-sure-we-don-t-get-confused-when-setting-TERM-fo.patch
 lp1966800-shared-calendarspec-when-mktime-moves-us-backwards-jump-f.patch
 lp1978079-efi-pstore-not-cleared-on-boot.patch
+lp1979951-network-do-not-remove-localhost-address.patch