libre/systemd: upgpkg 236.0-2.parabola1

8 files changed, 292 insertions, 95 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 5ee14d118..ff71a4f85 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 d817ea1a39a1e5ae78d776708585878dc39f6ec6 Mon Sep 17 00:00:00 2001
+From 878ad05e921e204d05fb3005a7c0999265d20cb0 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
@@ -8,17 +8,26 @@ cases, "Linux" is (correctly) used to refer to just the kernel.  In others,
 it is in a string for which code must also be adjusted; these instances
 are not included in this commit.
 ---
- man/daemon.xml               | 4 ++--
- man/sd-bus-errors.xml        | 2 +-
- man/sd_bus_error_add_map.xml | 2 +-
- man/systemd.xml              | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
+ man/daemon.xml                   | 4 ++--
+ 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 ++--
+ man/systemd-machine-id-setup.xml | 2 +-
+ 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(-)
 
 diff --git a/man/daemon.xml b/man/daemon.xml
-index 485c66225..a64974968 100644
+index 18337daad8..ab65f6f4d9 100644
 --- a/man/daemon.xml
 +++ b/man/daemon.xml
-@@ -168,7 +168,7 @@
+@@ -170,7 +170,7 @@
      <refsect2>
        <title>New-Style Daemons</title>
  
@@ -27,7 +36,7 @@ index 485c66225..a64974968 100644
        new-style daemons. This makes it easier to supervise and control
        them at runtime and simplifies their implementation.</para>
  
-@@ -309,7 +309,7 @@
+@@ -311,7 +311,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
@@ -36,11 +45,37 @@ index 485c66225..a64974968 100644
        old-style and new-style systems. Among other issues, SysV init
        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
+--- a/man/journald.conf.xml
++++ b/man/journald.conf.xml
+@@ -132,7 +132,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
+diff --git a/man/machinectl.xml b/man/machinectl.xml
+index 43f4d127b8..908ee5649c 100644
+--- a/man/machinectl.xml
++++ b/man/machinectl.xml
+@@ -899,7 +899,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
+-    following a conservative subset of DNS and UNIX/Linux
++    following a conservative subset of DNS and GNU/Linux
+     semantics. Specifically, they must consist of one or more
+     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 055af7a68..d2b81f4e4 100644
+index a655ab1d97..b1f24381dd 100644
 --- a/man/sd-bus-errors.xml
 +++ b/man/sd-bus-errors.xml
-@@ -126,7 +126,7 @@
+@@ -128,7 +128,7 @@
  
      <para>In addition to this list, in sd-bus, the special error
      namespace <literal>System.Error.</literal> is used to map
@@ -49,11 +84,24 @@ index 055af7a68..d2b81f4e4 100644
      project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
      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
+--- a/man/sd-login.xml
++++ b/man/sd-login.xml
+@@ -270,7 +270,7 @@
+ 
+     <para>
+       <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>
+-      for an introduction to multi-seat support on Linux and the background for this set of APIs.
++      for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.
+     </para>
+   </refsect1>
+ 
 diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
-index a1eda21ed..55402dfc2 100644
+index b79381fefd..072b31c7d3 100644
 --- a/man/sd_bus_error_add_map.xml
 +++ b/man/sd_bus_error_add_map.xml
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@
  
      <para>The <function>sd_bus_error_add_map()</function> call may be
      used to register additional mappings for converting D-Bus errors
@@ -62,11 +110,113 @@ index a1eda21ed..55402dfc2 100644
      defined with this call are consulted by calls such as
      <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
+--- a/man/sd_uid_get_state.xml
++++ b/man/sd_uid_get_state.xml
+@@ -199,7 +199,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
+-        undefined on Linux.</para></listitem>
++        undefined on GNU/Linux.</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
+index 4426827e57..b59570ad2c 100644
+--- a/man/systemd-detect-virt.xml
++++ b/man/systemd-detect-virt.xml
+@@ -156,12 +156,12 @@
+ 
+           <row>
+             <entry><varname>lxc</varname></entry>
+-            <entry>Linux container implementation by LXC</entry>
++            <entry>Container implementation by LXC</entry>
+           </row>
+ 
+           <row>
+             <entry><varname>lxc-libvirt</varname></entry>
+-            <entry>Linux container implementation by libvirt</entry>
++            <entry>Container implementation by libvirt</entry>
+           </row>
+ 
+           <row>
+diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
+index 527cb7bff5..8c4a62ccee 100644
+--- a/man/systemd-machine-id-setup.xml
++++ b/man/systemd-machine-id-setup.xml
+@@ -90,7 +90,7 @@
+       and is different for every booted instance of the
+       VM.</para></listitem>
+ 
+-      <listitem><para>Similarly, if run inside a Linux container
++      <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
+diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
+index da6e8c4441..3a629b09ec 100644
+--- a/man/systemd-resolved.service.xml
++++ b/man/systemd-resolved.service.xml
+@@ -73,7 +73,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
+-      API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC
++      API is widely supported, including beyond the GNU/Linux platform. In its current form it does not 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>). Usage of the
+       glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+@@ -173,7 +173,7 @@
+ 
+     <itemizedlist>
+       <listitem><para><command>systemd-resolved</command> maintains the
+-      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux
++      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux
+       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 @@
+       <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
+ 
+       <listitem><para><command>systemd-resolved</command> maintains the
+-      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux
++      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux
+       programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept 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 definitions. Note that
+diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
+index 3d81e45732..c4a6ca4a07 100644
+--- a/man/systemd.exec.xml
++++ b/man/systemd.exec.xml
+@@ -215,7 +215,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
+-        Linux systems.</para>
++        GNU/Linux systems.</para>
+ 
+         <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
+--- a/man/systemd.socket.xml
++++ b/man/systemd.socket.xml
+@@ -302,7 +302,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
+-        <varname>ListenFIFO=</varname> directive above. On Linux
++        <varname>ListenFIFO=</varname> directive above. On GNU/Linux
+         message queue descriptors are actually file descriptors and
+         can be inherited between processes.</para></listitem>
+       </varlistentry>
 diff --git a/man/systemd.xml b/man/systemd.xml
-index e8178ca4b..ea7dad1ae 100644
+index 62ececb6e9..af464246ce 100644
 --- a/man/systemd.xml
 +++ b/man/systemd.xml
-@@ -64,7 +64,7 @@
+@@ -66,7 +66,7 @@
    <refsect1>
      <title>Description</title>
  
@@ -75,6 +225,19 @@ index e8178ca4b..ea7dad1ae 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 @@
+     <title>Kernel Command Line</title>
+ 
+     <para>When run as system instance systemd parses a number of
+-    kernel command line arguments<footnote><para>If run inside a Linux
++    kernel command line arguments<footnote><para>If run inside a
+     container these arguments may be passed as command line arguments
+     to systemd itself, next to any of the command line options listed
+-    in the Options section above. If run outside of Linux containers,
++    in the Options section above. If run outside of a container,
+     these arguments are parsed from <filename>/proc/cmdline</filename>
+     instead.</para></footnote>:</para>
+ 
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
index b9e94ee33..b44003e77 100644
--- a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
+++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
@@ -1,7 +1,7 @@
-From 10ccaa5d0fb340e61abc158238f939f4f7744396 Mon Sep 17 00:00:00 2001
+From 515c6b9cfdc8508225b07f602feaf9680020acbd 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 to PRETTY_NAME "GNU/Linux"
+Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
  instead of "Linux"
 
 ---
@@ -14,10 +14,10 @@ Subject: [PATCH 2/7] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux"
  6 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index 94b6b1110..2f42d49d9 100644
+index fa86a3aaa0..cc5ca2a2a9 100644
 --- a/man/kernel-install.xml
 +++ b/man/kernel-install.xml
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,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 94b6b1110..2f42d49d9 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 99bbb6100..27d18749d 100644
+index b0468c16a0..80d0d39bb9 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -210,7 +210,7 @@
+@@ -212,7 +212,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 99bbb6100..27d18749d 100644
          Miracle)"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index ac0470b20..36b01500c 100644
+index d45c1dc496..686a951f09 100644
 --- a/src/analyze/analyze.c
 +++ b/src/analyze/analyze.c
-@@ -658,7 +658,7 @@ static int analyze_plot(sd_bus *bus) {
+@@ -693,7 +693,7 @@ static int analyze_plot(sd_bus *bus) {
          svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
          svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
          svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
@@ -53,10 +53,10 @@ index ac0470b20..36b01500c 100644
              strempty(host->kernel_name),
              strempty(host->kernel_release),
 diff --git a/src/core/main.c b/src/core/main.c
-index bcf9ea5f2..b66093827 100644
+index 2ad5073368..257ac31ca7 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1264,11 +1264,11 @@ static int status_welcome(void) {
+@@ -1355,11 +1355,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,10 +71,10 @@ index bcf9ea5f2..b66093827 100644
  
  static int write_container_id(void) {
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index bc16290c7..f7574223a 100644
+index 207ddeb70f..46a20de469 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -97,7 +97,7 @@ static void print_welcome(void) {
+@@ -101,7 +101,7 @@ static void print_welcome(void) {
                  log_warning_errno(r, "Failed to read os-release file: %m");
  
          printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
@@ -84,10 +84,10 @@ index bc16290c7..f7574223a 100644
          press_any_key();
  
 diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
-index a0bca05c9..af9f0f9cc 100644
+index 305ea8f5c9..ae46dcc34d 100644
 --- a/src/kernel-install/90-loaderentry.install
 +++ b/src/kernel-install/90-loaderentry.install
-@@ -38,7 +38,7 @@ elif [[ -f /usr/lib/os-release ]]; then
+@@ -36,7 +36,7 @@ elif [[ -f /usr/lib/os-release ]]; then
  fi
  
  if ! [[ $PRETTY_NAME ]]; then
@@ -97,5 +97,5 @@ index a0bca05c9..af9f0f9cc 100644
  
  declare -a BOOT_OPTIONS
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
index 40761d4ef..d9b3d9fe5 100644
--- a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch
+++ b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
@@ -1,7 +1,7 @@
-From d13b518038bfcdeae9c58bce183751f835cb18d4 Mon Sep 17 00:00:00 2001
+From 46ba10771dec899315255bef0aa420b0479b3f30 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 to NAME "GNU/Linux" instead of
+Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of
  "Linux"
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 3/7] FSDG: os-release: Default to NAME "GNU/Linux" instead of
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index 27d18749d..a88d16b17 100644
+index 80d0d39bb9..ad3891e719 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -121,7 +121,7 @@
+@@ -123,7 +123,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 27d18749d..a88d16b17 100644
          GNU/Linux"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 9a1c5b76c..93e5f1ae7 100644
+index 82c70cfbe3..bd45b8e728 100644
 --- a/src/journal-remote/journal-gatewayd.c
 +++ b/src/journal-remote/journal-gatewayd.c
-@@ -805,7 +805,7 @@ static int request_handler_machine(
+@@ -806,7 +806,7 @@ static int request_handler_machine(
                       SD_ID128_FORMAT_VAL(mid),
                       SD_ID128_FORMAT_VAL(bid),
                       hostname_cleanup(hostname),
@@ -36,5 +36,5 @@ index 9a1c5b76c..93e5f1ae7 100644
                       usage,
                       cutoff_from,
 -- 
-2.13.2
+2.15.1
 
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 aadcc8a80..7e69a1c76 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 97ace109bae3bd426f8578b7c606004be8234758 Mon Sep 17 00:00:00 2001
+From 2c010a68e43ce7d852d44940bdb5c291713f1751 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 a88d16b17..caf60f41a 100644
+index ad3891e719..81f294c7e4 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -145,7 +145,7 @@
+@@ -147,7 +147,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 a88d16b17..caf60f41a 100644
          <literal>ID=debian</literal>.</para></listitem>
        </varlistentry>
 -- 
-2.13.2
+2.15.1
 
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 475a368be..9cbd40515 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 b98fdc685b819dca6f6b3fd9ef49ff4b0ec645af Mon Sep 17 00:00:00 2001
+From 025279cf5c4ff229cd191439d424295a0de69d65 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 9db8b8f61..bcfe3d381 100644
+index 2dbf432df9..696bf4679e 100644
 --- a/src/resolve/resolved-manager.c
 +++ b/src/resolve/resolved-manager.c
-@@ -383,10 +383,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
+@@ -408,10 +408,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 9db8b8f61..bcfe3d381 100644
          return FALLBACK_HOSTNAME;
  }
 -- 
-2.13.2
+2.15.1
 
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 145e45d4b..d2bbda12c 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 888c40a593c053c4af053fbe6ecd31c8c51f70c8 Mon Sep 17 00:00:00 2001
+From 6998da16c87712adea3e5b49a04aec180178d11a 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 | 34 ++++++++++++++++++----------------
- 2 files changed, 43 insertions(+), 40 deletions(-)
+ man/systemd-nspawn.xml | 48 ++++++++++++++++++++++++++----------------------
+ 2 files changed, 51 insertions(+), 46 deletions(-)
 
 diff --git a/man/os-release.xml b/man/os-release.xml
-index caf60f41a..2811f434c 100644
+index 81f294c7e4..973e19747d 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,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 caf60f41a..2811f434c 100644
          GNU/Linux"</literal>.</para></listitem>
        </varlistentry>
  
-@@ -133,8 +133,8 @@
+@@ -135,8 +135,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 caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -146,8 +146,8 @@
+@@ -148,8 +148,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 caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -168,9 +168,9 @@
+@@ -170,9 +170,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 caf60f41a..2811f434c 100644
          assignment of <literal>ID_LIKE=debian</literal> is
          appropriate.</para></listitem>
        </varlistentry>
-@@ -199,8 +199,8 @@
+@@ -201,8 +201,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 caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -211,8 +211,8 @@
+@@ -213,8 +213,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 caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -235,7 +235,7 @@
+@@ -237,7 +237,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 caf60f41a..2811f434c 100644
          </para></listitem>
        </varlistentry>
  
-@@ -270,8 +270,8 @@
+@@ -272,8 +272,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 caf60f41a..2811f434c 100644
        </varlistentry>
  
        <varlistentry>
-@@ -346,21 +346,22 @@
+@@ -348,21 +348,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,23 +131,24 @@ index caf60f41a..2811f434c 100644
  
    <refsect1>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index ae7082776..ef80d90ba 100644
+index 3dbdf376d3..01e6ca403a 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
-@@ -1048,10 +1048,11 @@
+@@ -1082,11 +1082,12 @@
    <refsect1>
      <title>Examples</title>
  
 +<!-- 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 and start a shell in it</title>
+       <title>Download a
+       <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title>
  
 -      <programlisting># machinectl pull-raw --verify=no \
 +      <programlisting># machinectl pull-raw -&2D;verify=no \
        https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz
  # systemd-nspawn -M Fedora-Cloud-Base-25-1.3.x86_64.raw</programlisting>
  
-@@ -1059,39 +1060,40 @@
+@@ -1094,31 +1095,32 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -157,18 +158,24 @@ index ae7082776..ef80d90ba 100644
 -      <title>Build and boot a minimal Fedora distribution in a container</title>
 +      <title>Build and boot a minimal BLAG distribution in a container</title>
  
--      <programlisting># dnf -y --releasever=25 --installroot=/srv/mycontainer \
+-      <programlisting># dnf -y --releasever=27 --installroot=/var/lib/machines/f27container \
 -      --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \
 -      systemd passwd dnf fedora-release vim-minimal
-+      <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer \
+-# systemd-nspawn -bD /var/lib/machines/f27container</programlisting>
++      <programlisting># dnf -y --releasever=140k --installroot=/var/lib/machines/blag140container \
 +      --disablerepo='*' --enablerepo=blag --enablerepo=updates install \
 +      systemd passwd dnf blag-release vim-minimal
- # systemd-nspawn -bD /srv/mycontainer</programlisting>
++# systemd-nspawn -bD /var/lib/machines/blag140container</programlisting>
  
 -      <para>This installs a minimal Fedora distribution into the
+-      directory <filename noindex='true'>/var/lib/machines/f27container</filename>
 +      <para>This installs a minimal BLAG distribution into the
-       directory <filename noindex='true'>/srv/mycontainer/</filename>
-       and then boots an OS in a namespace container in it.</para>
++      directory <filename noindex='true'>/var/lib/machines/blag140container</filename>
+       and then boots an OS in a namespace container in it. Because the installation
+       is located underneath the standard <filename>/var/lib/machines/</filename>
+       directory, it is also possible to start the machine using
+-      <command>systemd-nspawn -M f27container</command>.</para>
++      <command>systemd-nspawn -M blag140container</command>.</para>
      </example>
  
      <example>
@@ -185,11 +192,14 @@ index ae7082776..ef80d90ba 100644
 +      <para>This installs a minimal gNewSense unstable distribution into
 +      the directory <filename>~/gnewsense-tree/</filename> and then
        spawns a shell in a namespace container in it.</para>
-     </example>
+ 
+       <para><command>debootstrap</command> supports
+@@ -1133,29 +1135,31 @@
  
      <example>
--      <title>Boot a minimal Arch Linux distribution in a container</title>
-+      <title>Boot a minimal Parabola distribution in a container</title>
+       <title>Boot a minimal
+-      <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>
++      <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>
  
 -      <programlisting># pacstrap -c -d ~/arch-tree/ base
 -# systemd-nspawn -bD ~/arch-tree/</programlisting>
@@ -203,6 +213,27 @@ index ae7082776..ef80d90ba 100644
        in a namespace container in it.</para>
      </example>
  
++<!-- TODO: This example needs switched to an FSDG OS
+     <example>
+       <title>Install the
+       <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>
+       rolling distribution</title>
+ 
+-      <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \
++      <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \
+       https://download.opensuse.org/tumbleweed/repo/oss tumbleweed
+-# zypper --root=/var/lib/machines/tumbleweed refresh
+-# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \
++# zypper -&2Droot=/var/lib/machines/tumbleweed refresh
++# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \
+       systemd shadow zypper openSUSE-release vim
+ # systemd-nspawn -M tumbleweed passwd root
+ # systemd-nspawn -M tumbleweed -b</programlisting>
+     </example>
++-->
+ 
+     <example>
+       <title>Boot into an ephemeral snapshot of the host system</title>
 -- 
-2.13.2
+2.15.1
 
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 2ca860d87..8810889d8 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 c2357a5265d49410d3aacef1ccacb9b0caf761a5 Mon Sep 17 00:00:00 2001
+From 502b6b516b9469307fd1ca9a1af2b6558a2ba0e6 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 155bf278b..297dcb535 100644
+index 59c1af73de..31b8b0fdab 100644
 --- a/src/boot/bootctl.c
 +++ b/src/boot/bootctl.c
-@@ -778,13 +778,13 @@ static int install_variables(const char *esp_path,
+@@ -682,13 +682,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 155bf278b..297dcb535 100644
  
          return insert_into_order(slot, first);
 -- 
-2.13.2
+2.15.1
 
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 3eee0fe7f..58371fdbf 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -10,14 +10,14 @@ pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 _libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_libsystemd[@]}")
 # latest commit on stable branch
-_commit='743b771c559c6101544f7358a42c8c519fe4b0db'
+_commit='a1b2c92d8290c76a29ccd0887a92ac064e1bb5a1'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=235.38
-pkgrel=3
-pkgrel+=.parabola1.1
-arch=('i686' 'x86_64')
-arch+=('armv7h')
+pkgver=236.0
+pkgrel=2
+pkgrel+=.parabola1
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 url="https://www.github.com/systemd/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
@@ -27,7 +27,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
-validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4') # Lennart Poettering <lennart@poettering.net>
+validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4')  # Lennart Poettering <lennart@poettering.net>
 source=('git://github.com/systemd/systemd-stable.git'
         'git://github.com/systemd/systemd.git' # pull in for tags, backports & reverts
         'initcpio-hook-udev'
@@ -42,8 +42,8 @@ source=('git://github.com/systemd/systemd-stable.git'
         'systemd-tmpfiles.hook'
         'systemd-update.hook'
         '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
-        '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch'
-        '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch'
+        '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'
+        '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'
         '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
         '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'
         '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'
@@ -61,17 +61,17 @@ sha512sums=('SKIP'
             '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30'
             'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3'
             '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618'
-            'e85c5564348253e1bc49d943f0456c38ebef0c50a5a7782ea6ebb1f45bd624a69430d79693fe1223b0adace9f07c167b84133a003a09a8b61ae48d1b70610277'
-            '0ad718e9441798a4479600ffce364c2f0e582fd0ccf7762dde90f99755dee4569bcee8299ea2ccbf3a010966c8d48c59fcd0b1f93c9b8a479332c2c128fc2b2a'
-            '03ec8cfde36a0a7413993118707e32b0d8b693d366da8cb22a6e71e1c10178d1df05b2e2d1d5a2a298d49af005f3cdf80bfd8d40959d3e53310491b6ada39fed'
-            '9c13df718d4db2592c50c348c7b6340bbd7dd6ee6951da0f2bbd9c1878e0f034b975dfa9b28081b57e76f91c49f0bbcce314d0baaf1c5916dcff11e98d426372'
-            'b45c4e40f626a02951a852ea4cd2304f00a172dc64b5c38a97f5c68e4a89ceb4f4164cc9221533c4a5c52662e0b9629a82c521514bfcc21f0c11ce517643c2c1'
-            'f5c4cbeecac8f9d8f009deb4ac1d0b797210bcd1a91fcc6bf8ec110320ad6ceb8fd2a28b184ca037d73078d09a22f224ad3fc46f4bbf972432cce23263b2e1dc'
-            'e276fd1aedd7718333324fa9d99493fe99d951f446e3b590a99e2cc9562a0bd0e29693907997cb52096c39168c5be62ded3feedf93bacd3c9659d58775b6ca8d')
+            '107d2e36544aa8ef1c6e86339fbc811acb6e1d15eb0edca9f463bdd1b0e91fa8d85cf8c9e70eeaf4196e2f942e30310b672859191f3093c4806546ae30140fb9'
+            '7445f9802cc194e27238cc89954c1035b0bf0c32b2702a7cbf463f701c4f87a416d7f3f75cc3eb9abe276ac7e49d377451c3727523544568420e348d47c1ef4c'
+            '7b969dc665281eb43871cf399398ddc25a16f533919dfbf721e2a2eb922cde6936c42400083ef39d5cc873a0b2bf749897c9bb1aaa38624315b8e5810f82efca'
+            'fbcc54a62b6f3f7ec1dfad8317160c3057f145e542a423a2fd6b5c141012929aeb977491afe35b16c4903b5fd0d1469f3d87d1c8a036b4d6b623ac7dbe682ff5'
+            '4e86eac4132d5bd712061d09c14141d91e6bfd2f3879a1fc4a92a15fa77d01552de5c9ebae4a67be2b2a54223a53f2538ba03d4fa0c96ecd1e62a4e8cf341fd1'
+            'f443f25f788eb0bf3199a60f8765db1e60f596ec9939c14f7670ed51b97756ec6f0488a619e3f0f750111f3a82f9d5dbfac601138e7822d9e2a39219a57522a4'
+            '6a16666f18b7075a68733376f4b1fe34dd2aa29eaf43e693a98e303b9c5202317636816cb4a914d5141801026d1693dd4de2f79e0950aa777e8de6e4879cd9d0')
 
 _backports=(
-	# Fix typo in statx macro (#7180) (FS#56289)
-	'8e6a7a8b2be409d356bcaface00f6d44390c07ff'
+  # cryptsetup-generator: Don't mistake NULL input as OOM (#7688) 
+  'aff0b1fa7bf2ca60fd5ffdf7ea25184d576cf61d'
 )
 
 _reverts=(
@@ -258,7 +258,10 @@ package_systemd() {
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
 
-  # ensure proper permissions for /var/log/journal. This is only to placate
+  # ensure proper permissions for /var/log/journal
+  # The permissions are stored with named group by tar, so this works with
+  # users and groups populated by systemd-sysusers. This is only to prevent a
+  # warning from pacman as permissions are set by systemd-tmpfiles anyway.
   chown root:systemd-journal "$pkgdir/var/log/journal"
   chmod 2755 "$pkgdir/var/log/journal"