systemd-246.2-2.parabola1: updating version

3 files changed, 71 insertions, 65 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 c5878b939..786c6370f 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
@@ -59,13 +59,13 @@ index ee8e8b7faf..28324ac102 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 affca1dec1..278ca8d677 100644
+index 37e51f90cf..08f4d938b3 100644
 --- a/man/machinectl.xml
 +++ b/man/machinectl.xml
-@@ -867,7 +867,7 @@
+@@ -852,7 +852,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
+     rules. Machine names must be suitable for use as hostnames
 -    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
@@ -156,36 +156,36 @@ index 7caf35f8e8..18d9c5a33b 100644
        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 53c46a1018..a2ccf4fae2 100644
+index 914607e3f8..3274881ca6 100644
 --- a/man/systemd-resolved.service.xml
 +++ b/man/systemd-resolved.service.xml
-@@ -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
--      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>
-@@ -190,7 +190,7 @@
- 
+@@ -49,7 +49,7 @@
+       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
++      This 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>).
+@@ -227,7 +227,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
-@@ -206,7 +206,7 @@
-       <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
+       <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional
+-      Linux programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists
++      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
+       <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not be used directly by applications,
+@@ -243,7 +243,7 @@
+       </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
+       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
 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
 index 3bd790b485..a532b74a6e 100644
 --- a/man/systemd.exec.xml
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 73a01d674..c1b06119f 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
@@ -97,26 +97,29 @@ index 272258b4e1..6cea40cb99 100644
        </varlistentry>
  
        <varlistentry>
-@@ -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:
--    <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para>
-+    <literal>DEBIAN_BTS="debbugs://bugs.gnewsense.org/"</literal></para>
-   </refsect1>
- 
+@@ -350,25 +350,19 @@
    <refsect1>
      <title>Example</title>
  
 -    <programlisting>NAME=Fedora
--VERSION="17 (Beefy Miracle)"
+-VERSION="32 (Workstation Edition)"
 -ID=fedora
--VERSION_ID=17
--PRETTY_NAME="Fedora 17 (Beefy Miracle)"
--ANSI_COLOR="0;34"
--CPE_NAME="cpe:/o:fedoraproject:fedora:17"
+-VERSION_ID=32
+-PRETTY_NAME="Fedora 32 (Workstation Edition)"
+-ANSI_COLOR="0;38;2;60;110;180"
+-LOGO=fedora-logo-icon
+-CPE_NAME="cpe:/o:fedoraproject:fedora:32"
 -HOME_URL="https://fedoraproject.org/"
--BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>
+-DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f32/system-administrators-guide/"
+-SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help"
+-BUG_REPORT_URL="https://bugzilla.redhat.com/"
+-REDHAT_BUGZILLA_PRODUCT="Fedora"
+-REDHAT_BUGZILLA_PRODUCT_VERSION=32
+-REDHAT_SUPPORT_PRODUCT="Fedora"
+-REDHAT_SUPPORT_PRODUCT_VERSION=32
+-PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy"
+-VARIANT="Workstation Edition"
+-VARIANT_ID=workstation</programlisting>
 +    <programlisting>NAME=Parabola
 +VERSION="rolling-release"
 +ID=parabola
@@ -124,26 +127,29 @@ index 272258b4e1..6cea40cb99 100644
 +VERSION_ID=rolling-release
 +PRETTY_NAME="Parabola GNU/Linux-libre"
 +ANSI_COLOR="1;35"
++LOGO=parabola-logo-icon
 +CPE_NAME="cpe:/o:parabola:parabola:rolling-release"
 +HOME_URL="https://www.parabola.nu/"
++DOCUMENTATION_URL="https://wiki.parabola.nu/"
++SUPPORT_URL="https://labs.parabola.nu/projects/parabola-community-forum/boards"
 +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>
    </refsect1>
  
    <refsect1>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index b269b99170..19a44bb09a 100644
+index 69558ac85c..a561fe9eb0 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 "31">
+-<!ENTITY fedora_latest_version "32">
 +<!ENTITY blag_latest_version "140">
- <!ENTITY fedora_cloud_release "1.9">
+ <!ENTITY fedora_cloud_release "1.6">
  ]>
  <!-- SPDX-License-Identifier: LGPL-2.1+ -->
-@@ -1359,11 +1359,12 @@
+@@ -1415,11 +1415,12 @@
    <refsect1>
      <title>Examples</title>
  
@@ -157,7 +163,7 @@ index b269b99170..19a44bb09a 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>
-@@ -1372,31 +1373,32 @@
+@@ -1428,37 +1429,36 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -180,7 +186,7 @@ index b269b99170..19a44bb09a 100644
 -      directory <filename index="false">/var/lib/machines/f&fedora_latest_version;</filename>
 +      <para>This installs a minimal BLAG distribution into the
 +      directory <filename index="false">/var/lib/machines/blag&blag_latest_version;</filename>
-       and then boots an OS in a namespace container in it. Because the installation
+       and then boots that OS in a namespace container. 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 f&fedora_latest_version;</command>.</para>
@@ -200,10 +206,17 @@ index b269b99170..19a44bb09a 100644
 -      the directory <filename>~/debian-tree/</filename> and then
 +      <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>
