From 88a65c41488e50427af8c76aa3536f426dc70a83 Mon Sep 17 00:00:00 2001 From: Thorsten Töpper Date: Fri, 22 Nov 2024 18:37:40 +0100 Subject: patch adj.: HAVE_SYSV_COMPAT now removed upstream. --- .SRCINFO | 32 +++++++++++++------------- 0001-Use-Arch-Linux-device-access-groups.patch | 22 ------------------ PKGBUILD | 4 ++-- 3 files changed, 18 insertions(+), 40 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 144c206..c12d729 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = systemd-git pkgdesc = systemd (git version) - pkgver = 257.rc1.r77650.bae936b418e + pkgver = 257.rc2.r77730.d209e197f89 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -73,7 +73,7 @@ pkgbase = systemd-git source = 30-systemd-udev-reload.hook source = 30-systemd-update.hook sha512sums = SKIP - sha512sums = 72fe24d4178441fbad7f8a949cbbce05f7aae51a7b1579aa6427f76c9aa376b42596a59e94ef67a0f52c57e007e92e074e22fdd2afe9c72af5a6c40b8937eef9 + sha512sums = bf09fbaddbc5429c98d04f4c2e02415c6cb2c8e3314c3aaa898cbf324e09bc6790b190ee1338689e02961eaf8276d02bd08b83d423d6e6d5ebb62467f5a9d683 sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 @@ -97,7 +97,7 @@ pkgname = systemd-git license = CC0-1.0 license = GPL-2.0-or-later license = MIT-0 - depends = systemd-libs-git=257.rc1.r77650.bae936b418e + depends = systemd-libs-git=257.rc2.r77730.d209e197f89 depends = acl depends = libacl.so depends = bash @@ -132,7 +132,7 @@ pkgname = systemd-git optdepends = libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote optdepends = quota-tools: kernel-level quota management optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries - optdepends = systemd-ukify-git=257.rc1.r77650.bae936b418e: combine kernel and initrd into a signed Unified Kernel Image + optdepends = systemd-ukify-git=257.rc2.r77730.d209e197f89: combine kernel and initrd into a signed Unified Kernel Image optdepends = polkit: allow administration as unprivileged user optdepends = python: Unified Kernel Image with ukify optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw @@ -146,9 +146,9 @@ pkgname = systemd-git optdepends = libp11-kit: support PKCS#11 optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=257.rc1.r77650.bae936b418e - provides = udev=257.rc1.r77650.bae936b418e - provides = systemd=257.rc1.r77650.bae936b418e + provides = systemd-tools=257.rc2.r77730.d209e197f89 + provides = udev=257.rc2.r77730.d209e197f89 + provides = systemd=257.rc2.r77730.d209e197f89 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -189,41 +189,41 @@ pkgname = systemd-libs-git provides = libsystemd provides = libsystemd.so provides = libudev.so - provides = systemd-libs=257.rc1.r77650.bae936b418e + provides = systemd-libs=257.rc2.r77730.d209e197f89 conflicts = libsystemd conflicts = systemd-libs replaces = libsystemd pkgname = systemd-resolvconf-git pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) (git version) - depends = systemd-git=257.rc1.r77650.bae936b418e + depends = systemd-git=257.rc2.r77730.d209e197f89 provides = openresolv provides = resolvconf - provides = systemd-resolvconf=257.rc1.r77650.bae936b418e + provides = systemd-resolvconf=257.rc2.r77730.d209e197f89 conflicts = resolvconf conflicts = systemd-resolvconf pkgname = systemd-sysvcompat-git pkgdesc = sysvinit compat for systemd (git version) - depends = systemd-git=257.rc1.r77650.bae936b418e - provides = systemd-sysvcompat=257.rc1.r77650.bae936b418e + depends = systemd-git=257.rc2.r77730.d209e197f89 + provides = systemd-sysvcompat=257.rc2.r77730.d209e197f89 conflicts = sysvinit conflicts = systemd-sysvcompat pkgname = systemd-tests-git pkgdesc = systemd tests (git version) - depends = systemd=257.rc1.r77650.bae936b418e - provides = systemd-tests=257.rc1.r77650.bae936b418e + depends = systemd=257.rc2.r77730.d209e197f89 + provides = systemd-tests=257.rc2.r77730.d209e197f89 conflicts = systemd-tests pkgname = systemd-ukify-git pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image (git version) - depends = systemd-git=257.rc1.r77650.bae936b418e + depends = systemd-git=257.rc2.r77730.d209e197f89 depends = binutils depends = python-cryptography depends = python-pefile optdepends = python-pillow: Show the size of splash image optdepends = sbsigntools: Sign the embedded kernel provides = ukify - provides = systemd-ukify=257.rc1.r77650.bae936b418e + provides = systemd-ukify=257.rc2.r77730.d209e197f89 conflicts = systemd-ukify diff --git a/0001-Use-Arch-Linux-device-access-groups.patch b/0001-Use-Arch-Linux-device-access-groups.patch index 8adfaba..7b9d674 100644 --- a/0001-Use-Arch-Linux-device-access-groups.patch +++ b/0001-Use-Arch-Linux-device-access-groups.patch @@ -169,27 +169,5 @@ index 4f2c0d7c43..62e2ae0986 100644 # hence without use on SysV-less systems. -From b36b8d0be260ad289d2b572f679a3dc03595d964 Mon Sep 17 00:00:00 2001 -From: Thorsten Toepper -Date: Thu, 12 Sep 2024 19:49:37 +0200 -Subject: [PATCH] application of legacy.conf in meson.build segment failed. - ---- - tmpfiles.d/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index 52611357c2..3067f7996c 100644 ---- a/tmpfiles.d/meson.build -+++ b/tmpfiles.d/meson.build -@@ -35,7 +35,7 @@ in_files = [ - ['20-systemd-stub.conf', 'ENABLE_EFI'], - ['20-systemd-userdb.conf', 'ENABLE_SSH_USERDB_CONFIG'], - ['etc.conf'], -- ['legacy.conf', 'HAVE_SYSV_COMPAT'], -+ ['legacy.conf'], - ['static-nodes-permissions.conf'], - ['systemd.conf'], - ['var.conf'], -- diff --git a/PKGBUILD b/PKGBUILD index aa18773..244c803 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('systemd-git' 'systemd-tests-git' 'systemd-ukify-git') pkgdesc='systemd (git version)' -pkgver=257.rc1.r77650.bae936b418e +pkgver=257.rc2.r77730.d209e197f89 pkgrel=1 arch=('x86_64') license=('LGPL-2.1-or-later') @@ -46,7 +46,7 @@ source=("$pkgbase-stable::git+https://github.com/systemd/systemd" '30-systemd-udev-reload.hook' '30-systemd-update.hook') sha512sums=('SKIP' - '72fe24d4178441fbad7f8a949cbbce05f7aae51a7b1579aa6427f76c9aa376b42596a59e94ef67a0f52c57e007e92e074e22fdd2afe9c72af5a6c40b8937eef9' + 'bf09fbaddbc5429c98d04f4c2e02415c6cb2c8e3314c3aaa898cbf324e09bc6790b190ee1338689e02961eaf8276d02bd08b83d423d6e6d5ebb62467f5a9d683' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' -- cgit v1.2.3-70-g09d2