systemd-241.7-2.par1: updating version

2 files changed, 25 insertions, 20 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 62cd0131c..5988ab8da 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
@@ -17,15 +17,15 @@ diff --git a/man/kernel-install.xml b/man/kernel-install.xml
 index cd9756662a..9ead6ea39b 100644
 --- a/man/kernel-install.xml
 +++ b/man/kernel-install.xml
-@@ -88,7 +88,7 @@
+@@ -92,7 +92,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
--            missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.  If the file
-+            missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.  If the file
-             <filename>initrd</filename> is found next to the kernel image file, the initrd will be added to the
-             configuration.</para></listitem>
+-            missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para></listitem>
++            missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para></listitem>
            </itemizedlist>
+         </listitem>
+       </varlistentry>
 diff --git a/man/os-release.xml b/man/os-release.xml
 index a51edf3b8a..9ff4b7e8c2 100644
 --- a/man/os-release.xml
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index f8fef3595..52efcddea 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -6,16 +6,16 @@
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 
 pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat')
+pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
 pkgname+=('systemd-common' 'systemd-udev')
-# We split Arch's libsystemd into systemd-$X, for the following $X:
-_libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
-pkgname+=("${_libsystemd[@]/#/systemd-}")
+# 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-}")
 # Can be from either systemd or systemd-stable
-_commit='0430af90ef28a229e51136ad364e1da7e76c8638'
-pkgver=240.95
-pkgrel=1
-pkgrel+=.parabola5
+_commit='a09c170122cf3b37c3e4431bf082f9dbdc07fc70'
+pkgver=241.7
+pkgrel=2
+pkgrel+=.par1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
 url='https://www.github.com/systemd/systemd'
@@ -81,7 +81,7 @@ sha512sums=('SKIP'
             'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
             'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'
-            'ff25035b5ed7b7b1720850573235159dee3d3aa5ca042cd5249094727f0e1d9dbf249d5612a1f2fefc20ed1618000277f2c3542ac513465764a98a3405455be2'
+            'c59403b28681962dae6a04a5dd1f5c8ba3e10a3c6127cbc8749f9b4a1a9aa3c279c5523d813c9467d214c097ceff8ea713fe64325d17a09608c01bf70043524d'
             'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
             'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
             '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
@@ -89,8 +89,6 @@ sha512sums=('SKIP'
             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
 
 _backports=(
-  # https://github.com/systemd/systemd/issues/11259
-  '8ca9e92c742602b8bcd431001e6f5b78c28c184f'
 )
 
 _reverts=(
@@ -155,6 +153,8 @@ build() {
   fi
 
   local _meson_options=(
+    -Dversion-tag="${pkgver}-${pkgrel}"
+
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
@@ -233,7 +233,7 @@ package_systemd() {
   license=('LGPL2.1')
   groups=('base-devel')
   depends=('bash' 'dbus' 'kbd' 'kmod'
-           'libsystemd' 'pam' 'libelf'
+           'systemd-libs' 'pam' 'libelf'
            'util-linux' 'pcre2')
   depends+=("systemd-common=$pkgver-$pkgrel" 'udev')
   provides=("systemd-tools=$pkgver")
@@ -250,9 +250,11 @@ package_systemd() {
           etc/systemd/journal-remote.conf
           etc/systemd/journal-upload.conf
           etc/systemd/logind.conf
+          etc/systemd/networkd.conf
+          etc/systemd/resolved.conf
+          etc/systemd/sleep.conf
           etc/systemd/system.conf
           etc/systemd/timesyncd.conf
-          etc/systemd/resolved.conf
           etc/systemd/user.conf)
   install=systemd.install
 
@@ -341,10 +343,13 @@ package_systemd-udev() {
   install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook
 }
 
-package_libsystemd() {
+package_systemd-libs() {
   pkgdesc='systemd client libraries metapackage'
-  depends=("${_libsystemd[@]/libsystemd/libsystemd.so}")
+  depends=("${_systemd_libs[@]/libsystemd/libsystemd.so}")
   license=('LGPL2.1')
+  provides=('libsystemd')
+  conflicts=('libsystemd')
+  replaces=('libsystemd')
 }
 
 package_systemd-libsystemd() {