+       spawns a shell from this image in a namespace container.</para>
  
        <para><command>debootstrap</command> supports
-@@ -1411,29 +1413,31 @@
+-      <ulink url="https://www.debian.org">Debian</ulink>,
+-      <ulink url="https://www.ubuntu.com">Ubuntu</ulink>,
+-      and <ulink url="https://www.tanglu.org">Tanglu</ulink>
++      <ulink url="https://www.debian.org">gNewSense</ulink>
+       out of the box, so the same command can be used to install any of those. For other
+       distributions from the Debian family, a mirror has to be specified, see
+       <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+@@ -1467,29 +1467,31 @@
  
      <example>
        <title>Boot a minimal
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 8904d6cd0..ada8a4d21 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -11,16 +11,16 @@ 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='8a8b000d682a7108463c5c74bc876c5658d9de4a' # git rev-parse v${pkgver}
-pkgver=245.7
-pkgrel=1
+_tag='91b37e6f0982e1e64c63017000248d7441a83a2e' # git rev-parse v${pkgver}
+pkgver=246.2
+pkgrel=2
 pkgrel+=.parabola1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+             'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
              'bash-completion' 'p11-kit' 'systemd')
@@ -32,7 +32,6 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <
 source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
         "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
-        '0002-make-homed-userdbd-repart-services-installable.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -61,7 +60,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
 sha512sums=('SKIP'
             'SKIP'
             'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
-            '85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
@@ -80,17 +78,15 @@ sha512sums=('SKIP'
             'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
             '5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850'
             '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97'
-            '7554723226a1fa67b325572ccadab2b3f6e4ab43de980faa686edfe5022282e9036f039419517766770dabc9f1f583bd8149f67f155edd08d687fad9d965fabf'
+            'e94ac3884237bd95b3e2b183b71e7aae4fdbacce043368d32deee9f6da15d9d61b57a78bc889ef1b69f85499bfaec9f4121adb3f81a01a28571e7905be96231b'
             'f8ad54b5fcc8c4e37fbcd364bbf5eafced8db3f2a362ed29b04e1ff67001cedbd4f91cc0e4a9ae143be8d1191902bcc35a48a624ffd45ed1a4bd57df389d4cc4'
             'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
             'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
             '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
-            'beabe1039eda7bf5dfd877303572442c6bcf14f14a3504eb5a91ccf3c60bb6c4ebeeedfb5bb80eea8d4dbaa272812ba3597fafbbbb41c8c35302c2a8363b005a'
+            '49ee2af68a256d523143c830e7efcea8b75265b39c06880a53acaf178125b644baa39bc71b7217ea54dd0c31d8fa1fce9328a7169c9ca24fe6c0e37faab50464'
             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
 
 _backports=(
-  # systemd-resolved: use hostname for certificate validation in DoT
-  'eec394f10bbfcc3d2fc8504ad8ff5be44231abd5'
 )
 
 _reverts=(
@@ -115,9 +111,6 @@ prepare() {
   # Replace cdrom/dialout/tape groups with optical/uucp/storage
   patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
 
-  # Make homed/userdbd/repart services installable (to allow uninstalling)
-  patch -Np1 -i ../0002-make-homed-userdbd-repart-services-installable.patch
-
   # apply FSDG patches
   local _patch
   for _patch in "$srcdir"/????-FSDG-*.patch; do
@@ -220,7 +213,7 @@ build() {
   done
 
   install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
-  mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+  mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 \
      -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
 
   rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}
@@ -265,7 +258,7 @@ package_systemd() {
   rmdir "$pkgdir"/var/log/journal/remote
 
   # executable (symlinks) shipped with systemd-sysvcompat
-  rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
+  rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown}
 
   # files shipped with systemd-resolvconf
   rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
@@ -311,7 +304,7 @@ package_systemd-common() {
   license=('LGPL2.1')
   depends=('acl' 'libacl.so' 'cryptsetup' 'libcryptsetup.so' 'libdbus'
            'glibc' 'iptables' 'libcap' 'libcap.so'
-           'libgcrypt' 'libidn2' 'libidn2.so' 'libseccomp' 'libseccomp.so' 'libsystemd.so'
+           'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'libidn2.so' 'libseccomp' 'libseccomp.so' 'libsystemd.so'
            'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'
            'xz' 'audit' 'libaudit.so' 'libp11-kit' 'libp11-kit.so' 'openssl')
 
@@ -351,7 +344,7 @@ package_systemd-libs() {
 
 package_systemd-libsystemd() {
   pkgdesc='systemd client library'
-  depends=('glibc' 'libcap' 'libcap.so' 'libgcrypt' 'lz4' 'xz')
+  depends=('glibc' 'libcap' 'libcap.so' 'libgcrypt' 'lz4' 'xz' 'zstd')
   license=('LGPL2.1')
   provides=('libsystemd.so')
 
@@ -450,7 +443,7 @@ package_systemd-sysvcompat() {
 
   install -d -m0755 "$pkgdir"/usr/bin
   ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
+  for tool in halt poweroff reboot shutdown; do
     ln -s systemctl "$pkgdir"/usr/bin/$tool
   done
 }