systemd-245-3.parabola1: updating version

3 files changed, 37 insertions, 34 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 92d9f0ee8..c626c48cc 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
@@ -143,23 +143,23 @@ index c4763fd561..54bba23666 100644
  
            <row>
 diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index 9e84fd8ccb..7f0dcd14d7 100644
+index 7caf35f8e8..18d9c5a33b 100644
 --- a/man/systemd-machine-id-setup.xml
 +++ b/man/systemd-machine-id-setup.xml
-@@ -58,7 +58,7 @@
+@@ -55,7 +55,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
+-      <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the
++      <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 c895adaaf3..d2dc0538ca 100644
+index 53c46a1018..a2ccf4fae2 100644
 --- a/man/systemd-resolved.service.xml
 +++ b/man/systemd-resolved.service.xml
-@@ -47,7 +47,7 @@
+@@ -44,7 +44,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 c895adaaf3..d2dc0538ca 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>
-@@ -153,7 +153,7 @@
+@@ -190,7 +190,7 @@
  
      <itemizedlist>
        <listitem><para><command>systemd-resolved</command> maintains the
@@ -177,7 +177,7 @@ index c895adaaf3..d2dc0538ca 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
-@@ -169,7 +169,7 @@
+@@ -206,7 +206,7 @@
        <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
  
        <listitem><para><command>systemd-resolved</command> maintains the
@@ -213,7 +213,7 @@ index 19c2ca9907..5fd6c1598f 100644
          can be inherited between processes.</para></listitem>
        </varlistentry>
 diff --git a/man/systemd.xml b/man/systemd.xml
-index 17ab59beb5..89086558c7 100644
+index 28bf49e131..5cfd0de31a 100644
 --- a/man/systemd.xml
 +++ b/man/systemd.xml
 @@ -37,7 +37,7 @@
@@ -222,10 +222,10 @@ index 17ab59beb5..89086558c7 100644
  
 -    <para>systemd is a system and service manager for Linux operating systems. When run as first process on
 +    <para>systemd is a system and service manager for GNU/Linux operating systems. When run as first process on
-     boot (as PID 1), it acts as init system that brings up and maintains userspace services. Seperate
+     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>
  
-@@ -704,9 +704,9 @@
+@@ -703,9 +703,9 @@
      <title>Kernel Command Line</title>
  
      <para>When run as the system instance systemd parses a number of options listed below. They can be
@@ -233,7 +233,7 @@ index 17ab59beb5..89086558c7 100644
 +    specified as 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, these arguments are parsed from
-+    in the Options section above. If run outside of a container, these arguments are parsed from
++    in the Options section above. If run outside of containers, these arguments are parsed from
      <filename>/proc/cmdline</filename> instead.</para></footnote>, or through the
      <literal>SystemdOptions</literal> EFI variable (on EFI systems). The kernel command line has higher
      priority. Following variables are understood:</para>
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 394f185dd..73a01d674 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 db3f10c3a2..27d9d2232a 100644
+index b269b99170..19a44bb09a 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
 @@ -1,7 +1,7 @@
  <?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 "30">
+-<!ENTITY fedora_latest_version "31">
 +<!ENTITY blag_latest_version "140">
- <!ENTITY fedora_cloud_release "1.2">
+ <!ENTITY fedora_cloud_release "1.9">
  ]>
  <!-- SPDX-License-Identifier: LGPL-2.1+ -->
-@@ -1341,11 +1341,12 @@
+@@ -1359,11 +1359,12 @@
    <refsect1>
      <title>Examples</title>
  
@@ -157,7 +157,7 @@ index db3f10c3a2..27d9d2232a 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>
-@@ -1353,31 +1354,32 @@
+@@ -1372,31 +1373,32 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -169,11 +169,11 @@ index db3f10c3a2..27d9d2232a 100644
  
 -      <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \
 -      --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \
--      systemd passwd dnf fedora-release vim-minimal
+-      systemd passwd dnf fedora-release vim-minimal glibc-minimal-langpack
 -# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting>
 +      <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \
 +      --disablerepo='*' --enablerepo=blag --enablerepo=updates install \
