summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2021-10-26 17:08:29 +0300
committerYurii Kolesnykov2021-10-26 17:08:29 +0300
commit5dae8654309ce27759e967037d0bc6213b2259ae (patch)
treec048c538306c6eca8d5e48917c0019497c80e38e
parentfb60707fa281ecbe37501acd21a902673de52b43 (diff)
downloadaur-5dae8654309ce27759e967037d0bc6213b2259ae.tar.gz
sync with testing/systemd
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD6
-rw-r--r--initcpio-install-systemd3
-rw-r--r--initcpio-install-udev65
-rw-r--r--systemd.install52
5 files changed, 75 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 91c3b05c351..dc2569a76d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-git
pkgdesc = systemd (git version)
- pkgver = 249.r224.ge3709627e6
+ pkgver = 249.r1644.gbb5464ad20
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -66,8 +66,8 @@ pkgbase = systemd-git
sha512sums = 10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1
sha512sums = 34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad
sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
- sha512sums = f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17
- sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
+ sha512sums = 77582416df858e34bc05a9928ddacbe506d24946576cb7c08c7131cf2a9e059d8ff80b226684fc942bca2edf0c6d2584fa3e22939284b102b30395450784c4d3
+ sha512sums = 8af5d7b1553be0cc193440dbb94683c2d2d777634dac4369716d75a1b2c2564551c836f3aee8220edfa5ef59122dea737bfe60c588637249bf67e15dba0534d0
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
@@ -128,10 +128,10 @@ pkgname = systemd-git
optdepends = curl: machinectl pull-tar and pull-raw
optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
- provides = systemd=249.r224.ge3709627e6
+ provides = systemd=249.r1644.gbb5464ad20
provides = nss-myhostname
- provides = systemd-tools=249.r224.ge3709627e6
- provides = udev=249.r224.ge3709627e6
+ provides = systemd-tools=249.r1644.gbb5464ad20
+ provides = udev=249.r1644.gbb5464ad20
conflicts = systemd
conflicts = nss-myhostname
conflicts = systemd-tools
@@ -166,7 +166,7 @@ pkgname = systemd-libs-git
depends = lz4
depends = xz
depends = zstd
- provides = systemd-libs=249.r224.ge3709627e6
+ provides = systemd-libs=249.r1644.gbb5464ad20
provides = libsystemd
provides = libsystemd.so
provides = libudev.so
@@ -178,7 +178,7 @@ pkgname = systemd-resolvconf-git
pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version)
license = LGPL2.1
depends = systemd-git
- provides = systemd-resolvconf=249.r224.ge3709627e6
+ provides = systemd-resolvconf=249.r1644.gbb5464ad20
provides = openresolv
provides = resolvconf
conflicts = systemd-resolvconf
@@ -188,6 +188,6 @@ pkgname = systemd-sysvcompat-git
pkgdesc = sysvinit compat for systemd (git version)
license = GPL2
depends = systemd-git
- provides = systemd-sysvcompat=249.r224.ge3709627e6
+ provides = systemd-sysvcompat=249.r1644.gbb5464ad20
conflicts = systemd-sysvcompat
conflicts = sysvinit
diff --git a/PKGBUILD b/PKGBUILD
index bf9d3cc269c..0cc9c84cd29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _pkgbase=systemd
pkgbase=$_pkgbase-git
pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
pkgdesc='systemd (git version)'
-pkgver=249.r224.ge3709627e6
+pkgver=249.r1644.gbb5464ad20
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -43,8 +43,8 @@ sha512sums=('SKIP'
'10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1'
'34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- 'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17'
- 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
+ '77582416df858e34bc05a9928ddacbe506d24946576cb7c08c7131cf2a9e059d8ff80b226684fc942bca2edf0c6d2584fa3e22939284b102b30395450784c4d3'
+ '8af5d7b1553be0cc193440dbb94683c2d2d777634dac4369716d75a1b2c2564551c836f3aee8220edfa5ef59122dea737bfe60c588637249bf67e15dba0534d0'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index 05ccb904fa9..f53ffb639e2 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -1,5 +1,8 @@
#!/bin/bash
+# This is in 'udev' and 'systemd' hook... Let's hope we have
+# it in mkinitcpio soon.
+# https://github.com/archlinux/mkinitcpio/pull/54
add_udev_rule() {
# Add an udev rules file to the initcpio image. Dependencies on binaries
# will be discovered and added.
diff --git a/initcpio-install-udev b/initcpio-install-udev
index 31d9827129e..dda31cd17e3 100644
--- a/initcpio-install-udev
+++ b/initcpio-install-udev
@@ -1,18 +1,65 @@
#!/bin/bash
+# This is in 'udev' and 'systemd' hook... Let's hope we have
+# it in mkinitcpio soon.
+# https://github.com/archlinux/mkinitcpio/pull/54
+add_udev_rule() {
+ # Add an udev rules file to the initcpio image. Dependencies on binaries
+ # will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local rules="$1" rule= key= value= binary=
+
+ if [[ ${rules:0:1} != '/' ]]; then
+ rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+ fi
+ if [[ -z $rules ]]; then
+ # complain about not found rules
+ return 1
+ fi
+
+ add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}"
+
+ while IFS=, read -ra rule; do
+ # skip empty lines, comments
+ [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+ for pair in "${rule[@]}"; do
+ IFS=' =' read -r key value <<< "$pair"
+ case $key in
+ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+ # strip quotes
+ binary=${value//[\"\']/}
+ # just take the first word as the binary name
+ binary=${binary%% *}
+ [[ ${binary:0:1} == '$' ]] && continue
+ if [[ ${binary:0:1} != '/' ]]; then
+ binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
+ fi
+ add_binary "$binary"
+ ;;
+ esac
+ done
+ done <"$rules"
+}
+
build() {
local rules tool
- add_binary /usr/lib/systemd/systemd-udevd
- add_binary /usr/bin/udevadm
- add_binary /usr/bin/systemd-tmpfiles
+ map add_binary \
+ '/usr/lib/systemd/systemd-udevd' \
+ '/usr/bin/udevadm' \
+ '/usr/bin/systemd-tmpfiles'
+
+ map add_udev_rule \
+ '50-udev-default.rules' \
+ '60-persistent-storage.rules' \
+ '64-btrfs.rules' \
+ '80-drivers.rules'
- for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
- add_file "/usr/lib/udev/rules.d/$rules"
- done
- for tool in ata_id scsi_id; do
- add_file "/usr/lib/udev/$tool"
- done
+ map add_file \
+ '/usr/lib/udev/ata_id' \
+ '/usr/lib/udev/scsi_id'
add_runscript
}
diff --git a/systemd.install b/systemd.install
index 417110181c5..cece9d2dea2 100644
--- a/systemd.install
+++ b/systemd.install
@@ -15,44 +15,6 @@ post_common() {
journalctl --update-catalog
}
-_216_2_changes() {
- echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
- echo ' tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
- if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
- chgrp systemd-journal-remote var/log/journal/remote
- fi
-}
-
-_219_4_changes() {
- if ! systemctl is-enabled -q remote-fs.target; then
- systemctl enable -q remote-fs.target
- fi
-}
-
-_230_1_changes() {
- echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-_232_8_changes() {
- # paper over possible effects of CVE-2016-10156
- local stamps=(/var/lib/systemd/timers/*.timer)
-
- if [[ -f ${stamps[0]} ]]; then
- chmod 0644 "${stamps[@]}"
- fi
-}
-
-_233_75_3_changes() {
- # upstream installs services to /etc, which we remove
- # to keep bus activation we re-enable systemd-resolved
- if systemctl is-enabled -q systemd-resolved.service; then
- systemctl reenable systemd-resolved.service 2>/dev/null
- fi
-}
-
_242_0_2_changes() {
if [[ -L var/lib/systemd/timesync ]]; then
rm var/lib/systemd/timesync
@@ -70,7 +32,9 @@ post_install() {
add_journal_acls
# enable some services by default, but don't track them
- systemctl enable getty@tty1.service remote-fs.target
+ systemctl enable \
+ getty@tty1.service \
+ remote-fs.target
echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
@@ -83,19 +47,11 @@ post_install() {
post_upgrade() {
post_common "$@"
- # don't reexec if the old version is 231-1 or 231-2.
- # https://github.com/systemd/systemd/commit/bd64d82c1c
- if [[ $1 != 231-[12] ]] && sd_booted; then
+ if sd_booted; then
systemctl --system daemon-reexec
fi
local v upgrades=(
- 216-2
- 219-2
- 219-4
- 230-1
- 232-8
- 233.75-3
242.0-2
)