core/systemd to 256-3

core/systemd/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = systemd
-	pkgver = 255.7
+	pkgver = 256
-	pkgrel = 1
+	pkgrel = 3
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	license = LGPL-2.1-or-later
@@ -52,8 +52,7 @@ pkgbase = systemd
 	makedepends = qrencode
 	makedepends = lib32-gcc-libs
 	conflicts = mkinitcpio<38-1
-	source = git+https://github.com/systemd/systemd-stable#tag=v255.7?signed
+	source = git+https://github.com/systemd/systemd#tag=v256?signed
-	source = git+https://github.com/systemd/systemd#tag=v255?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = arch.conf
 	source = loader.conf
@@ -74,8 +73,7 @@ pkgbase = systemd
 	validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E
 	validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1
 	validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E
-	sha512sums = 224648e176fe48d0cb96ac740b4f239e7ddbbb6aed6299976f1df2d5825757021c7be243d187446c274715214c8175bf925ebb27eece18a02ce1884bac2c1f20
+	sha512sums = 0a82b5708d1025dbe12a722e3b7e946c5136a17ea2d9b73afba02da474873b3373cd7c1c4eff8bd612c2b16321f31a6109e3c34e548e48ae88fa5bb3fab00383
-	sha512sums = d430427987309483c99062adb02741d25239ba5fbb97053ef817c0c5a0a935328af9c8b651de2b119b0e851dcf6623f01343859735ff81d7013ab0133e67c7ea
 	sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -100,7 +98,7 @@ pkgname = systemd
 	license = CC0-1.0
 	license = GPL-2.0-or-later
 	license = MIT-0
-	depends = systemd-libs=255.7
+	depends = systemd-libs=256
 	depends = acl
 	depends = libacl.so
 	depends = bash
@@ -110,7 +108,6 @@ pkgname = systemd
 	depends = dbus-units
 	depends = kbd
 	depends = kmod
-	depends = libkmod.so
 	depends = hwdata
 	depends = libcap
 	depends = libcap.so
@@ -148,8 +145,8 @@ pkgname = systemd
 	optdepends = libp11-kit: support PKCS#11
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=255.7
+	provides = systemd-tools=256
-	provides = udev=255.7
+	provides = udev=256
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -194,19 +191,19 @@ pkgname = systemd-libs
 
 pkgname = systemd-resolvconf
 	pkgdesc = systemd resolvconf replacement (for use with systemd-resolved)
-	depends = systemd=255.7
+	depends = systemd=256
 	provides = openresolv
 	provides = resolvconf
 	conflicts = resolvconf
 
 pkgname = systemd-sysvcompat
 	pkgdesc = sysvinit compat for systemd
-	depends = systemd=255.7
+	depends = systemd=256
 	conflicts = sysvinit
 
 pkgname = systemd-ukify
 	pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image
-	depends = systemd=255.7
+	depends = systemd=256
 	depends = binutils
 	depends = python-cryptography
 	depends = python-pefile

core/systemd/PKGBUILD

@@ -13,12 +13,12 @@ pkgname=('systemd'
          'systemd-resolvconf'
          'systemd-sysvcompat'
          'systemd-ukify')
-_tag='255.7'
+_tag='256'
 # Upstream versioning is incompatible with pacman's version comparisons, one
 # way or another. So we replace dashes and tildes with the empty string to
 # make sure pacman's version comparing does the right thing for rc versions:
 pkgver="${_tag/[-~]/}"
-pkgrel=1
+pkgrel=3
 arch=('x86_64')
 license=('LGPL-2.1-or-later')
 url='https://www.github.com/systemd/systemd'
@@ -36,8 +36,7 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <
               'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E'  # Luca Boccassi <luca.boccassi@gmail.com>
               '9A774DB5DB996C154EBBFBFDA0099A18E29326E1'  # Yu Watanabe <watanabe.yu+github@gmail.com>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=("git+https://github.com/systemd/systemd-stable#tag=v${_tag}?signed"
