libre/systemd: Re-generate the FSDG patch files

7 files changed, 84 insertions, 84 deletions

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 ff71a4f85..b0e9232b8 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 878ad05e921e204d05fb3005a7c0999265d20cb0 Mon Sep 17 00:00:00 2001
+From dec7ae52e9352345e5627d02676b51f2facdd488 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
@@ -24,10 +24,10 @@ are not included in this commit.
  13 files changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/man/daemon.xml b/man/daemon.xml
-index 18337daad8..ab65f6f4d9 100644
+index 36c7c09db1..730507ed7e 100644
 --- a/man/daemon.xml
 +++ b/man/daemon.xml
-@@ -170,7 +170,7 @@
+@@ -144,7 +144,7 @@
      <refsect2>
        <title>New-Style Daemons</title>
  
@@ -36,7 +36,7 @@ index 18337daad8..ab65f6f4d9 100644
        new-style daemons. This makes it easier to supervise and control
        them at runtime and simplifies their implementation.</para>
  
-@@ -311,7 +311,7 @@
+@@ -285,7 +285,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,10 +46,10 @@ index 18337daad8..ab65f6f4d9 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 844228e324..58b21d424b 100644
+index ee8e8b7faf..28324ac102 100644
 --- a/man/journald.conf.xml
 +++ b/man/journald.conf.xml
-@@ -132,7 +132,7 @@
+@@ -111,7 +111,7 @@
          <term><varname>SplitMode=</varname></term>
  
          <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
@@ -59,10 +59,10 @@ index 844228e324..58b21d424b 100644
          <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
 diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 43f4d127b8..908ee5649c 100644
+index affca1dec1..278ca8d677 100644
 --- a/man/machinectl.xml
 +++ b/man/machinectl.xml
-@@ -899,7 +899,7 @@
+@@ -867,7 +867,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 host names
@@ -72,10 +72,10 @@ index 43f4d127b8..908ee5649c 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 a655ab1d97..b1f24381dd 100644
+index c834bde292..fdd2261fe9 100644
 --- a/man/sd-bus-errors.xml
 +++ b/man/sd-bus-errors.xml
-@@ -128,7 +128,7 @@
+@@ -102,7 +102,7 @@
  
      <para>In addition to this list, in sd-bus, the special error
      namespace <literal>System.Error.</literal> is used to map
@@ -85,10 +85,10 @@ index a655ab1d97..b1f24381dd 100644
      to D-Bus errors and back. For example, the error
      <constant>EUCLEAN</constant> is mapped to
 diff --git a/man/sd-login.xml b/man/sd-login.xml
-index 148dd19cea..5b99d9e281 100644
+index 83ef0b7307..93fd9ea782 100644
 --- a/man/sd-login.xml
 +++ b/man/sd-login.xml
-@@ -270,7 +270,7 @@
+@@ -244,7 +244,7 @@
  
      <para>
        <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>
@@ -98,10 +98,10 @@ index 148dd19cea..5b99d9e281 100644
    </refsect1>
  
 diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
-index b79381fefd..072b31c7d3 100644
+index 3eacbab660..b4b3b1bd17 100644
 --- a/man/sd_bus_error_add_map.xml
 +++ b/man/sd_bus_error_add_map.xml
-@@ -84,7 +84,7 @@
+@@ -58,7 +58,7 @@
  
      <para>The <function>sd_bus_error_add_map()</function> call may be
      used to register additional mappings for converting D-Bus errors
@@ -111,10 +111,10 @@ index b79381fefd..072b31c7d3 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 1183d9079a..c8b62f7a43 100644
+index 02670e1bce..6f4ff77130 100644
 --- a/man/sd_uid_get_state.xml
 +++ b/man/sd_uid_get_state.xml
-@@ -199,7 +199,7 @@
+@@ -174,7 +174,7 @@
          <listitem><para>An input parameter was invalid (out of range,
          or NULL, where that is not accepted). This is also returned if
          the passed user ID is 0xFFFF or 0xFFFFFFFF, which are
@@ -124,10 +124,10 @@ index 1183d9079a..c8b62f7a43 100644
  
        <varlistentry>
 diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
