systemd-243.0-1.par1: updating version

11 files changed, 48 insertions, 74 deletions

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 6095334b2..9e8a078f1 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
@@ -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 cd9756662a..9ead6ea39b 100644
+index 34bb5d2f1e..d22945b5c4 100644
 --- a/man/kernel-install.xml
 +++ b/man/kernel-install.xml
-@@ -97,7 +97,7 @@
+@@ -94,7 +94,7 @@
              <filename>$BOOT/loader/entries/<replaceable>MACHINE-ID</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 is
@@ -27,10 +27,10 @@ index cd9756662a..9ead6ea39b 100644
              <para>If the entry directory
              <filename>$BOOT/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>
 diff --git a/man/os-release.xml b/man/os-release.xml
-index a51edf3b8a..9ff4b7e8c2 100644
+index 5a5e318f75..1afaa679c9 100644
 --- a/man/os-release.xml
 +++ b/man/os-release.xml
-@@ -187,7 +187,7 @@
+@@ -184,7 +184,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,12 +40,12 @@ index a51edf3b8a..9ff4b7e8c2 100644
          Miracle)"</literal>.</para></listitem>
        </varlistentry>
 diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index de0fe6eba8..9f239c8eeb 100644
+index 4d81026084..f18bd92289 100644
 --- a/src/analyze/analyze.c
 +++ b/src/analyze/analyze.c
-@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {
+@@ -747,7 +747,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)
+         if (host)
                  svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
 -                    isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
 +                    isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,
@@ -53,10 +53,10 @@ index de0fe6eba8..9f239c8eeb 100644
                      strempty(host->kernel_name),
                      strempty(host->kernel_release),
 diff --git a/src/core/main.c b/src/core/main.c
