diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | 0001-Use-Arch-Linux-device-access-groups.patch | 35 | ||||
| -rw-r--r-- | PKGBUILD | 28 |
3 files changed, 39 insertions, 44 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-git pkgdesc = systemd (git version) - pkgver = 251.r59852.cb19517490 + pkgver = 252.r60426.09925036cf pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -61,7 +61,7 @@ pkgbase = systemd-git source = 30-systemd-udev-reload.hook source = 30-systemd-update.hook sha512sums = SKIP - sha512sums = e9d16140a2b412c1d2f61fb27543baee40cc9369e6545abf6a06f99af5a07c3df536083ffe058b4a6467ec9dcefc99a75eae730a9ffc58533511ef752a6e2763 + sha512sums = d53034fcb1c8ebaee6f3abc3bf55766d0948ba87129e15da1609c8f84d9340f8ff18642db04e5ee5e05b2bab208a18e39a0170981c55e010b7dbc18c6dfa0fdc sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 sha512sums = aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6 @@ -81,7 +81,7 @@ pkgbase = systemd-git sha512sums = 825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97 pkgname = systemd-git - pkgdesc = system and service manager (git version) + pkgdesc = + (git version) install = systemd.install license = GPL2 license = LGPL2.1 @@ -126,9 +126,9 @@ pkgname = systemd-git optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=251.r59852.cb19517490 - provides = udev=251.r59852.cb19517490 - provides = systemd=251.r59852.cb19517490 + provides = systemd-tools=252.r60426.09925036cf + provides = udev=252.r60426.09925036cf + provides = systemd=252.r60426.09925036cf conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -166,18 +166,18 @@ pkgname = systemd-libs-git provides = libsystemd provides = libsystemd.so provides = libudev.so - provides = systemd-libs=251.r59852.cb19517490 + provides = systemd-libs=252.r60426.09925036cf conflicts = libsystemd conflicts = systemd-libs replaces = libsystemd pkgname = systemd-resolvconf-git - pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version) + pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) (git version) license = LGPL2.1 depends = systemd-git provides = openresolv provides = resolvconf - provides = systemd-resolvconf=251.r59852.cb19517490 + provides = systemd-resolvconf=252.r60426.09925036cf conflicts = openresolv conflicts = systemd-resolvconf @@ -185,6 +185,6 @@ pkgname = systemd-sysvcompat-git pkgdesc = sysvinit compat for systemd (git version) license = GPL2 depends = systemd-git - provides = systemd-sysvcompat=251.r59852.cb19517490 + provides = systemd-sysvcompat=252.r60426.09925036cf conflicts = sysvinit conflicts = systemd-sysvcompat diff --git a/0001-Use-Arch-Linux-device-access-groups.patch b/0001-Use-Arch-Linux-device-access-groups.patch index 4935de58f7c7..0a55b8d30838 100644 --- a/0001-Use-Arch-Linux-device-access-groups.patch +++ b/0001-Use-Arch-Linux-device-access-groups.patch @@ -1,10 +1,7 @@ -From c553f5d0c0e4dcbba02b34e997f5af872064e763 Mon Sep 17 00:00:00 2001 +From f7d07e298c819a81eab965efbdbf53a2ce67fc0e Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Tue, 6 Mar 2018 23:39:47 +0100 -Subject: [PATCH 1/2] Use Arch Linux' device access groups -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: [PATCH] Use Arch Linux' device access groups cdrom → optical dialout → uucp @@ -17,10 +14,10 @@ Content-Transfer-Encoding: 8bit 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build -index 6bbb2db55d..2ef5c3c344 100644 +index 32e5413a62..f781e06fed 100644 --- a/meson.build +++ b/meson.build -@@ -913,19 +913,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) +@@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) static_ugids = [] foreach option : ['adm-gid', 'audio-gid', @@ -82,10 +79,10 @@ index d5237f02ae..7b531c4710 100644 description : 'soft-static allocation for the "video" group') option('wheel-gid', type : 'integer', value : 0, diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in -index 0394530479..0437396cf2 100644 +index 18a3cf46bf..f3c440fd89 100644 --- a/rules.d/50-udev-default.rules.in +++ b/rules.d/50-udev-default.rules.in -@@ -26,7 +26,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" +@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" @@ -94,7 +91,7 @@ index 0394530479..0437396cf2 100644 SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" -@@ -72,13 +72,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" +@@ -67,13 +67,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" SUBSYSTEM=="block", GROUP="disk" @@ -115,10 +112,10 @@ index 0394530479..0437396cf2 100644 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in -index a602b872e4..8d38febb6a 100644 +index 8cc1a7cad2..21bb6d8948 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in -@@ -23,17 +23,17 @@ g utmp {{UTMP_GID }} - - +@@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - - # Physical and virtual hardware access groups g audio {{AUDIO_GID }} - - @@ -139,14 +136,10 @@ index a602b872e4..8d38febb6a 100644 g video {{VIDEO_GID }} - - # Default group for normal users --- -2.37.1 - -From ab2adb92b4f2ca54082eece6cc236626f7208c9e Mon Sep 17 00:00:00 2001 +From 14de5ced41edc9fa8e380330c03adc89ef257fbc Mon Sep 17 00:00:00 2001 From: Christian Hesse <mail@eworm.de> Date: Mon, 27 Dec 2021 23:32:42 +0100 -Subject: [PATCH 2/2] generate tmpfiles.d/legacy.conf - +Subject: [PATCH] generate tmpfiles.d/legacy.conf --- tmpfiles.d/legacy.conf.in | 3 --- tmpfiles.d/meson.build | 2 +- @@ -167,10 +160,10 @@ index 4f2c0d7c43..62e2ae0986 100644 # /run/lock/subsys is used for serializing SysV service execution, and # hence without use on SysV-less systems. diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index ca1abbf3fe..25e2b53402 100644 +index b8d3919025..000bd0bd22 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build -@@ -29,7 +29,7 @@ foreach pair : files +@@ -27,7 +27,7 @@ foreach pair : files endforeach in_files = [['etc.conf', ''], @@ -179,6 +172,4 @@ index ca1abbf3fe..25e2b53402 100644 ['static-nodes-permissions.conf', ''], ['systemd.conf', ''], ['var.conf', ''], --- -2.37.1 @@ -5,7 +5,7 @@ _pkgbase=systemd pkgbase=$_pkgbase-git pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git') pkgdesc='systemd (git version)' -pkgver=251.r59852.cb19517490 +pkgver=252.r60426.09925036cf pkgrel=1 arch=('x86_64') url='https://www.github.com/systemd/systemd' @@ -35,7 +35,7 @@ source=('git+https://github.com/systemd/systemd' '30-systemd-udev-reload.hook' '30-systemd-update.hook') sha512sums=('SKIP' - 'e9d16140a2b412c1d2f61fb27543baee40cc9369e6545abf6a06f99af5a07c3df536083ffe058b4a6467ec9dcefc99a75eae730a9ffc58533511ef752a6e2763' + 'd53034fcb1c8ebaee6f3abc3bf55766d0948ba87129e15da1609c8f84d9340f8ff18642db04e5ee5e05b2bab208a18e39a0170981c55e010b7dbc18c6dfa0fdc' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' 'aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' @@ -83,12 +83,12 @@ build() { ) local _meson_options=( + # internal version comparison is incompatible with pacman: + # 249~rc1 < 249 < 249.1 < 249rc + -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch" + -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release - # https://bugs.archlinux.org/task/75852 - --buildtype debugoptimized - -D b_ndebug=true - -Dgnu-efi=true -Dima=false -Dlibidn2=true @@ -114,10 +114,10 @@ build() { -Dsysvrcnd-path= -Dsbat-distro='arch' - -Dsbat-distro-summary='Arch Linux AUR' + -Dsbat-distro-summary='Arch Linux' -Dsbat-distro-pkgname="${pkgname}" -Dsbat-distro-version="${pkgver}" - -Dsbat-distro-url="https://aur.archlinux.org/pkgbase/${pkgname}" + -Dsbat-distro-url="https://archlinux.org/packages/core/x86_64/${pkgname}/" ) arch-meson "$_pkgbase" build "${_meson_options[@]}" @@ -130,7 +130,8 @@ check() { } package_systemd-git() { - pkgdesc='system and service manager (git version)' + pkgdesc='system and service manager' + pkgdesc=+' (git version)' license=('GPL2' 'LGPL2.1') depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus' 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so' @@ -221,7 +222,8 @@ package_systemd-git() { } package_systemd-libs-git() { - pkgdesc='systemd client libraries (git version)' + pkgdesc='systemd client libraries' + pkgdesc+=' (git version)' depends=('glibc' 'libcap' 'libgcrypt' 'libp11-kit' 'lz4' 'xz' 'zstd') license=('LGPL2.1') provides=('libsystemd' 'libsystemd.so' 'libudev.so') @@ -235,7 +237,8 @@ package_systemd-libs-git() { } package_systemd-resolvconf-git() { - pkgdesc='systemd resolvconf replacement (for use with systemd-resolved, git version)' + pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)' + pkgdesc+=' (git version)' license=('LGPL2.1') depends=('systemd-git') provides=('openresolv' 'resolvconf') @@ -251,7 +254,8 @@ package_systemd-resolvconf-git() { } package_systemd-sysvcompat-git() { - pkgdesc='sysvinit compat for systemd (git version)' + pkgdesc='sysvinit compat for systemd' + pkgdesc+=' (git version)' license=('GPL2') conflicts=('sysvinit') conflicts+=('systemd-sysvcompat') |