summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/systemd/PKGBUILD92
-rw-r--r--libre/systemd/initcpio-install-systemd1
-rw-r--r--libre/systemd/systemd-binfmt.hook1
-rw-r--r--libre/systemd/systemd-hook14
-rw-r--r--libre/systemd/systemd-sysctl.hook1
-rw-r--r--libre/systemd/systemd-sysusers.hook1
-rw-r--r--libre/systemd/systemd-tmpfiles.hook1
7 files changed, 45 insertions, 66 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index f835253d0..b92e2b5a7 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -10,9 +10,9 @@ pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
_libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
pkgname+=("${_libsystemd[@]}")
# Can be from either systemd or systemd-stable
-_commit='f398c546c6fc43121131f41acec56b5a851bd35e'
-pkgver=238.76
-pkgrel=1
+_commit='f58e62cbbc1c2842881a2a6ab9beda7bcb044a30'
+pkgver=238.133
+pkgrel=4
pkgrel+=.parabola1
arch=('x86_64')
arch+=('i686' 'armv7h')
@@ -27,8 +27,9 @@ makedepends_x86_64=('gnu-efi-libs')
options=('strip')
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
'5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=('git+https://github.com/systemd/systemd-stable'
- 'git+https://github.com/systemd/systemd'
+source=(# fragment is latest tag for source verification, final merge in prepare()
+ "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
+ "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
'0001-Use-Arch-device-access-groups.patch'
'initcpio-hook-udev'
'initcpio-install-systemd'
@@ -58,20 +59,20 @@ sha512sums=('SKIP'
'SKIP'
'9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- '3214b80fb5e3a9eed026dc1d6f23a3785c34b03dd09cba536ad4413322fc0d83936ec3d140ad11ffbf527b4bb8b83887044209c453bd1a25d22d6b9cbcd88288'
+ '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'
'6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
- 'eb7bb8ac1fa474c4ef603a22ee93b9142552a7752e6346c41950de4eaaff1ec8aa57f1cedbc2990a4ddcc3390f2d6cfb5ac6096fffa0e0a6d473684bb98f3bbe'
- '46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177'
+ 'd228d9e17bd6061aa6c5007b66ed82c726fdcae822e80b978e707777492c198aab9041a4f31cc8412fe4f3d8c5ba7ad908e9bb9f591f7488f5d8d6772dd14d4d'
+ '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
'4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
'872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
'471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
- '3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895'
- 'bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319'
- 'ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35'
+ 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
+ '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
+ '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
'107d2e36544aa8ef1c6e86339fbc811acb6e1d15eb0edca9f463bdd1b0e91fa8d85cf8c9e70eeaf4196e2f942e30310b672859191f3093c4806546ae30140fb9'
@@ -85,56 +86,33 @@ sha512sums=('SKIP'
_backports=(
# nspawn: wait for network namespace creation before interface setup (#8633)
'7511655807e90aa33ea7b71991401a79ec36bb41'
-)
-_reverts=(
+ # sd-shutdown improvements #8429
+ # umount: Add more asserts and remove some unused arguments
+ '0494cae03d762eaf2fb7217ee7d70f615dcb5183'
+ # umount: Decide whether to remount read-only earlier
+ '1d62d22d9432d5c4a637002c9a29b20d52f25d9a'
+ # umount: Provide the same mount flags too when remounting read-only
+ '3bc341bee9fc7dfb41a131246b6fb0afd6ff4407'
+ # umount: Try unmounting even if remounting read-only failed
+ '8645ffd12b3cc7b0292acd9e1d691c4fab4cf409'
+ # umount: Don't bother remounting api and ro filesystems read-only
+ 'e783b4902f387640bba12496936d01e967545c3c'
+ # shutdown: Reduce log level of unmounts
+ '456b2199f6ef0378da007e71347657bcf83ae465'
)
-_validate_tag() (
- local success fingerprint trusted status tag=v${pkgver%.*}
-
- cd "$srcdir/$pkgbase-stable"
- parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
- if (( ! success )); then
- error 'failed to validate tag %s\n' "$tag"
- return 1
- fi
-
- if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
- error 'unknown or untrusted public key: %s\n' "$fingerprint"
- return 1
- fi
-
- case $status in
- 'expired')
- warning 'the signature has expired'
- ;;
- 'expiredkey')
- warning 'the key has expired'
- ;;
- esac
-
- return 0
+_reverts=(
)
-pkgver() {
- local version count
-
- cd "$pkgbase-stable"
-
- version="$(git describe --abbrev=0 --tags)"
- count="$(git rev-list --count ${version}..)"
- printf '%s.%s' "${version#v}" "${count}"
-}
-
prepare() {
cd "$pkgbase-stable"
+ # add upstream repository for cherry-picking
git remote add -f upstream ../systemd
- git checkout "$_commit"
-
- _validate_tag || return
+ # merge the latest stable commit (fast-foward only to make sure
+ # the verified tag is in)
+ git merge --ff-only "${_commit}"
local c
for c in "${_backports[@]}"; do
@@ -154,6 +132,16 @@ prepare() {
done
}
+pkgver() {
+ local version count
+
+ cd "$pkgbase-stable"
+
+ version="$(git describe --abbrev=0 --tags)"
+ count="$(git rev-list --count ${version}..)"
+ printf '%s.%s' "${version#v}" "${count}"
+}
+
build() {
local timeservers=({0..3}.arch.pool.ntp.org)
diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd
index c91ca057f..8fb4441f7 100644
--- a/libre/systemd/initcpio-install-systemd
+++ b/libre/systemd/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-shutdown \
/usr/lib/systemd/systemd-sulogin-shell \
/usr/lib/systemd/system-generators/systemd-fstab-generator \
/usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
diff --git a/libre/systemd/systemd-binfmt.hook b/libre/systemd/systemd-binfmt.hook
index 8e6284bbc..9c31a4b16 100644
--- a/libre/systemd/systemd-binfmt.hook
+++ b/libre/systemd/systemd-binfmt.hook
@@ -8,4 +8,3 @@ Target = usr/lib/binfmt.d/*.conf
Description = Registering binary formats...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
-NeedsTargets
diff --git a/libre/systemd/systemd-hook b/libre/systemd/systemd-hook
index c52e71533..79505dfe8 100644
--- a/libre/systemd/systemd-hook
+++ b/libre/systemd/systemd-hook
@@ -14,23 +14,17 @@ udevd_live() {
fi
}
-each_conf() {
- while read -r f; do
- "$@" "$(basename "$f")"
- done
-}
-
case $1 in
catalog) /usr/bin/journalctl --update-catalog ;;
hwdb) /usr/bin/systemd-hwdb --usr update ;;
update) touch -c /usr ;;
- sysusers) each_conf /usr/bin/systemd-sysusers ;;
- tmpfiles) each_conf /usr/bin/systemd-tmpfiles --create ;;
+ sysusers) /usr/bin/systemd-sysusers ;;
+ tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
udev-reload) systemd_live; /usr/bin/udevadm control --reload ;;
- binfmt) systemd_live; each_conf /usr/lib/systemd/systemd-binfmt ;;
- sysctl) systemd_live; each_conf /usr/lib/systemd/systemd-sysctl ;;
+ binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;
+ sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;
*) echo >&2 " Invalid operation '$1'"; exit 1 ;;
esac
diff --git a/libre/systemd/systemd-sysctl.hook b/libre/systemd/systemd-sysctl.hook
index 348bb0315..aec5ac1b0 100644
--- a/libre/systemd/systemd-sysctl.hook
+++ b/libre/systemd/systemd-sysctl.hook
@@ -8,4 +8,3 @@ Target = usr/lib/sysctl.d/*.conf
Description = Applying kernel sysctl settings...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
-NeedsTargets
diff --git a/libre/systemd/systemd-sysusers.hook b/libre/systemd/systemd-sysusers.hook
index a7d40057a..9873dd402 100644
--- a/libre/systemd/systemd-sysusers.hook
+++ b/libre/systemd/systemd-sysusers.hook
@@ -8,4 +8,3 @@ Target = usr/lib/sysusers.d/*.conf
Description = Creating system user accounts...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
-NeedsTargets
diff --git a/libre/systemd/systemd-tmpfiles.hook b/libre/systemd/systemd-tmpfiles.hook
index 06554cde5..df60d8275 100644
--- a/libre/systemd/systemd-tmpfiles.hook
+++ b/libre/systemd/systemd-tmpfiles.hook
@@ -8,4 +8,3 @@ Target = usr/lib/tmpfiles.d/*.conf
Description = Creating temporary files...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
-NeedsTargets
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 12:12:01 +0000