+source=("git+https://github.com/systemd/systemd#tag=v${_tag}?signed"
-        "git+https://github.com/systemd/systemd#tag=v${_tag%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
         # bootloader files
         'arch.conf'
@@ -57,8 +56,7 @@ source=("git+https://github.com/systemd/systemd-stable#tag=v${_tag}?signed"
         '30-systemd-tmpfiles.hook'
         '30-systemd-udev-reload.hook'
         '30-systemd-update.hook')
-sha512sums=('224648e176fe48d0cb96ac740b4f239e7ddbbb6aed6299976f1df2d5825757021c7be243d187446c274715214c8175bf925ebb27eece18a02ce1884bac2c1f20'
+sha512sums=('0a82b5708d1025dbe12a722e3b7e946c5136a17ea2d9b73afba02da474873b3373cd7c1c4eff8bd612c2b16321f31a6109e3c34e548e48ae88fa5bb3fab00383'
-            'd430427987309483c99062adb02741d25239ba5fbb97053ef817c0c5a0a935328af9c8b651de2b119b0e851dcf6623f01343859735ff81d7013ab0133e67c7ea'
             '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -95,18 +93,13 @@ if ((_systemd_UPSTREAM)); then
 fi
 
 _backports=(
-  # 99-systemd.rules: rework SYSTEMD_READY logic for device mapper
-  'c072860593329293e19580b337504adb52248462'
 )
 
 _reverts=(
 )
 
 prepare() {
-  cd "$pkgbase-stable"
+  cd "${pkgbase}"
-
-  # add upstream repository for cherry-picking
-  git remote add -f upstream ../systemd
 
   local _c _l
   for _c in "${_backports[@]}"; do
@@ -148,17 +141,17 @@ build() {
     -Dshared-lib-tag="${_meson_version}"
     -Dmode="${_meson_mode}"
 
-    -Dapparmor=false
+    -Dapparmor=disabled
-    -Dbootloader=true
+    -Dbootloader=enabled
-    -Dxenctrl=false
+    -Dxenctrl=disabled
-    -Dbpf-framework=true
+    -Dbpf-framework=enabled
     -Dima=false
     -Dinstall-tests=true
-    -Dlibidn2=true
+    -Dlibidn2=enabled
-    -Dlz4=true
+    -Dlz4=enabled
-    -Dman=true
+    -Dman=enabled
     -Dnscd=false
-    -Dselinux=false
+    -Dselinux=disabled
 
     # We disable DNSSEC by default, it still causes trouble:
     # https://github.com/systemd/systemd/issues/10579
@@ -185,7 +178,7 @@ build() {
     -Dsbat-distro-url="https://archlinuxarm.org/packages/${CARCH}/${pkgname}"
   )
 
-  arch-meson "$pkgbase-stable" build "${_meson_options[@]}" $MESON_EXTRA_CONFIGURE_OPTIONS
+  arch-meson "${pkgbase}" build "${_meson_options[@]}" $MESON_EXTRA_CONFIGURE_OPTIONS
 
   meson compile -C build "${_meson_compile[@]}"
 }
@@ -203,7 +196,7 @@ package_systemd() {
   )
   depends=("systemd-libs=${pkgver}"
            'acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
-           'dbus-units' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so'
+           'dbus-units' 'kbd' 'kmod' 'hwdata' 'libcap' 'libcap.so'
            'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'lz4' 'pam'
            'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
            'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so'

core/systemd/systemd.install

@@ -13,6 +13,10 @@ add_journal_acls() {
 post_common() {
   systemd-sysusers
   journalctl --update-catalog
+
+  if ! grep -qe '^/usr/bin/systemd-home-fallback-shell$' etc/shells; then
+    echo '/usr/bin/systemd-home-fallback-shell' >> etc/shells
+  fi
 }
 
 post_install() {
@@ -44,6 +48,15 @@ post_upgrade() {
     systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
   fi
 
+  # show for feature release: 255 -> 256 -> 257 -> ...
+  if [ $(vercmp "${1%%[!0-9]*}" "${2%%[!0-9]*}") -ne 0 ]; then
+	cat <<-EOM
+	:: This is a systemd feature update. You may want to have a look at
+	   NEWS for what changed, or if you observe unexpected behavior:
+	     /usr/share/doc/systemd/NEWS
+	EOM
+  fi
+
   local v upgrades=(
   )
 
@@ -54,4 +67,8 @@ post_upgrade() {
   done
 }
 
+post_remove() {
+  sed -i -r '/^\/usr\/bin\/systemd-home-fallback-shell$/d' etc/shells
+}
+
 # vim:set ts=2 sw=2 et: