libre/systemd: Re-generate the FSDG patches

9 files changed, 136 insertions, 137 deletions

diff --git a/libre/systemd/.SRCINFO b/libre/systemd/.SRCINFO
index d85ddca25..f320087f2 100644
--- a/libre/systemd/.SRCINFO
+++ b/libre/systemd/.SRCINFO
@@ -83,13 +83,13 @@ pkgbase = systemd
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
-	sha512sums = a277bef64318f91747b8b9c74282e6f346690712ed7296d102688173409f7987673619fb44f3c6609bd38781d382871f56a89be771279e610a5437520183c9b9
-	sha512sums = 21e30bedbfa326af04dc73d0281d01d069b6287b45dbb49b7b93d1bceb6c030532e1739b83ed425c20d0deba0a824f0f3147d1e8c3d26206c8edc541e3fc32b6
-	sha512sums = 730014c3ce5e9526075569641efadec6acf75df5a88e26b83420b130399f3ba8b6a23d778e7221abe8bfd9e54457562905fa068911be5078ac3cd993dad468a5
-	sha512sums = f24191e6331b58dc4f1c1b7b28b854ba94c6de53b2dc97e5721c208abe7543efab4b8519013bdb02ebeb5058dd5c56a8318bf99a972772de188b40861c88e349
-	sha512sums = c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be
-	sha512sums = 347d5c7b7e809191588e97638b2792edb40cec6c20f1983920f0a66b0acc7ef77d30c6d45f730c0e70b2af0f9851d16d2c1838a52b0d9b6b3344be3c8815f823
-	sha512sums = 9786edfa655c7400aba362f5fabb93df33e23dfb86e9820585943467f4918937f30e4d9daa74538321a288c2611dda95b700efae14719d34dac6d79eab537a60
+	sha512sums = 52e607f5b11e66ad71333c1b03119575b1018c74df4e98376c28e59a21a348e3010d95863d818fdd5175acccbd627047a70a579671909288e10d28b247e494ca
+	sha512sums = 0e87e6770343e9c1a1b57548c8d9d985df1d3be60e6199825e61ce5c1321cb1924db81feea099bba8cb94fdce9d1ca7f41b0c030d681a9453d5d5bad05cffc25
+	sha512sums = 0f571decd80622feffa6fe694ba33628a1c2f62db3a83bf03b5e3fc720b25f91567c5a0412aaebc554cd5ad889b63ded404cb7b2eb217677b070e0527bf302a2
+	sha512sums = 9ba07104a1b26f736274813624b08e59f3e5a9035e6277f566a1d012372d1d60fe9ffbeff1b24e0319133d175e5e65caa99a71eaa213372486fa1edb1145c4a3
+	sha512sums = e8576f581dc6706bdd495128972d2ac90acf76a15117d67b792fb9ad5a2dd5597c96338965632857085ddd8362c9cb022d180f4aa29a026f953236d01756dbca
+	sha512sums = 6c7c10cbded0e75677064a6c5fb4e79c21b0fea167104a95b65a856cd255f8d73e2b706ddbee86b357c35440f32e1f390217a85e41a10302955023df825e1017
+	sha512sums = 73fd324d90c8f86596544ce16d2571b510e4d97a2fdf1e11fd73c9408bafb3938ece4b6e4b4fccfca40856172b010b9a7ad116da7c8738cf9673b676e8525edd
 	sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
 	sha512sums = c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b
 	sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
index 6c62744b3..5da3767dc 100644
--- a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
+++ b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
@@ -1,4 +1,4 @@
-From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001
+From 1cc4d5dc91d40549520370131909f50887a25f12 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:19:20 -0400
 Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux
@@ -12,7 +12,6 @@ are not included in this commit.
  man/journald.conf.xml            | 2 +-
  man/machinectl.xml               | 2 +-
  man/sd-bus-errors.xml            | 2 +-
- man/sd-login.xml                 | 2 +-
  man/sd_bus_error_add_map.xml     | 2 +-
  man/sd_uid_get_state.xml         | 2 +-
  man/systemd-detect-virt.xml      | 4 ++--
@@ -20,14 +19,14 @@ are not included in this commit.
  man/systemd-resolved.service.xml | 6 +++---
  man/systemd.exec.xml             | 2 +-
  man/systemd.socket.xml           | 2 +-
- man/systemd.xml                  | 6 +++---
- 13 files changed, 19 insertions(+), 19 deletions(-)
+ man/systemd.xml                  | 4 ++--
+ 12 files changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/man/daemon.xml b/man/daemon.xml
-index 36c7c09db1..730507ed7e 100644
+index db95d2f75b..850b333ccf 100644
 --- a/man/daemon.xml
 +++ b/man/daemon.xml
-@@ -144,7 +144,7 @@
+@@ -142,7 +142,7 @@
      <refsect2>
        <title>New-Style Daemons</title>
  
@@ -36,7 +35,7 @@ index 36c7c09db1..730507ed7e 100644
        new-style daemons. This makes it easier to supervise and control
        them at runtime and simplifies their implementation.</para>
  
-@@ -285,7 +285,7 @@
+@@ -287,7 +287,7 @@
        as detailed in the <ulink
        url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
        Linux Standard Base Core Specification</ulink>. This method of
@@ -46,23 +45,23 @@ index 36c7c09db1..730507ed7e 100644
        scripts have the disadvantage of involving shell scripts in the
        boot process. New-style init systems generally employ updated
 diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index ee8e8b7faf..28324ac102 100644
+index 50c33e4792..a17389c7dc 100644
 --- a/man/journald.conf.xml
 +++ b/man/journald.conf.xml
-@@ -111,7 +111,7 @@
+@@ -129,7 +129,7 @@
          <term><varname>SplitMode=</varname></term>
  
          <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
 -        <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
 +        <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access
          control is managed per file, and the journal daemon will assign users read access to their journal files. If
-         <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to
-         the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are
+         <literal>uid</literal>, all regular users (with UID outside the range of system users, dynamic service users,
+         and the nobody user) will each get their own journal files, and system users will log to the system journal.
 diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 37e51f90cf..08f4d938b3 100644
+index 2ecbe0f0ab..dfba772eb3 100644
 --- a/man/machinectl.xml
 +++ b/man/machinectl.xml
-@@ -852,7 +852,7 @@
+@@ -854,7 +854,7 @@
      <para>The <command>machinectl</command> tool operates on machines
      and images whose names must be chosen following strict
      rules. Machine names must be suitable for use as hostnames
@@ -72,10 +71,10 @@ index 37e51f90cf..08f4d938b3 100644
      non-empty label strings, separated by dots. No leading or trailing
      dots are allowed. No sequences of multiple dots are allowed. The
 diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
-index c834bde292..fdd2261fe9 100644
+index f3b1515c78..55ab2f8668 100644
 --- a/man/sd-bus-errors.xml
 +++ b/man/sd-bus-errors.xml
-@@ -102,7 +102,7 @@
+@@ -100,7 +100,7 @@
  
      <para>In addition to this list, in sd-bus, the special error
      namespace <literal>System.Error.</literal> is used to map
@@ -85,10 +84,10 @@ index c834bde292..fdd2261fe9 100644
      to D-Bus errors and back. For example, the error
      <constant>EUCLEAN</constant> is mapped to
 diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
-index 3eacbab660..b4b3b1bd17 100644
+index a49b554459..838c183855 100644
 --- a/man/sd_bus_error_add_map.xml
 +++ b/man/sd_bus_error_add_map.xml
-@@ -58,7 +58,7 @@
+@@ -56,7 +56,7 @@
  
      <para>The <function>sd_bus_error_add_map()</function> call may be
      used to register additional mappings for converting D-Bus errors
@@ -98,7 +97,7 @@ index 3eacbab660..b4b3b1bd17 100644
      <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
      or
 diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
-index 2d6fb0c8a3..58586018d6 100644
+index 087a2d539d..1170f3ea0a 100644
 --- a/man/sd_uid_get_state.xml
 +++ b/man/sd_uid_get_state.xml
 @@ -163,7 +163,7 @@
@@ -111,10 +110,10 @@ index 2d6fb0c8a3..58586018d6 100644
          </varlistentry>
  
 diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
-index c4763fd561..54bba23666 100644
+index a92d83fe29..c03e08c61d 100644
 --- a/man/systemd-detect-virt.xml
 +++ b/man/systemd-detect-virt.xml
-@@ -133,12 +133,12 @@
+@@ -155,12 +155,12 @@
  
            <row>
              <entry><varname>lxc</varname></entry>
@@ -130,7 +129,7 @@ index c4763fd561..54bba23666 100644
  
            <row>
 diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index 7caf35f8e8..18d9c5a33b 100644
+index f1695b6ddb..8bfb72f55d 100644
 --- a/man/systemd-machine-id-setup.xml
 +++ b/man/systemd-machine-id-setup.xml
 @@ -55,7 +55,7 @@
@@ -141,9 +140,9 @@ index 7caf35f8e8..18d9c5a33b 100644
 +      <listitem><para>Similarly, if run inside a container environment and a UUID is configured for the
        container, this is used to initialize the machine ID. For details, see the documentation of the <ulink
        url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem>
-
+ 
 diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
-index 914607e3f8..3274881ca6 100644
+index 7003c36db7..50577843cb 100644
 --- a/man/systemd-resolved.service.xml
 +++ b/man/systemd-resolved.service.xml
 @@ -49,7 +49,7 @@
@@ -155,7 +154,7 @@ index 914607e3f8..3274881ca6 100644
        expose DNSSEC validation status information however, and is synchronous only. This API is backed by the
        glibc Name Service Switch
        (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
-@@ -315,7 +315,7 @@
+@@ -321,7 +321,7 @@ search foobar.com barbar.com
      <itemizedlist>
        <listitem><para><command>systemd-resolved</command> maintains the
        <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional
@@ -164,7 +163,7 @@ index 914607e3f8..3274881ca6 100644
        contains a list of search domains that are in use by systemd-resolved. The list of search domains is
        always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not
        be used directly by applications, but only through a symlink from
-@@ -331,7 +331,7 @@
+@@ -337,7 +337,7 @@ search foobar.com barbar.com
        </para></listitem>
  
        <listitem><para><command>systemd-resolved</command> maintains the
@@ -174,10 +173,10 @@ index 914607e3f8..3274881ca6 100644
        up-to-date, containing information about all known DNS servers. Note the file format's limitations: it
        does not know a concept of per-interface DNS servers and hence only contains system-wide DNS server
 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 3bd790b485..a532b74a6e 100644
+index bad21ceb0c..81abe6dcb2 100644
 --- a/man/systemd.exec.xml
 +++ b/man/systemd.exec.xml
-@@ -223,7 +223,7 @@
+@@ -517,7 +517,7 @@
          <literal>-</literal>, except for the first character which must be one of a-z, A-Z and
          <literal>_</literal> (i.e. digits and <literal>-</literal> are not permitted as first character). The
          user/group name must have at least one character, and at most 31. These restrictions are made in
@@ -187,10 +186,10 @@ index 3bd790b485..a532b74a6e 100644
          url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para>
  
 diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 520a906249..e4ce5b843b 100644
+index 1f1f99800f..086cab483e 100644
 --- a/man/systemd.socket.xml
 +++ b/man/systemd.socket.xml
-@@ -288,7 +288,7 @@
+@@ -292,7 +292,7 @@
          project='man-pages'><refentrytitle>mq_overview</refentrytitle><manvolnum>7</manvolnum></citerefentry>
          for details). This expects a valid message queue name (i.e. beginning with
          <literal>/</literal>). Behavior otherwise is very similar to the <varname>ListenFIFO=</varname>
@@ -200,7 +199,7 @@ index 520a906249..e4ce5b843b 100644
        </varlistentry>
  
 diff --git a/man/systemd.xml b/man/systemd.xml
-index 28bf49e131..5cfd0de31a 100644
+index 1a68301d50..3aec7bc926 100644
 --- a/man/systemd.xml
 +++ b/man/systemd.xml
 @@ -37,7 +37,7 @@
@@ -212,7 +211,7 @@ index 28bf49e131..5cfd0de31a 100644
      boot (as PID 1), it acts as init system that brings up and maintains userspace services. Separate
      instances are started for logged-in users to start their services.</para>
  
-@@ -744,7 +744,7 @@
+@@ -745,7 +745,7 @@
  
      <para>When run as the system instance, systemd parses a number of options listed below. They can be
      specified as kernel command line arguments which are parsed from a number of sources depending on the
@@ -221,7 +220,6 @@ index 28bf49e131..5cfd0de31a 100644
      the command line arguments passed to systemd itself, next to any of the command line options listed in
      the Options section above. If run outside of Linux containers, these arguments are parsed from
      <filename>/proc/cmdline</filename> and from the <literal>SystemdOptions</literal> EFI variable
- 
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
index b0872867f..cc344fa32 100644
--- a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
+++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
@@ -1,4 +1,4 @@
-From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001
+From 25576ff4a4b0bad85e6cbce92f72d5bf9af842ce Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:23:40 -0400
 Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
@@ -7,16 +7,15 @@ Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
 ---
  man/kernel-install.xml                       | 2 +-
  man/os-release.xml                           | 2 +-
- src/analyze/analyze.c                        | 2 +-
  src/basic/os-util.c                          | 2 +-
  src/kernel-install/90-loaderentry.install.in | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ 4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index 34bb5d2f1e..d22945b5c4 100644
+index e50aeee949..449529a31b 100644
 --- a/man/kernel-install.xml
 +++ b/man/kernel-install.xml
-@@ -100,7 +100,7 @@
+@@ -105,7 +105,7 @@
              <filename>$BOOT/loader/entries/<replaceable>ENTRY-TOKEN</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.
              The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in
              <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former
@@ -24,12 +23,12 @@ index 34bb5d2f1e..d22945b5c4 100644
 +            is missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>
  
              <para>If <varname>$KERNEL_INSTALL_LAYOUT</varname> is not "bls", this plugin does nothing.</para></listitem>
-           </itemizedlist>
+ 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 5a5e318f75..1afaa679c9 100644
+index 113ef9fc18..f1c5fb5e56 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -153,7 +153,7 @@
+@@ -183,7 +183,7 @@
  
            <listitem><para>A pretty operating system name in a format suitable for presentation to the
            user. May or may not contain a release code name or OS version of some kind, as suitable. If not
@@ -50,10 +49,10 @@ index bf844e5b7f..72a70e9314 100644
 +                empty_to_null(name) ?: "GNU/Linux";
  }
 diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in
-index 47a0cd224a..9ff48a9d5c 100644
+index e8e8cf37c3..47d4e30a9b 100755
 --- a/src/kernel-install/90-loaderentry.install.in
 +++ b/src/kernel-install/90-loaderentry.install.in
-@@ -60,7 +60,7 @@
+@@ -66,7 +66,7 @@ elif [ -f /usr/lib/os-release ]; then
      . /usr/lib/os-release
  fi
  
@@ -63,5 +62,5 @@ index 47a0cd224a..9ff48a9d5c 100644
  SORT_KEY="$IMAGE_ID"
  [ -z "$SORT_KEY" ] && SORT_KEY="$ID"
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
index 807496892..3753ad0d0 100644
--- a/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
+++ b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
@@ -1,18 +1,18 @@
-From a6be5d2b2cd02f302ef70c76b601e7af912c3022 Mon Sep 17 00:00:00 2001
+From eaa1a0fe805213be13db72f1f7008340c41f53b4 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:24:56 -0400
 Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of
  "Linux"
 
 ---
- man/os-release.xml                    | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ man/os-release.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 9ff4b7e8c2..1c069275c8 100644
+index f1c5fb5e56..6352a5288a 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -110,7 +110,7 @@
+@@ -139,7 +139,7 @@
            <term><varname>NAME=</varname></term>
  
            <listitem><para>A string identifying the operating system, without a version component, and
@@ -22,5 +22,5 @@ index 9ff4b7e8c2..1c069275c8 100644
  
            <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>.
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
index 2a5130243..5a73688ba 100644
--- a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
+++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
@@ -1,4 +1,4 @@
-From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 Mon Sep 17 00:00:00 2001
+From 53e55360f909b054d2d389261bceb072dadd3d23 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:28:30 -0400
 Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of
@@ -11,10 +11,10 @@ field, so this is just a man page change.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 1c069275c8..272258b4e1 100644
+index 6352a5288a..e0e1724a16 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -148,7 +148,7 @@
+@@ -152,7 +152,7 @@
            <listitem><para>A lower-case string (no spaces or other characters outside of 0–9, a–z, ".", "_"
            and "-") identifying the operating system, excluding any version information and suitable for
            processing by scripts or usage in generated filenames. If not set, a default of
