libre/notsystemd: update to 234.1

4 files changed, 61 insertions, 68 deletions

diff --git a/libre/notsystemd/PKGBUILD b/libre/notsystemd/PKGBUILD
index 51fdd6128..f8c8b88bf 100644
--- a/libre/notsystemd/PKGBUILD
+++ b/libre/notsystemd/PKGBUILD
@@ -1,18 +1,20 @@
+# Maintainer (Arch): Christian Hesse <mail@eworm.de>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_pkgname=systemd
+_pkgbase=systemd
 # latest commit on stable branch
-_commit='27c7bc970d9e7ffe060688a8dd77b7747503a564'
+_commit='d52e2bb9c20216972754c054e8534bca28baab66'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-_pkgver=233.75
-_pkgrel=3
-_pkgrel+=.parabola1
+_pkgver=234.11
+_pkgrel=8
+_pkgrel+=.parabola3
 
 pkgname=notsystemd
-pkgver=233.1
+pkgver=234.1
 pkgrel=1
 arch=('i686' 'x86_64')
 arch+=('armv7h')
@@ -21,7 +23,8 @@ license=('GPL2' 'LGPL2.1')
 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')
+             'python-lxml' 'quota-tools' 'shadow' 'git'
+             'meson' 'libseccomp')
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
@@ -48,18 +51,18 @@ source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
         '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')
 sha512sums=('SKIP'
             'SKIP'
-            '39cda5d4adaae64f57a6e566e7127ef2c18cbb5a106100431d9aa562a298e8555d7a374e81b7f66d1ef8514d1d8eb489f7f2fc452d12291944c2d5de7eb2e029'
+            '6e75173430fb2bc02a560bdc23f30586e960826e31e17bb9db5cbe1c25d037bcde47b01f686fe4b7af810f0d866b55cf04874b013cde1c61d8c6feea780f2b65'
             'SKIP'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '691acebb243b9cd7fb63272662f34bdb9aead710c69aee9361ab2322f9f108600ad5b0214fc00b7cb2d9c95db8abd748030625d60d6567efd98663c56ba28c65'
+            'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'
             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
             'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
             '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
-            '9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
-            '0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
+            '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30'
+            'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3'
             '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618'
             'e85c5564348253e1bc49d943f0456c38ebef0c50a5a7782ea6ebb1f45bd624a69430d79693fe1223b0adace9f07c167b84133a003a09a8b61ae48d1b70610277'
             '0ad718e9441798a4479600ffce364c2f0e582fd0ccf7762dde90f99755dee4569bcee8299ea2ccbf3a010966c8d48c59fcd0b1f93c9b8a479332c2c128fc2b2a'
@@ -74,23 +77,19 @@ validpgpkeys=(
 )
 
 _backports=(
-  # build-sys: make RPM macros installation path configurable
-  'ff2e33db54719bfe8feea833571652318c6d197c'
-  # resolved: do not start LLMNR or mDNS stack when no network enables them
-  '2c7ef56459bf6fe7761595585aa4eed5cd183f27^..2c7ef56459bf6fe7761595585aa4eed5cd183f27^2'
-  # networkd: RFC compliant autonomous prefix handling (#5636)
-  '6554550f35a7976f9110aff94743d3576d5f02dd'
-  # core: do not print color console message about gc-ed jobs
-  '047d7219fde661698d3487fc49e9878c61eefd77'
-  # (glibc 2.26) fix includes
-  '284d1cd0a12cad96a5ea61d1afb0dd677dbd147e'
+  # cryptsetup: fix infinite timeout (#6486)
+  '0864d311766498563331f486909a0d950ba7de87'
+
+  # process-util: add getpid_cached() as a caching wrapper for getpid()
+  '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
+  # tree-wide: make use of getpid_cached() wherever we can
+  'df0ff127758809a45105893772de76082d12a26d'
+
+  # call chase_symlinks without the /sysroot prefix (#6411) (FS#54958)
+  '98eda38aed6a10c4f6d6ad0cac6e5361e87de52b'
 )
 
 _reverts=(
-  # core: store the invocation ID in the per-service keyring
-  'b3415f5daef49642be3d5f417b8880c078420ff7'
-  # core: run each system service with a fresh session keyring
-  '74dd6b515fa968c5710b396a7664cac335e25ca8'
 )
 
 _validate_tag() {
@@ -121,8 +120,8 @@ _validate_tag() {
 }
 
 prepare() {
-  cd "$_pkgname-stable"
-  
+  cd "$_pkgbase-stable"
+
   git remote add upstream ../systemd/
   git fetch --all
 
@@ -136,16 +135,11 @@ prepare() {
     git revert -n "$_commit"
   done
 
-  # nss-resolve: drop the internal fallback to libnss_dns
-  git show '5486a31d287f26bcd7c0a4eb2abfa4c074b985f1' -- \
-    'Makefile.am' 'src/nss-resolve/nss-resolve.c' | git apply --index
-  
-  # Resolved packet size (#6214) (FS#54619, CVE-2017-9445)
-  git show '751ca3f1de316ca79b60001334dbdf54077e1d01' \
-    'db848813bae4d28c524b3b6a7dad135e426659ce' \
-    '88795538726a5bbfd9efc13d441cb05e1d7fc139' \
-    '64a21fdaca7c93f1c30b21f6fdbd2261798b161a' \
-    -- . ':!src/resolve/meson.build'  | git apply --index
+  # core: store the invocation ID in the per-service keyring
+  # core: run each system service with a fresh session keyring
+  git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
+    '74dd6b515fa968c5710b396a7664cac335e25ca8' \
+    -- . ':!src/test/test-id128.c' | git apply --reverse --index
 
   # apply FSDG patches
   local _patch
@@ -162,8 +156,6 @@ prepare() {
 }
 
 build() {
-  cd "$_pkgname-stable"
-
   local timeservers=({0..3}.arch.pool.ntp.org)
 
   if [ "$CARCH" = "armv7h" ]; then
@@ -172,39 +164,39 @@ build() {
     CXXFLAGS+=" -fno-lto"
   fi
 
-  local configure_options=(
-    --libexecdir=/usr/lib
-    --localstatedir=/var
-    --sysconfdir=/etc
-
-    --enable-lz4
-    --disable-audit
-    --disable-ima
-
-    --with-sysvinit-path=
-    --with-sysvrcnd-path=
-    --with-ntp-servers="${timeservers[*]}"
-    --with-default-dnssec=no
-    --with-dbuspolicydir=/usr/share/dbus-1/system.d
-    --without-kill-user-processes
-    --with-rpmmacrosdir=no
+  local meson_options=(
+    --buildtype=release
+    -Db_lto=true
+
+    -Daudit=false
+    -Dima=false
+    -Dlz4=true
+
+    -Ddbuspolicydir=/usr/share/dbus-1/system.d
+    -Ddefault-dnssec=no
     # TODO(dreisner): consider changing this to unified
-    --with-default-hierarchy=hybrid
+    -Ddefault-hierarchy=hybrid
+    -Ddefault-kill-user-processes=false
+    -Dfallback-hostname='parabola'
+    -Dntp-servers="${timeservers[*]}"
+    -Drpmmacrosdir=no
+    -Dsysvinit-path=
+    -Dsysvrcnd-path=
   )
   if [ "$CARCH" != "armv7h" ]; then
-    configure_options+=(--enable-gnuefi)
+    meson_options+=(-Dgnuefi=true)
   fi
 
-  ./configure "${configure_options[@]}"
+  meson "$_pkgbase-stable" build "${meson_options[@]}"
 
-  make
+  ninja -C build
 
   # Go ahead and split the package now.  It's easier this way, because
   # we can use mv instead of awkward, error-prone rm/cp pairs.
   rm -rf "$srcdir/dest"
 
   # Put things in the main systemd package by default
-  make DESTDIR="$srcdir/dest/systemd" install
+  DESTDIR="$srcdir/dest/systemd" ninja -C build install
 
   install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}
   mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd
@@ -260,10 +252,10 @@ package() {
   install="systemd.install"
 
   pkgdesc+=", modified to work with other init systems"
-  conflicts+=("$_pkgname")
-  provides+=("$_pkgname=$_pkgver-$_pkgrel")
+  conflicts+=("$_pkgbase")
+  provides+=("$_pkgbase=$_pkgver-$_pkgrel")
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgname" "$pkgdir"
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir"
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
@@ -271,7 +263,7 @@ package() {
   rm -r "$pkgdir/etc/systemd/system/"*.service
 
   # add back tmpfiles.d/legacy.conf
-  install -m644 "$_pkgname-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+  install -m644 "$_pkgbase-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
 
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
@@ -291,8 +283,8 @@ package() {
   chmod 2755 "$pkgdir/var/log/journal"
 
   # match directory owner/group and mode from extra/polkit
-  chown root:102 "$pkgdir/usr/share/polkit-1/rules.d"
-  chmod 0750     "$pkgdir/usr/share/polkit-1/rules.d"
+  chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d
+  chmod 0750     "$pkgdir"/usr/share/polkit-1/rules.d
 
   # we'll create this on installation
   rmdir "$pkgdir/var/log/journal/remote"
diff --git a/libre/notsystemd/initcpio-install-systemd b/libre/notsystemd/initcpio-install-systemd
index e53376ab4..5bf7b7f16 100644
--- a/libre/notsystemd/initcpio-install-systemd
+++ b/libre/notsystemd/initcpio-install-systemd
@@ -112,6 +112,7 @@ build() {
     map add_binary \
         /usr/bin/systemd-tmpfiles \
         /usr/lib/systemd/systemd-hibernate-resume \
+        /usr/lib/systemd/systemd-sulogin-shell \
         /usr/lib/systemd/system-generators/systemd-fstab-generator \
         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
diff --git a/libre/notsystemd/systemd-sysusers.hook b/libre/notsystemd/systemd-sysusers.hook
index b0888d7cf..6b8affa16 100644
--- a/libre/notsystemd/systemd-sysusers.hook
+++ b/libre/notsystemd/systemd-sysusers.hook
@@ -7,5 +7,5 @@ Target = usr/lib/sysusers.d/*.conf
 [Action]
 Description = Updating system user accounts...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "$(basename "$f")" ; done'
 NeedsTargets
diff --git a/libre/notsystemd/systemd-tmpfiles.hook b/libre/notsystemd/systemd-tmpfiles.hook
index a2c5e3ef0..18cdd9180 100644
--- a/libre/notsystemd/systemd-tmpfiles.hook
+++ b/libre/notsystemd/systemd-tmpfiles.hook
@@ -7,5 +7,5 @@ Target = usr/lib/tmpfiles.d/*.conf
 [Action]
 Description = Creating temporary files...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "/$f"; done'
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "$(basename "$f")"; done'
 NeedsTargets