-index 44dd8348be..9a4fc26425 100644
+index bcce7178a8..7bebcc9e28 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1375,11 +1375,11 @@
+@@ -1242,11 +1242,11 @@ static int status_welcome(void) {
                  return status_printf(NULL, 0,
                                       "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
                                       isempty(ansi_color) ? "1" : ansi_color,
@@ -71,23 +71,23 @@ index 44dd8348be..9a4fc26425 100644
  
  static int write_container_id(void) {
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a98e53b3a3..41b212e32d 100644
+index 528e6452cf..3c9765f1e5 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -87,7 +87,7 @@ static void print_welcome(void) {
+@@ -104,7 +104,7 @@ static void print_welcome(void) {
+                 log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
                                 "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);
-+               isempty(pretty_name) ? "GNU/Linux" : pretty_name);
- 
-         press_any_key();
+-        pn = isempty(pretty_name) ? "Linux" : pretty_name;
++        pn = isempty(pretty_name) ? "GNU/Linux" : pretty_name;
  
+         if (colors_enabled())
+                 printf("\nWelcome to your new installation of \x1B[%sm%s\x1B[0m!\n", ansi_color, pn);
 diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
-index a271cdb8a0..29047ccbff 100644
+index 47a0cd224a..9ff48a9d5c 100644
 --- a/src/kernel-install/90-loaderentry.install
 +++ b/src/kernel-install/90-loaderentry.install
-@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then
+@@ -42,7 +42,7 @@ elif [[ -f /usr/lib/os-release ]]; then
  fi
  
  if ! [[ $PRETTY_NAME ]]; then
@@ -95,7 +95,7 @@ index a271cdb8a0..29047ccbff 100644
 +    PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
  fi
  
- declare -a BOOT_OPTIONS
+ if [[ -f /etc/kernel/cmdline ]]; then
 -- 
 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 0905e6bad..0e0b59f6f 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
@@ -131,19 +131,19 @@ index 272258b4e1..6cea40cb99 100644
  
    <refsect1>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 284c9b294b..7b3d211161 100644
+index db3f10c3a2..27d9d2232a 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
 @@ -1,7 +1,7 @@
- <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
- <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ <?xml version='1.0'?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
--<!ENTITY fedora_latest_version "28">
+-<!ENTITY fedora_latest_version "30">
 +<!ENTITY blag_latest_version "140">
- <!ENTITY fedora_cloud_release "1.1">
+ <!ENTITY fedora_cloud_release "1.2">
  ]>
- 
-@@ -1176,11 +1176,12 @@
+ <!-- SPDX-License-Identifier: LGPL-2.1+ -->
+@@ -1341,11 +1341,12 @@
    <refsect1>
      <title>Examples</title>
  
@@ -155,9 +155,9 @@ index 284c9b294b..7b3d211161 100644
 -      <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
- # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting>
+ # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64</programlisting>
  
-@@ -1188,31 +1189,32 @@
+@@ -1353,31 +1354,32 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -203,16 +203,16 @@ index 284c9b294b..7b3d211161 100644
        spawns a shell in a namespace container in it.</para>
  
        <para><command>debootstrap</command> supports
-@@ -1227,29 +1229,31 @@
+@@ -1392,29 +1394,31 @@
  
      <example>
        <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
+-      <programlisting># pacstrap -c ~/arch-tree/ base
 -# systemd-nspawn -bD ~/arch-tree/</programlisting>
-+      <programlisting># pacstrap -c -d ~/parabola-tree/ base
++      <programlisting># pacstrap -c ~/parabola-tree/ base
 +# systemd-nspawn -bD ~/parabola-tree/</programlisting>
  
 -      <para>This installs a minimal Arch Linux distribution into the
diff --git a/libre/systemd/systemd-binfmt.hook b/libre/systemd/30-systemd-binfmt.hook
index 9c31a4b16..9c31a4b16 100644
--- a/libre/systemd/systemd-binfmt.hook
+++ b/libre/systemd/30-systemd-binfmt.hook
diff --git a/libre/systemd/systemd-catalog.hook b/libre/systemd/30-systemd-catalog.hook
index d28bddc4b..d28bddc4b 100644
--- a/libre/systemd/systemd-catalog.hook
+++ b/libre/systemd/30-systemd-catalog.hook
diff --git a/libre/systemd/systemd-daemon-reload.hook b/libre/systemd/30-systemd-daemon-reload.hook
index 87923e862..87923e862 100644
--- a/libre/systemd/systemd-daemon-reload.hook
+++ b/libre/systemd/30-systemd-daemon-reload.hook
diff --git a/libre/systemd/systemd-hwdb.hook b/libre/systemd/30-systemd-hwdb.hook
index ec5bcfb94..ec5bcfb94 100644
--- a/libre/systemd/systemd-hwdb.hook
+++ b/libre/systemd/30-systemd-hwdb.hook
diff --git a/libre/systemd/systemd-sysctl.hook b/libre/systemd/30-systemd-sysctl.hook
index aec5ac1b0..aec5ac1b0 100644
--- a/libre/systemd/systemd-sysctl.hook
+++ b/libre/systemd/30-systemd-sysctl.hook
diff --git a/libre/systemd/systemd-tmpfiles.hook b/libre/systemd/30-systemd-tmpfiles.hook
index df60d8275..df60d8275 100644
--- a/libre/systemd/systemd-tmpfiles.hook
+++ b/libre/systemd/30-systemd-tmpfiles.hook
diff --git a/libre/systemd/systemd-udev-reload.hook b/libre/systemd/30-systemd-udev-reload.hook
index 418515daf..418515daf 100644
--- a/libre/systemd/systemd-udev-reload.hook
+++ b/libre/systemd/30-systemd-udev-reload.hook
diff --git a/libre/systemd/systemd-update.hook b/libre/systemd/30-systemd-update.hook
index 7084a0c16..7084a0c16 100644
--- a/libre/systemd/systemd-update.hook
+++ b/libre/systemd/30-systemd-update.hook
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index de2288ef1..8db21a0cc 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -12,9 +12,9 @@ pkgname+=('systemd-common' 'systemd-udev')
 _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_systemd_libs[@]/#/systemd-}")
 # Can be from either systemd or systemd-stable
-_commit='9d34e79ae8ef891adf3757f9248566def70471ad'
-pkgver=242.84
-pkgrel=2
+_commit='efb536d0cbe2e58f80e501d19999928c75e08f6a'
+pkgver=243.0
+pkgrel=1
 pkgrel+=.par1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
@@ -44,14 +44,14 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         'systemd-hook'
         '20-systemd-sysusers.hook'
         'udev-hook'
-        'systemd-binfmt.hook'
-        'systemd-catalog.hook'
-        'systemd-daemon-reload.hook'
-        'systemd-hwdb.hook'
-        'systemd-sysctl.hook'
-        'systemd-tmpfiles.hook'
-        'systemd-udev-reload.hook'
-        'systemd-update.hook'
+        '30-systemd-binfmt.hook'
+        '30-systemd-catalog.hook'
+        '30-systemd-daemon-reload.hook'
+        '30-systemd-hwdb.hook'
+        '30-systemd-sysctl.hook'
+        '30-systemd-tmpfiles.hook'
+        '30-systemd-udev-reload.hook'
+        '30-systemd-update.hook'
         '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.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'
@@ -81,38 +81,14 @@ sha512sums=('SKIP'
             'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
             '83a00469c63f9cdb069264209e545bddce0abc0024339bbc271d8ecb249fdabb984c0f4e4ab52d84e8ec03d2c6d9b3106f3d880c218d806cbe7a76a74c4d0908'
-            'e1e45c17f1087bb73ff8acbbbb85b2b36e87499e9362dce74486f353523e54049d5dfa1ffe8b0a2be3b743c3a37721c7a47f8a71cc29e07a589f5f4efe4290df'
+            'f8ad54b5fcc8c4e37fbcd364bbf5eafced8db3f2a362ed29b04e1ff67001cedbd4f91cc0e4a9ae143be8d1191902bcc35a48a624ffd45ed1a4bd57df389d4cc4'
             'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
             'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
             '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
-            'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83'
+            '604aed271116ed263287ef9227185a277d60c7f555bb7b06315fdcc1ed74e6c655011a8205a9eb2c4fce39ac065e0b4b81084d4375b472467396cca7032bf0b7'
             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
 
 _backports=(
-  # basic/socket-util: put a limit on the loop to flush connections
-  '67962036f6c6cfd34828c1f1f1fbdc0018fb9898'
-
-  # network: logs link state change
-  '0beb9542e90ab1c5d1507a1046a326fbcf73861c'
-
-  # network: drop invalid assertion
-  '51aba17b88617515e037e8985d3a4ea871ac47fe'
-  # network: fix assertion when link get carrier
-  'b9ea3d2e47b3741f3f46ba9c5e19640136933b71'
-
-  # network: do not use ordered_set_printf() for DOMAINS= or ROUTE_DOMAINS=
-  'fe0e16db093a7da09fcb52a2bc7017197047443d'
-
-  # network: honor MTUBytes= setting
-  '933c70a0a4e4fac47d18e0348ae97ee3d48dc139'
-  # network: bump MTU bytes only when MTUByte= is not set
-  'f6fcc1c2a41eae749467de58453174296b635a69'
-
-  # network: do not send ipv6 token to kernel
-  '9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f'
-
-  # cgroup-util: kill also threads
-  'e48fcfef06d81bf08607d3c1657fdc6aa1e9a6ee'
 )
 
 _reverts=(
@@ -184,6 +160,7 @@ build() {
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
+    -Dman=true
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
     -Ddefault-hierarchy=hybrid
@@ -286,10 +263,6 @@ package_systemd() {
 
   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
 
-  # don't write units to /etc by default. some of these will be re-enabled on
-  # post_install.
-  rm -rv "$pkgdir"/etc/systemd/system/*
-
   # we'll create this on installation
   rmdir "$pkgdir"/var/log/journal/remote
 
@@ -300,8 +273,9 @@ package_systemd() {
   rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
 
   # avoid a potential conflict with [core]/filesystem
-  rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf
-  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
+  rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
+  sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
+    -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
 
   # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
   install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d