systemd: use unnumbered patches

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>

packages/systemd/9001-use-absolute-path-for-var-run-symlink.patch

@@ -1,7 +1,7 @@
-From 4582d854afd5b42fdc952fafd89d762dcb279da9 Mon Sep 17 00:00:00 2001
+From 2e4d5ecb4c47a9d2d20cb4de42484eda032a5262 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Mon, 3 Jan 2022 20:22:17 +0000
-Subject: [PATCH 9001/9011] use absolute path for /var/run symlink
+Subject: [PATCH] use absolute path for /var/run symlink
 
 Otherwise the symlink may be broken if /var is a bind mount from
 somewhere else.
@@ -25,5 +25,5 @@ index 557dd20..bf84f5a 100644
  d /var/log 0755 - - -
  {% if ENABLE_UTMP %}
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9002-core-add-separate-timeout-for-system-shutdown.patch

@@ -1,7 +1,7 @@
-From 71a774ad3c3dfd5f9ddb96f7b08a957144e93323 Mon Sep 17 00:00:00 2001
+From e66920d0a95a3e53b24a2f270420a85d0f2395ea Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Tue, 10 Mar 2020 20:30:10 +0000
-Subject: [PATCH 9002/9011] core: add separate timeout for system shutdown
+Subject: [PATCH] core: add separate timeout for system shutdown
 
 There is an existing setting for this (DefaultTimeoutStopUSec), but
 changing it has no effect because `reset_arguments()` is called just
@@ -13,16 +13,17 @@ services, and for cleaning up stray processes after most of userspace
 has gone away.
 
 Signed-off-by: Ben Cressey <[email protected]>
+Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
 ---
  src/basic/def.h | 3 +++
  src/core/main.c | 4 +++-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/basic/def.h b/src/basic/def.h
-index eccee3d..3f5bef5 100644
+index 2b4de29..22034c7 100644
 --- a/src/basic/def.h
 +++ b/src/basic/def.h
-@@ -13,6 +13,9 @@
+@@ -18,6 +18,9 @@
   * the watchdog pings will keep the loop busy. */
  #define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
 
@@ -33,34 +34,34 @@ index eccee3d..3f5bef5 100644
  #define DEFAULT_UNIX_MAX_DGRAM_QLEN 512UL
 
 diff --git a/src/core/main.c b/src/core/main.c
-index 57aedb9..45fc78c 100644
+index a84fafa..0981742 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -131,6 +131,7 @@ static ExecOutput arg_default_std_error;
+@@ -133,6 +133,7 @@ static ExecOutput arg_default_std_error;
  static usec_t arg_default_restart_usec;
  static usec_t arg_default_timeout_start_usec;
  static usec_t arg_default_timeout_stop_usec;
 +static usec_t arg_default_timeout_shutdown_usec;
  static usec_t arg_default_timeout_abort_usec;
+ static usec_t arg_default_device_timeout_usec;
  static bool arg_default_timeout_abort_set;
- static usec_t arg_default_start_limit_interval;
-@@ -1552,7 +1553,7 @@ static int become_shutdown(
+@@ -1492,7 +1493,7 @@ static int become_shutdown(
          env_block = strv_copy(environ);
 
-         xsprintf(log_level, "%d", log_get_max_level());
--        xsprintf(timeout, "%" PRI_USEC "us", arg_default_timeout_stop_usec);
-+        xsprintf(timeout, "%" PRI_USEC "us", arg_default_timeout_shutdown_usec);
+         xsprintf(log_level, "--log-level=%d", log_get_max_level());
+-        xsprintf(timeout, "--timeout=%" PRI_USEC "us", arg_default_timeout_stop_usec);
++        xsprintf(timeout, "--timeout=%" PRI_USEC "us", arg_default_timeout_shutdown_usec);
 
          switch (log_get_target()) {
 
-@@ -2443,6 +2444,7 @@ static void reset_arguments(void) {
+@@ -2410,6 +2411,7 @@ static void reset_arguments(void) {
          arg_default_restart_usec = DEFAULT_RESTART_USEC;
          arg_default_timeout_start_usec = DEFAULT_TIMEOUT_USEC;
          arg_default_timeout_stop_usec = DEFAULT_TIMEOUT_USEC;
 +        arg_default_timeout_shutdown_usec = DEFAULT_TIMEOUT_SHUTDOWN_USEC;
          arg_default_timeout_abort_usec = DEFAULT_TIMEOUT_USEC;
          arg_default_timeout_abort_set = false;
-         arg_default_start_limit_interval = DEFAULT_START_LIMIT_INTERVAL;
+         arg_default_device_timeout_usec = DEFAULT_TIMEOUT_USEC;
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9003-machine-id-setup-generate-stable-ID-under-Xen-and-VM.patch

@@ -1,30 +1,30 @@
-From 95824ee80743b604e4b1757818f1ea7bf2971462 Mon Sep 17 00:00:00 2001
+From dd1d0221bb0ff143277faa4a7341e290a3941587 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Mon, 3 Jan 2022 21:57:11 +0000
-Subject: [PATCH 9003/9011] machine-id-setup: generate stable ID under Xen and
- VMware
+Subject: [PATCH] machine-id-setup: generate stable ID under Xen and VMware
 
 Signed-off-by: Ben Cressey <[email protected]>
+Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
 ---
  src/libsystemd/sd-id128/id128-util.c | 2 ++
  src/shared/machine-id-setup.c        | 3 ++-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c
-index 7c66d1c..edfebcb 100644
+index 2cf8848..fd011a1 100644
 --- a/src/libsystemd/sd-id128/id128-util.c
 +++ b/src/libsystemd/sd-id128/id128-util.c
-@@ -220,6 +220,8 @@ int id128_get_product(sd_id128_t *ret) {
-         r = id128_read("/sys/class/dmi/id/product_uuid", ID128_UUID, &uuid);
+@@ -184,6 +184,8 @@ int id128_get_product(sd_id128_t *ret) {
+         r = id128_read("/sys/class/dmi/id/product_uuid", ID128_FORMAT_UUID, &uuid);
          if (r == -ENOENT)
-                 r = id128_read("/proc/device-tree/vm,uuid", ID128_UUID, &uuid);
+                 r = id128_read("/proc/device-tree/vm,uuid", ID128_FORMAT_UUID, &uuid);
 +        if (r == -ENOENT)
-+                r = id128_read("/sys/hypervisor/uuid", ID128_UUID, &uuid);
++                r = id128_read("/sys/hypervisor/uuid", ID128_FORMAT_UUID, &uuid);
          if (r < 0)
                  return r;
 
 diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c
-index e483675..809f1bc 100644
+index 787c076..eccb332 100644
 --- a/src/shared/machine-id-setup.c
 +++ b/src/shared/machine-id-setup.c
 @@ -60,7 +60,8 @@ static int generate_machine_id(const char *root, sd_id128_t *ret) {
@@ -38,5 +38,5 @@ index e483675..809f1bc 100644
                          /* If we are not running in a container, see if we are running in a VM that provides
                           * a system UUID via the SMBIOS/DMI interfaces.  Such environments include QEMU/KVM
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9004-units-mount-tmp-with-noexec.patch

@@ -1,7 +1,7 @@
-From e02f2a077e97a4f73697ef9a6769e41401b1ca97 Mon Sep 17 00:00:00 2001
+From d9eb89767267d43f13c30ce74f6e9c34c4000274 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Sat, 28 May 2022 03:52:28 +0000
-Subject: [PATCH 9004/9011] units: mount /tmp with noexec
+Subject: [PATCH] units: mount /tmp with noexec
 
 Signed-off-by: Ben Cressey <[email protected]>
 ---
@@ -19,5 +19,5 @@ index 734acea..e4990b7 100644
 -Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m
 +Options=mode=1777,strictatime,nosuid,nodev,noexec,size=50%%,nr_inodes=1m
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9005-mount-setup-apply-noexec-to-more-mounts.patch

@@ -1,15 +1,15 @@
-From 5a822486905915396d27da85b336f0877e612532 Mon Sep 17 00:00:00 2001
+From e6565e7f288f84b9e5f723c55ca9e5619b0db846 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Sat, 28 May 2022 03:49:46 +0000
-Subject: [PATCH 9005/9011] mount-setup: apply noexec to more mounts
+Subject: [PATCH] mount-setup: apply noexec to more mounts
 
 Signed-off-by: Ben Cressey <[email protected]>
 ---
  src/shared/mount-setup.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
-index 7917968..debc043 100644
+index 7ba579e..03fc774 100644
 --- a/src/shared/mount-setup.c
 +++ b/src/shared/mount-setup.c
 @@ -73,18 +73,18 @@ static const MountPoint mount_table[] = {
@@ -36,5 +36,5 @@ index 7917968..debc043 100644
          { "cgroup2",     "/sys/fs/cgroup",            "cgroup2",    "nsdelegate,memory_recursiveprot",         MS_NOSUID|MS_NOEXEC|MS_NODEV,
            cg_is_unified_wanted, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE },
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9006-mount-setup-mount-etc-with-specific-label.patch

@@ -1,7 +1,7 @@
-From 2e871585a26b1f107db88a0ec0d9951735a6ec49 Mon Sep 17 00:00:00 2001
+From d45be2a1f7a2d58efff7921c350fffe8f26901a4 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Thu, 9 Jul 2020 20:00:36 +0000
-Subject: [PATCH 9006/9011] mount-setup: mount /etc with specific label
+Subject: [PATCH] mount-setup: mount /etc with specific label
 
 The filesystem is mounted after we load the SELinux policy, so we can
 apply the label we need to restrict access.
@@ -12,7 +12,7 @@ Signed-off-by: Ben Cressey <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
-index debc043..a9c00b3 100644
+index 03fc774..8a25823 100644
 --- a/src/shared/mount-setup.c
 +++ b/src/shared/mount-setup.c
 @@ -61,6 +61,8 @@ typedef struct MountPoint {
@@ -24,7 +24,7 @@ index debc043..a9c00b3 100644
  static const MountPoint mount_table[] = {
          { "proc",        "/proc",                     "proc",       NULL,                                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
            NULL,          MNT_FATAL|MNT_IN_CONTAINER|MNT_FOLLOW_SYMLINK },
-@@ -110,6 +112,8 @@ static const MountPoint mount_table[] = {
+@@ -112,6 +114,8 @@ static const MountPoint mount_table[] = {
  #endif
          { "bpf",         "/sys/fs/bpf",               "bpf",        "mode=700",                                MS_NOSUID|MS_NOEXEC|MS_NODEV,
            NULL,          MNT_NONE,                  },
@@ -34,5 +34,5 @@ index debc043..a9c00b3 100644
 
  bool mount_point_is_api(const char *path) {
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9008-pkg-config-stop-hardcoding-prefix-to-usr.patch → packages/systemd/9007-pkg-config-stop-hardcoding-prefix-to-usr.patch

@@ -1,7 +1,7 @@
-From dc6abce8797a6a2e63c4ae58218588327e73d4cb Mon Sep 17 00:00:00 2001
+From 692205df10b9a803d5324c5284605481722b27a1 Mon Sep 17 00:00:00 2001
 From: Erikson Tung <[email protected]>
 Date: Mon, 3 Jan 2022 22:07:25 +0000
-Subject: [PATCH 9008/9011] pkg-config: stop hardcoding prefix to /usr
+Subject: [PATCH] pkg-config: stop hardcoding prefix to /usr
 
 While we ensure /usr points to the sys-root at runtime, for Bottlerocket's
 packaging we need to be careful to avoid dependencies on the host OS so
@@ -11,7 +11,7 @@ the prefix needs to be configurable.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index fc0f8c3..afe7b02 100644
+index 693433b..c5ba688 100644
 --- a/src/core/systemd.pc.in
 +++ b/src/core/systemd.pc.in
 @@ -11,7 +11,7 @@
@@ -24,5 +24,5 @@ index fc0f8c3..afe7b02 100644
  rootprefix=${root_prefix}
  sysconf_dir={{SYSCONF_DIR}}
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9009-sysctl-do-not-set-rp_filter-via-wildcard.patch → packages/systemd/9008-sysctl-do-not-set-rp_filter-via-wildcard.patch

@@ -1,7 +1,7 @@
-From 0aee69ee8b337ff50d4f7723e3c93f222bf239b1 Mon Sep 17 00:00:00 2001
+From e100d5345ad9104697ece66a4d638807df74e6b8 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Mon, 21 Jun 2021 20:53:47 +0000
-Subject: [PATCH 9009/9011] sysctl: do not set rp_filter via wildcard
+Subject: [PATCH] sysctl: do not set rp_filter via wildcard
 
 The wildcard matches existing interfaces when `systemd-sysctl` runs
 at startup, but also applies to new interfaces when it is invoked by
@@ -32,5 +32,5 @@ index f41e24b..9a6ae96 100644
 
  # Do not accept source routing
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9010-sysusers-set-root-shell-to-sbin-nologin.patch → packages/systemd/9009-sysusers-set-root-shell-to-sbin-nologin.patch

@@ -1,15 +1,15 @@
-From 569fd4752f891f07643658b5d3478200346a12cb Mon Sep 17 00:00:00 2001
+From 4280d48485805d16481f63834c355e2e0c42c761 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Sat, 28 May 2022 04:12:07 +0000
-Subject: [PATCH 9010/9011] sysusers: set root shell to /sbin/nologin
+Subject: [PATCH] sysusers: set root shell to /sbin/nologin
 
 Signed-off-by: Ben Cressey <[email protected]>
 ---
  sysusers.d/basic.conf.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
-index a1af8be098..b9955c55c6 100644
+index a1af8be..b9955c5 100644
 --- a/sysusers.d/basic.conf.in
 +++ b/sysusers.d/basic.conf.in
 @@ -7,7 +7,7 @@
@@ -22,5 +22,5 @@ index a1af8be098..b9955c55c6 100644
  # The nobody user/group for NFS file systems
  g {{NOBODY_GROUP_NAME}} 65534       -            -
 -- 
-2.25.1
+2.40.1
 

packages/systemd/9011-units-keep-modprobe-service-units-running.patch → packages/systemd/9010-units-keep-modprobe-service-units-running.patch

@@ -1,7 +1,7 @@
-From 13bf60bf11edf407246176262865c8e93f66c1e8 Mon Sep 17 00:00:00 2001
+From 4444604feb71d9b31896fbf0a5bf02e8270a3411 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Sun, 17 Jul 2022 16:21:16 +0000
-Subject: [PATCH 9011/9011] units: keep modprobe service units running
+Subject: [PATCH] units: keep modprobe service units running
 
 Otherwise, the units are restarted when the default target changes.
 
@@ -11,14 +11,14 @@ Signed-off-by: Ben Cressey <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/units/[email protected] b/units/[email protected]
-index cf8baf6..a029ab0 100644
+index 85a2c08..2994082 100644
 --- a/units/[email protected]
 +++ b/units/[email protected]
-@@ -17,3 +17,4 @@ ConditionCapability=CAP_SYS_MODULE
+@@ -18,3 +18,4 @@ StartLimitIntervalSec=0
  [Service]
  Type=oneshot
  ExecStart=-/sbin/modprobe -abq %I
 +RemainAfterExit=true
 -- 
-2.36.1
+2.40.1
 

packages/systemd/9012-tmpfiles-Split-networkd-entries-into-a-separate-file.patch → packages/systemd/9011-tmpfiles-Split-networkd-entries-into-a-separate-file.patch

@@ -1,4 +1,4 @@
-From abdd268ab3c16c606a1578e5d40d5847a1d99523 Mon Sep 17 00:00:00 2001
+From 036e90b85cc26200b1887ca764f703f2a9f4fb74 Mon Sep 17 00:00:00 2001
 From: Daan De Meyer <[email protected]>
 Date: Wed, 27 Apr 2022 10:25:22 +0100
 Subject: [PATCH] tmpfiles: Split networkd entries into a separate file
@@ -15,7 +15,7 @@ into a separate file to make that possible.
  create mode 100644 tmpfiles.d/systemd-network.conf
 
 diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
-index b8d3919025..7c2604cfe1 100644
+index b8d3919..7c2604c 100644
 --- a/tmpfiles.d/meson.build
 +++ b/tmpfiles.d/meson.build
 @@ -13,6 +13,7 @@ files = [['README',               ''],
@@ -28,7 +28,7 @@ index b8d3919025..7c2604cfe1 100644
  foreach pair : files
 diff --git a/tmpfiles.d/systemd-network.conf b/tmpfiles.d/systemd-network.conf
 new file mode 100644
-index 0000000000..b30bc914a5
+index 0000000..b30bc91
 --- /dev/null
 +++ b/tmpfiles.d/systemd-network.conf
 @@ -0,0 +1,13 @@
@@ -46,7 +46,7 @@ index 0000000000..b30bc914a5
 +d /run/systemd/netif/leases 0755 systemd-network systemd-network -
 +d /run/systemd/netif/lldp 0755 systemd-network systemd-network -
 diff --git a/tmpfiles.d/systemd.conf.in b/tmpfiles.d/systemd.conf.in
-index 9b2357cd31..e23e102782 100644
+index 9b2357c..e23e102 100644
 --- a/tmpfiles.d/systemd.conf.in
 +++ b/tmpfiles.d/systemd.conf.in
 @@ -18,12 +18,6 @@ d /run/systemd/sessions 0755 root root -
@@ -63,5 +63,5 @@ index 9b2357cd31..e23e102782 100644
  d /run/log 0755 root root -
 
 -- 
-2.38.1
+2.40.1