-index 4426827e57..b59570ad2c 100644
+index c4763fd561..54bba23666 100644
 --- a/man/systemd-detect-virt.xml
 +++ b/man/systemd-detect-virt.xml
-@@ -156,12 +156,12 @@
+@@ -133,12 +133,12 @@
  
            <row>
              <entry><varname>lxc</varname></entry>
@@ -143,10 +143,10 @@ index 4426827e57..b59570ad2c 100644
  
            <row>
 diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index 527cb7bff5..8c4a62ccee 100644
+index 9e84fd8ccb..7f0dcd14d7 100644
 --- a/man/systemd-machine-id-setup.xml
 +++ b/man/systemd-machine-id-setup.xml
-@@ -90,7 +90,7 @@
+@@ -58,7 +58,7 @@
        and is different for every booted instance of the
        VM.</para></listitem>
  
@@ -156,10 +156,10 @@ index 527cb7bff5..8c4a62ccee 100644
        used to initialize the machine ID. For details, see the
        documentation of the <ulink
 diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
-index da6e8c4441..3a629b09ec 100644
+index c895adaaf3..d2dc0538ca 100644
 --- a/man/systemd-resolved.service.xml
 +++ b/man/systemd-resolved.service.xml
-@@ -73,7 +73,7 @@
+@@ -47,7 +47,7 @@
        <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined
        by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,
        including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
@@ -168,7 +168,7 @@ index da6e8c4441..3a629b09ec 100644
        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>). Usage of the
        glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-@@ -173,7 +173,7 @@
+@@ -153,7 +153,7 @@
  
      <itemizedlist>
        <listitem><para><command>systemd-resolved</command> maintains the
@@ -177,7 +177,7 @@ index da6e8c4441..3a629b09ec 100644
        programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53
        DNS stub (see above) as the only DNS server. It also 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
-@@ -189,7 +189,7 @@
+@@ -169,7 +169,7 @@
        <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
  
        <listitem><para><command>systemd-resolved</command> maintains the
@@ -187,10 +187,10 @@ index da6e8c4441..3a629b09ec 100644
        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 definitions. Note that
 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 3d81e45732..c4a6ca4a07 100644
+index 3bd790b485..a532b74a6e 100644
 --- a/man/systemd.exec.xml
 +++ b/man/systemd.exec.xml
-@@ -215,7 +215,7 @@
+@@ -191,7 +191,7 @@
          which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers 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 enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
@@ -200,10 +200,10 @@ index 3d81e45732..c4a6ca4a07 100644
          <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
          dynamically allocated at the time the service is started, and released at the time the service is stopped —
 diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index a1943f65ab..a2b5ac0b59 100644
+index 19c2ca9907..5fd6c1598f 100644
 --- a/man/systemd.socket.xml
 +++ b/man/systemd.socket.xml
-@@ -302,7 +302,7 @@
+@@ -280,7 +280,7 @@
          <listitem><para>Specifies a POSIX message queue name to listen
          on. This expects a valid message queue name (i.e. beginning
          with /). Behavior otherwise is very similar to the
@@ -213,10 +213,10 @@ index a1943f65ab..a2b5ac0b59 100644
          can be inherited between processes.</para></listitem>
        </varlistentry>
 diff --git a/man/systemd.xml b/man/systemd.xml
-index 62ececb6e9..af464246ce 100644
+index 17ab59beb5..89086558c7 100644
 --- a/man/systemd.xml
 +++ b/man/systemd.xml
-@@ -66,7 +66,7 @@
+@@ -40,7 +40,7 @@
    <refsect1>
      <title>Description</title>
  
@@ -225,7 +225,7 @@ index 62ececb6e9..af464246ce 100644
      systems. When run as first process on boot (as PID 1), it acts as
      init system that brings up and maintains userspace
      services.</para>
-@@ -884,10 +884,10 @@
+@@ -888,10 +888,10 @@
      <title>Kernel Command Line</title>
  
      <para>When run as system instance systemd parses a number of
@@ -239,5 +239,5 @@ index 62ececb6e9..af464246ce 100644
      instead.</para></footnote>:</para>
  
 -- 
-2.15.1
+2.18.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 44b58ac5c..1f49c9ee9 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 515c6b9cfdc8508225b07f602feaf9680020acbd Mon Sep 17 00:00:00 2001
+From 301445311b5161c61270163c8921b729ab9e10d8 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"
@@ -14,10 +14,10 @@ Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
  6 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index fa86a3aaa0..cc5ca2a2a9 100644
+index cd9756662a..9ead6ea39b 100644
 --- a/man/kernel-install.xml
 +++ b/man/kernel-install.xml
-@@ -112,7 +112,7 @@
+@@ -88,7 +88,7 @@
            <replaceable>PRETTY_NAME</replaceable> parameter specified
            in <filename>/etc/os-release</filename> or
            <filename>/usr/lib/os-release</filename> (if the former is
@@ -27,10 +27,10 @@ index fa86a3aaa0..cc5ca2a2a9 100644
            the file <filename>initrd</filename> is found next to the
            <filename>linux</filename> file, the initrd will be added to
 diff --git a/man/os-release.xml b/man/os-release.xml
-index b0468c16a0..80d0d39bb9 100644
+index a51edf3b8a..9ff4b7e8c2 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -212,7 +212,7 @@
+@@ -187,7 +187,7 @@
          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 set, defaults to
@@ -40,10 +40,10 @@ index b0468c16a0..80d0d39bb9 100644
          Miracle)"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index d45c1dc496..686a951f09 100644
+index de0fe6eba8..9f239c8eeb 100644
 --- a/src/analyze/analyze.c
 +++ b/src/analyze/analyze.c
-@@ -693,7 +693,7 @@ static int analyze_plot(sd_bus *bus) {
+@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {
          svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
          if (use_full_bus)
                  svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
@@ -53,10 +53,10 @@ index d45c1dc496..686a951f09 100644
                      strempty(host->kernel_name),
                      strempty(host->kernel_release),
 diff --git a/src/core/main.c b/src/core/main.c
-index 2ad5073368..257ac31ca7 100644
+index 44dd8348be..9a4fc26425 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1355,11 +1355,11 @@ static int status_welcome(void) {
+@@ -1234,11 +1234,11 @@ static int status_welcome(void) {
                  return status_printf(NULL, false, false,
                                       "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
                                       isempty(ansi_color) ? "1" : ansi_color,
@@ -71,11 +71,11 @@ index 2ad5073368..257ac31ca7 100644
  
  static int write_container_id(void) {
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index 207ddeb70f..46a20de469 100644
+index a98e53b3a3..41b212e32d 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -101,7 +101,7 @@ static void print_welcome(void) {
-                 log_warning_errno(r, "Failed to read os-release file: %m");
+@@ -87,7 +87,7 @@ static void print_welcome(void) {
+                                "Failed to read os-release file, ignoring: %m");
  
          printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
 -               isempty(pretty_name) ? "Linux" : pretty_name);
@@ -84,10 +84,10 @@ index 207ddeb70f..46a20de469 100644
          press_any_key();
  
 diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
-index 305ea8f5c9..ae46dcc34d 100644
+index a271cdb8a0..29047ccbff 100644
 --- a/src/kernel-install/90-loaderentry.install
 +++ b/src/kernel-install/90-loaderentry.install
-@@ -36,7 +36,7 @@ elif [[ -f /usr/lib/os-release ]]; then
+@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then
  fi
  
  if ! [[ $PRETTY_NAME ]]; then
@@ -97,5 +97,5 @@ index 305ea8f5c9..ae46dcc34d 100644
  
  declare -a BOOT_OPTIONS
 -- 
-2.15.1
+2.18.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 d9b3d9fe5..401d284fd 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,4 +1,4 @@
-From 46ba10771dec899315255bef0aa420b0479b3f30 Mon Sep 17 00:00:00 2001
+From a6be5d2b2cd02f302ef70c76b601e7af912c3022 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
@@ -10,10 +10,10 @@ Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 80d0d39bb9..ad3891e719 100644
+index 9ff4b7e8c2..1c069275c8 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -123,7 +123,7 @@
+@@ -98,7 +98,7 @@
          <listitem><para>A string identifying the operating system,
          without a version component, and suitable for presentation to
          the user. If not set, defaults to
@@ -23,10 +23,10 @@ index 80d0d39bb9..ad3891e719 100644
          GNU/Linux"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 82c70cfbe3..bd45b8e728 100644
+index 9e77e314ff..3d0c3aafd7 100644
 --- a/src/journal-remote/journal-gatewayd.c
 +++ b/src/journal-remote/journal-gatewayd.c
-@@ -806,7 +806,7 @@ static int request_handler_machine(
+@@ -788,7 +788,7 @@ static int request_handler_machine(
                       SD_ID128_FORMAT_VAL(mid),
                       SD_ID128_FORMAT_VAL(bid),
                       hostname_cleanup(hostname),
@@ -36,5 +36,5 @@ index 82c70cfbe3..bd45b8e728 100644
                       usage,
                       cutoff_from,
 -- 
-2.15.1
+2.18.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 7e69a1c76..58e157b21 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 2c010a68e43ce7d852d44940bdb5c291713f1751 Mon Sep 17 00:00:00 2001
+From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 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 ad3891e719..81f294c7e4 100644
+index 1c069275c8..272258b4e1 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -147,7 +147,7 @@
+@@ -122,7 +122,7 @@
          the operating system, excluding any version information and
          suitable for processing by scripts or usage in generated
          filenames. If not set, defaults to
@@ -24,5 +24,5 @@ index ad3891e719..81f294c7e4 100644
          <literal>ID=debian</literal>.</para></listitem>
        </varlistentry>
 -- 
-2.15.1
+2.18.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 9cbd40515..5e170ce34 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 025279cf5c4ff229cd191439d424295a0de69d65 Mon Sep 17 00:00:00 2001
+From 50b001e3d034825142c03e612af9d4a5a307472f 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 2dbf432df9..696bf4679e 100644
+index 01372fc66b..9155ce5c2e 100644
 --- a/src/resolve/resolved-manager.c
 +++ b/src/resolve/resolved-manager.c
-@@ -408,10 +408,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
+@@ -387,10 +387,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
  static const char *fallback_hostname(void) {
  
          /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be
@@ -26,5 +26,5 @@ index 2dbf432df9..696bf4679e 100644
          return FALLBACK_HOSTNAME;
  }
 -- 
-2.15.1
+2.18.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 0616b9296..0905e6bad 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,18 +1,18 @@
-From 6998da16c87712adea3e5b49a04aec180178d11a Mon Sep 17 00:00:00 2001
+From 35af892f1dffbb0daa9aa721f908f7c38b064ebe 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 | 48 ++++++++++++++++++++++++++----------------------
- 2 files changed, 51 insertions(+), 46 deletions(-)
+ man/os-release.xml     | 49 +++++++++++++++++++++--------------------
+ man/systemd-nspawn.xml | 50 +++++++++++++++++++++++-------------------
+ 2 files changed, 52 insertions(+), 47 deletions(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 81f294c7e4..973e19747d 100644
+index 272258b4e1..6cea40cb99 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -124,7 +124,7 @@
+@@ -99,7 +99,7 @@
          without a version component, and suitable for presentation to
          the user. If not set, defaults to
          <literal>NAME=GNU/Linux</literal>. Example:
@@ -21,7 +21,7 @@ index 81f294c7e4..973e19747d 100644
          GNU/Linux"</literal>.</para></listitem>
        </varlistentry>
  
-@@ -135,8 +135,8 @@
+@@ -110,8 +110,8 @@
          version, excluding any OS name information, possibly including
          a release code name, and suitable for presentation to the
          user. This field is optional. Example:
@@ -32,7 +32,7 @@ index 81f294c7e4..973e19747d 100644
        </varlistentry>
  
        <varlistentry>
-@@ -148,8 +148,8 @@
+@@ -123,8 +123,8 @@
          suitable for processing by scripts or usage in generated
          filenames. If not set, defaults to
          <literal>ID=gnu-linux</literal>. Example:
@@ -43,7 +43,7 @@ index 81f294c7e4..973e19747d 100644
        </varlistentry>
  
        <varlistentry>
-@@ -170,9 +170,9 @@
+@@ -145,9 +145,9 @@
          should be listed in order of how closely the local operating
          system relates to the listed ones, starting with the closest.
          This field is optional. Example: for an operating system with
@@ -55,7 +55,7 @@ index 81f294c7e4..973e19747d 100644
          assignment of <literal>ID_LIKE=debian</literal> is
          appropriate.</para></listitem>
        </varlistentry>
-@@ -201,8 +201,8 @@
+@@ -176,8 +176,8 @@
          identifying the operating system version, excluding any OS
          name information or release code name, and suitable for
          processing by scripts or usage in generated filenames. This
@@ -66,7 +66,7 @@ index 81f294c7e4..973e19747d 100644
        </varlistentry>
  
        <varlistentry>
-@@ -213,8 +213,8 @@
+@@ -188,8 +188,8 @@
          a release code name or OS version of some kind, as suitable.
          If not set, defaults to
          <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
@@ -77,7 +77,7 @@ index 81f294c7e4..973e19747d 100644
        </varlistentry>
  
        <varlistentry>
-@@ -237,7 +237,7 @@
+@@ -212,7 +212,7 @@
          <ulink url="http://scap.nist.gov/specifications/cpe/">Common
          Platform Enumeration Specification</ulink> as proposed by the
          NIST. This field is optional. Example:
@@ -86,7 +86,7 @@ index 81f294c7e4..973e19747d 100644
          </para></listitem>
        </varlistentry>
  
-@@ -272,8 +272,8 @@
+@@ -247,8 +247,8 @@
          one URL shall be listed in each setting. If multiple resources
          need to be referenced, it is recommended to provide an online
          landing page linking all available resources. Examples:
@@ -97,7 +97,7 @@ index 81f294c7e4..973e19747d 100644
        </varlistentry>
  
        <varlistentry>
-@@ -348,21 +348,22 @@
+@@ -323,21 +323,22 @@
      recommended to prefix new fields with an OS specific
      name in order to avoid name clashes. Applications
      reading this file must ignore unknown fields. Example:
@@ -131,7 +131,7 @@ index 81f294c7e4..973e19747d 100644
  
    <refsect1>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 633d93938..fd9db974d 100644
+index 284c9b294b..7b3d211161 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
 @@ -1,7 +1,7 @@
@@ -143,7 +143,7 @@ index 633d93938..fd9db974d 100644
  <!ENTITY fedora_cloud_release "1.1">
  ]>
  
-@@ -1078,11 +1078,12 @@
+@@ -1176,11 +1176,12 @@
    <refsect1>
      <title>Examples</title>
  
@@ -157,7 +157,7 @@ index 633d93938..fd9db974d 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
  # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting>
  
-@@ -1090,31 +1091,32 @@
+@@ -1188,31 +1189,32 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -203,7 +203,7 @@ index 633d93938..fd9db974d 100644
        spawns a shell in a namespace container in it.</para>
  
        <para><command>debootstrap</command> supports
-@@ -1129,29 +1131,31 @@
+@@ -1227,29 +1229,31 @@
  
      <example>
        <title>Boot a minimal
@@ -244,5 +244,5 @@ index 633d93938..fd9db974d 100644
      <example>
        <title>Boot into an ephemeral snapshot of the host system</title>
 -- 
-2.15.1
+2.18.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 8810889d8..0fe5def3c 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,4 +1,4 @@
-From 502b6b516b9469307fd1ca9a1af2b6558a2ba0e6 Mon Sep 17 00:00:00 2001
+From 31e5d50f17d3993839d8f7c9f344a620e3871812 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
@@ -9,10 +9,10 @@ Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
-index 59c1af73de..31b8b0fdab 100644
+index 2832a39dd7..534870ee50 100644
 --- a/src/boot/bootctl.c
 +++ b/src/boot/bootctl.c
-@@ -682,13 +682,13 @@ static int install_variables(const char *esp_path,
+@@ -665,13 +665,13 @@ static int install_variables(const char *esp_path,
                                         "Failed to determine current boot order: %m");
  
          if (first || r == 0) {
@@ -29,5 +29,5 @@ index 59c1af73de..31b8b0fdab 100644
  
          return insert_into_order(slot, first);
 -- 
-2.15.1
+2.18.0