@@ -24,5 +24,5 @@ index 1c069275c8..272258b4e1 100644
  
            <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem>
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
index 2c38cc7e3..655045885 100644
--- a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
+++ b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
@@ -1,4 +1,4 @@
-From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001
+From d1a98f85e13118c4f6ab81f5d854429034629f9e Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:31:20 -0400
 Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
@@ -9,10 +9,10 @@ Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
-index 01372fc66b..9155ce5c2e 100644
+index 6c6c98566f..be7830289b 100644
 --- a/src/resolve/resolved-manager.c
 +++ b/src/resolve/resolved-manager.c
-@@ -388,7 +388,7 @@
+@@ -370,7 +370,7 @@ static int determine_hostnames(char **full_hostname, char **llmnr_hostname, char
  static char* fallback_hostname(void) {
  
          /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it
@@ -21,7 +21,7 @@ index 01372fc66b..9155ce5c2e 100644
           * instead. */
  
          _cleanup_free_ char *n = get_default_hostname();
-@@ -396,7 +396,7 @@
+@@ -378,7 +378,7 @@ static char* fallback_hostname(void) {
                  return NULL;
  
          if (is_localhost(n))
@@ -31,5 +31,5 @@ index 01372fc66b..9155ce5c2e 100644
          return TAKE_PTR(n);
  }
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
index cd3c26d5b..06818f5f8 100644
--- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
+++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
@@ -1,19 +1,58 @@
-From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001
+From 68dc7c247a7e279c75d4be3407cf45d0a7d03c65 Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Wed, 25 May 2016 12:32:21 -0400
 Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples
 
 ---
- man/os-release.xml     | 49 +++++++++++++++++++++--------------------
- man/systemd-nspawn.xml | 50 +++++++++++++++++++++++-------------------
- 2 files changed, 52 insertions(+), 47 deletions(-)
+ man/custom-entities.ent.in |  3 +--
+ man/machinectl.xml         |  4 ++-
+ man/os-release.xml         | 50 ++++++++++++++++--------------------
+ man/systemd-nspawn.xml     | 52 ++++++++++++++++++++------------------
+ 4 files changed, 53 insertions(+), 56 deletions(-)
 
+diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
+index 0376e0feb9..7b86b76ca2 100644
+--- a/man/custom-entities.ent.in
++++ b/man/custom-entities.ent.in
+@@ -17,5 +17,4 @@
+ <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">
+ <!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s">
+ <!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s">
+-<!ENTITY fedora_latest_version "36">
+-<!ENTITY fedora_cloud_release "1.5">
++<!ENTITY blag_latest_version "140">
+diff --git a/man/machinectl.xml b/man/machinectl.xml
+index dfba772eb3..a2a08a025d 100644
+--- a/man/machinectl.xml
++++ b/man/machinectl.xml
+@@ -939,11 +939,12 @@
+       to open a shell in it.</para>
+     </example>
+ 
++<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.
+     <example>
+       <title>Download a Fedora image, set a root password in it, start
+       it as a service</title>
+ 
+-      <programlisting># machinectl pull-raw --verify=no \
++      <programlisting># machinectl pull-raw -&2D;verify=no \
+       https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \
+       Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64
+ # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64
+@@ -958,6 +959,7 @@
+       the machine started as system service. With the last command a
+       login prompt into the container is requested.</para>
+     </example>
++-->
+ 
+     <example>
+       <title>Exports a container image as tar file</title>
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 272258b4e1..6cea40cb99 100644
+index e0e1724a16..4118b59d34 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -113,7 +113,7 @@
-           suitable for presentation to the user. If not set, a default of <literal>NAME=Linux</literal> may
+@@ -142,7 +142,7 @@
+           suitable for presentation to the user. If not set, a default of <literal>NAME=GNU/Linux</literal> may
            be used.</para>
  
 -          <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>.
@@ -21,16 +60,16 @@ index 272258b4e1..6cea40cb99 100644
            </para></listitem>
          </varlistentry>
  
-@@ -125,7 +125,7 @@
-           processing by scripts or usage in generated filenames. If not set, a default of
-           <literal>ID=linux</literal> may be used.</para>
+@@ -155,7 +155,7 @@
+           <literal>ID=gnu-linux</literal> may be used. Note that even though this string may not include
+           characters that require shell quoting, quoting may nevertheless be used.</para>
  
 -          <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem>
 +          <para>Examples: <literal>ID=blag</literal>, <literal>ID=gnewsense</literal>.</para></listitem>
          </varlistentry>
  
          <varlistentry>
-@@ -142,9 +142,9 @@
+@@ -172,9 +172,9 @@
            closely the local operating system relates to the listed ones, starting with the closest. This
            field is optional.</para>
  
@@ -42,16 +81,16 @@ index 272258b4e1..6cea40cb99 100644
            </para></listitem>
          </varlistentry>
  
-@@ -155,7 +155,7 @@
+@@ -185,7 +185,7 @@
            user. May or may not contain a release code name or OS version of some kind, as suitable. If not
-           set, a default of <literal>PRETTY_NAME="Linux"</literal> may be used</para>
+           set, a default of <literal>PRETTY_NAME="GNU/Linux"</literal> may be used</para>
  
 -          <para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem>
 +          <para>Example: <literal>PRETTY_NAME="BLAG 210k (Spartakus)"</literal>.</para></listitem>
          </varlistentry>
  
          <varlistentry>
-@@ -165,7 +165,7 @@
+@@ -195,7 +195,7 @@
            url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as
            proposed by the NIST. This field is optional.</para>
  
@@ -60,7 +99,7 @@ index 272258b4e1..6cea40cb99 100644
          </varlistentry>
  
          <varlistentry>
-@@ -208,7 +208,7 @@
+@@ -238,7 +238,7 @@
            information, possibly including a release code name, and suitable for presentation to the
            user. This field is optional.</para>
  
@@ -69,7 +108,7 @@ index 272258b4e1..6cea40cb99 100644
            </para></listitem>
          </varlistentry>
  
-@@ -220,7 +220,7 @@
+@@ -250,7 +250,7 @@
            or release code name, and suitable for processing by scripts or usage in generated filenames. This
            field is optional.</para>
  
@@ -78,7 +117,7 @@ index 272258b4e1..6cea40cb99 100644
            </para></listitem>
          </varlistentry>
  
-@@ -316,7 +316,7 @@
+@@ -346,7 +346,7 @@
            need to be referenced, it is recommended to provide an online landing page linking all available
            resources.</para>
  
@@ -87,7 +126,7 @@ index 272258b4e1..6cea40cb99 100644
            <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal>.</para></listitem>
          </varlistentry>
  
-@@ -415,25 +415,19 @@
+@@ -493,25 +493,19 @@
      <example>
        <title><filename>os-release</filename> file for Fedora Workstation</title>
  
@@ -127,10 +166,10 @@ index 272258b4e1..6cea40cb99 100644
  
      <example>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 588924ee61..34ff6a7e96 100644
+index e2c751692f..1b0ca65e4b 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
-@@ -1628,11 +1628,12 @@
+@@ -1638,11 +1638,12 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
    <refsect1>
      <title>Examples</title>
  
@@ -144,7 +183,7 @@ index 588924ee61..34ff6a7e96 100644
        https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \
        Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64
  # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64</programlisting>
-@@ -1641,37 +1642,36 @@
+@@ -1651,37 +1652,36 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -197,7 +236,7 @@ index 588924ee61..34ff6a7e96 100644
        out of the box, so the same command can be used to install any of those. For other
        distributions from the Debian family, a mirror has to be specified, see
        <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-@@ -1680,29 +1680,31 @@
+@@ -1690,29 +1690,31 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
  
      <example>
        <title>Boot a minimal
@@ -237,43 +276,6 @@ index 588924ee61..34ff6a7e96 100644
  
      <example>
        <title>Boot into an ephemeral snapshot of the host system</title>
-diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
-index 9963322fc9..4b71a4ab8f 100644
---- a/man/custom-entities.ent.in
-+++ b/man/custom-entities.ent.in
-@@ -17,5 +17,4 @@
- <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">
- <!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s">
- <!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s">
--<!ENTITY fedora_latest_version "36">
--<!ENTITY fedora_cloud_release "1.5">
-+<!ENTITY blag_latest_version "140">
-diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 9026849559..7b3b130763 100644
---- a/man/machinectl.xml
-+++ b/man/machinectl.xml
-@@ -940,11 +940,12 @@
-       to open a shell in it.</para>
-     </example>
- 
-+<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.
-     <example>
-       <title>Download a Fedora image, set a root password in it, start
-       it as a service</title>
- 
--      <programlisting># machinectl pull-raw --verify=no \
-+      <programlisting># machinectl pull-raw -&2D;verify=no \
-       https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \
-       Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64
- # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64
-@@ -959,6 +960,7 @@
-       the machine started as system service. With the last command a
-       login prompt into the container is requested.</para>
-     </example>
-+-->
- 
-     <example>
-       <title>Exports a container image as tar file</title>
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
index cd328e9f0..621a1181b 100644
--- a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
+++ b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
@@ -1,12 +1,12 @@
-From 31e5d50f17d3993839d8f7c9f344a620e3871812 Mon Sep 17 00:00:00 2001
+From 93acf8d3c8c4650ada73119508d703fe1dcb142e Mon Sep 17 00:00:00 2001
 From: Luke Shumaker <lukeshu@parabola.nu>
 Date: Sat, 17 Dec 2016 00:56:43 -0500
 Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of
  "Linux Boot Manager"
 
 ---
- src/boot/bootctl-install.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/boot/bootctl-install.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c
 index c795e75bc3..c373b30241 100644
@@ -22,5 +22,5 @@ index c795e75bc3..c373b30241 100644
  
  static int install_variables(
 -- 
-2.18.0
+2.43.0
 
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index f98f7dff2..57284fe27 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -136,13 +136,13 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
 sha512sums=('SKIP'
             'SKIP'
             '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
-            'a277bef64318f91747b8b9c74282e6f346690712ed7296d102688173409f7987673619fb44f3c6609bd38781d382871f56a89be771279e610a5437520183c9b9'
-            '21e30bedbfa326af04dc73d0281d01d069b6287b45dbb49b7b93d1bceb6c030532e1739b83ed425c20d0deba0a824f0f3147d1e8c3d26206c8edc541e3fc32b6'
-            '730014c3ce5e9526075569641efadec6acf75df5a88e26b83420b130399f3ba8b6a23d778e7221abe8bfd9e54457562905fa068911be5078ac3cd993dad468a5'
-            'f24191e6331b58dc4f1c1b7b28b854ba94c6de53b2dc97e5721c208abe7543efab4b8519013bdb02ebeb5058dd5c56a8318bf99a972772de188b40861c88e349'
-            'c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be'
-            '347d5c7b7e809191588e97638b2792edb40cec6c20f1983920f0a66b0acc7ef77d30c6d45f730c0e70b2af0f9851d16d2c1838a52b0d9b6b3344be3c8815f823'
-            '9786edfa655c7400aba362f5fabb93df33e23dfb86e9820585943467f4918937f30e4d9daa74538321a288c2611dda95b700efae14719d34dac6d79eab537a60'
+            '52e607f5b11e66ad71333c1b03119575b1018c74df4e98376c28e59a21a348e3010d95863d818fdd5175acccbd627047a70a579671909288e10d28b247e494ca'
+            '0e87e6770343e9c1a1b57548c8d9d985df1d3be60e6199825e61ce5c1321cb1924db81feea099bba8cb94fdce9d1ca7f41b0c030d681a9453d5d5bad05cffc25'
+            '0f571decd80622feffa6fe694ba33628a1c2f62db3a83bf03b5e3fc720b25f91567c5a0412aaebc554cd5ad889b63ded404cb7b2eb217677b070e0527bf302a2'
+            '9ba07104a1b26f736274813624b08e59f3e5a9035e6277f566a1d012372d1d60fe9ffbeff1b24e0319133d175e5e65caa99a71eaa213372486fa1edb1145c4a3'
+            'e8576f581dc6706bdd495128972d2ac90acf76a15117d67b792fb9ad5a2dd5597c96338965632857085ddd8362c9cb022d180f4aa29a026f953236d01756dbca'
+            '6c7c10cbded0e75677064a6c5fb4e79c21b0fea167104a95b65a856cd255f8d73e2b706ddbee86b357c35440f32e1f390217a85e41a10302955023df825e1017'
+            '73fd324d90c8f86596544ce16d2571b510e4d97a2fdf1e11fd73c9408bafb3938ece4b6e4b4fccfca40856172b010b9a7ad116da7c8738cf9673b676e8525edd'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             'c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b'
             'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'