systemd-237.0-2.parabola1: updating version

2 files changed, 13 insertions, 15 deletions

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 d2bbda12c..f915f209c 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,10 +131,10 @@ index 81f294c7e4..973e19747d 100644
  
    <refsect1>
 diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 3dbdf376d3..01e6ca403a 100644
+index 633d93938..fd9db974d 100644
 --- a/man/systemd-nspawn.xml
 +++ b/man/systemd-nspawn.xml
-@@ -1082,11 +1082,12 @@
+@@ -1078,11 +1078,12 @@
    <refsect1>
      <title>Examples</title>
  
@@ -144,11 +144,11 @@ index 3dbdf376d3..01e6ca403a 100644
        <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 \
++      <programlisting># machinectl pull-raw -&2Dverify=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>
  
-@@ -1094,31 +1095,32 @@
+@@ -1090,31 +1091,32 @@
        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
        and opens a shell in it.</para>
      </example>
@@ -182,9 +182,9 @@ index 3dbdf376d3..01e6ca403a 100644
 -      <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>
 +      <title>Spawn a shell in a container of a minimal gNewSense Ucclia distribution</title>
  
--      <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/
+-      <programlisting># debootstrap unstable ~/debian-tree/
 -# systemd-nspawn -D ~/debian-tree/</programlisting>
-+      <programlisting># debootstrap --arch=amd64 ucclia ~/gnewsense-tree/
++      <programlisting># debootstrap ucclia ~/gnewsense-tree/
 +# systemd-nspawn -D ~/gnewsense-tree/</programlisting>
  
 -      <para>This installs a minimal Debian unstable distribution into
@@ -194,7 +194,7 @@ index 3dbdf376d3..01e6ca403a 100644
        spawns a shell in a namespace container in it.</para>
  
        <para><command>debootstrap</command> supports
-@@ -1133,29 +1135,31 @@
+@@ -1129,29 +1131,31 @@
  
      <example>
        <title>Boot a minimal
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 2be614b55..3e4ad21f1 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -10,12 +10,12 @@ 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='a1b2c92d8290c76a29ccd0887a92ac064e1bb5a1'
+_commit='46659f7deb962f55c728e70597e37c2a3ab6326d'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=236.0
+pkgver=237.0
 pkgrel=2
-pkgrel+=.parabola2
+pkgrel+=.parabola1
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 url="https://www.github.com/systemd/systemd"
@@ -23,7 +23,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git'
-             'meson' 'libseccomp')
+             'meson' 'libseccomp' 'pcre2')
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
@@ -66,12 +66,10 @@ sha512sums=('SKIP'
             '7b969dc665281eb43871cf399398ddc25a16f533919dfbf721e2a2eb922cde6936c42400083ef39d5cc873a0b2bf749897c9bb1aaa38624315b8e5810f82efca'
             'fbcc54a62b6f3f7ec1dfad8317160c3057f145e542a423a2fd6b5c141012929aeb977491afe35b16c4903b5fd0d1469f3d87d1c8a036b4d6b623ac7dbe682ff5'
             '4e86eac4132d5bd712061d09c14141d91e6bfd2f3879a1fc4a92a15fa77d01552de5c9ebae4a67be2b2a54223a53f2538ba03d4fa0c96ecd1e62a4e8cf341fd1'
-            'f443f25f788eb0bf3199a60f8765db1e60f596ec9939c14f7670ed51b97756ec6f0488a619e3f0f750111f3a82f9d5dbfac601138e7822d9e2a39219a57522a4'
+            '44aefd4b9dd6b5c3d57ff1647cd21a88cd5dc4eb2edab5c0232eb4e8ecd35dc778564699580011bf2c092d4fcf9bbe7f9e6db5088345eedb1895c64eb1e3a5d3'
             '6a16666f18b7075a68733376f4b1fe34dd2aa29eaf43e693a98e303b9c5202317636816cb4a914d5141801026d1693dd4de2f79e0950aa777e8de6e4879cd9d0')
 
 _backports=(
-  # cryptsetup-generator: Don't mistake NULL input as OOM (#7688) 
-  'aff0b1fa7bf2ca60fd5ffdf7ea25184d576cf61d'
 )
 
 _reverts=(
@@ -213,7 +211,7 @@ package_systemd() {
   groups=('base-devel')
   depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
            'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
-           'util-linux' 'xz')
+           'util-linux' 'xz' 'pcre2')
   provides=("systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('systemd-tools' 'udev')
   conflicts=('systemd-tools' 'udev')