-+      systemd passwd dnf blag-release vim-minimal
++      systemd passwd dnf blag-release vim-minimal glibc-minimal-langpack
 +# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting>
  
 -      <para>This installs a minimal Fedora distribution into the
@@ -198,12 +198,12 @@ index db3f10c3a2..27d9d2232a 100644
  
 -      <para>This installs a minimal Debian unstable distribution into
 -      the directory <filename>~/debian-tree/</filename> and then
-+      <para>This installs a minimal gNewSense unstable distribution into
++      <para>This installs a minimal gNewSense Ucclia distribution into
 +      the directory <filename>~/gnewsense-tree/</filename> and then
        spawns a shell in a namespace container in it.</para>
  
        <para><command>debootstrap</command> supports
-@@ -1392,29 +1394,31 @@
+@@ -1411,29 +1413,31 @@
  
      <example>
        <title>Boot a minimal
@@ -217,7 +217,7 @@ index db3f10c3a2..27d9d2232a 100644
  
 -      <para>This installs a minimal Arch Linux distribution into the
 -      directory <filename>~/arch-tree/</filename> and then boots an OS
-+      <para>This installs a minimal Parabola distribution into the
++      <para>This installs a minimal Parabola GNU/Linux-libre distribution into the
 +      directory <filename>~/parabola-tree/</filename> and then boots an OS
        in a namespace container in it.</para>
      </example>
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 8580fd22b..d2bf6a32e 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -11,9 +11,9 @@ pkgname+=('systemd-common' 'systemd-udev')
 # We split Arch's systemd-libs into systemd-$X, for the following $X:
 _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_systemd_libs[@]/#/systemd-}")
-_tag='b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6' # git rev-parse v${pkgver}
-pkgver=244.3
-pkgrel=1
+_tag='68fef5d635424a60224cce610d30a9041124c204' # git rev-parse v${pkgver}
+pkgver=245
+pkgrel=3
 pkgrel+=.parabola1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
@@ -23,7 +23,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
-             'bash-completion')
+             'bash-completion' 'p11-kit')
 makedepends_i686=('gnu-efi-libs' 'pkgconf')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
@@ -78,17 +78,20 @@ sha512sums=('SKIP'
             'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
             '5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850'
             '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97'
-            '2224afc1b69dbfa0818943a96bc878a7dffbd12a585d9c6417089e32aa5498a95bda6623608449887eab7e67f516dfd344fb1704f1f579e6467212278453a1f2'
+            '0bfabbeef212f2f3ae477ce77dd53ad7c90b792f51b904e65107988a30cfdb462766ba55b0d3f0bd3abb49792994b7f5d9483d4ae7f16b9539c4a40200582f83'
             'f8ad54b5fcc8c4e37fbcd364bbf5eafced8db3f2a362ed29b04e1ff67001cedbd4f91cc0e4a9ae143be8d1191902bcc35a48a624ffd45ed1a4bd57df389d4cc4'
             'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
             'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
             '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
-            '8e9147034e979eada4da6e4af9a9e11ef985b1a4493d70d4a3db6476e7699ab84cb16fad0c4d0ce37ac34686950ecb747e142da7b3182aaebb704bdec2473dbf'
+            'beabe1039eda7bf5dfd877303572442c6bcf14f14a3504eb5a91ccf3c60bb6c4ebeeedfb5bb80eea8d4dbaa272812ba3597fafbbbb41c8c35302c2a8363b005a'
             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
 
 _backports=(
-  # units: Split modprobing out into a separate service unit
-  '625077264ba01a108386eeea733ee244e6b7ff14'
+  # core: Fix resolution of nested DM devices for cgroups
+  'b7cf4b4ef5d0336443f21809b1506bc4a8aa75a9'
+
+  # analyze: fix table time output
+  '084df9c616fdfbcbf3d7fbe7dc6b975f1fa359d2'
 )
 
 _reverts=(
@@ -304,7 +307,7 @@ package_systemd-common() {
   depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap'
            'libgcrypt' 'libidn2' 'libidn2.so' 'libseccomp' 'libsystemd.so'
            'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'
-           'xz' 'audit')
+           'xz' 'audit' 'libp11-kit')
 
   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }