summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2020-12-05 10:28:22 +0100
committerNicolas Iooss2020-12-05 10:28:22 +0100
commit448df407b6b9748f66a0ddaf4fecc9e2cbe84258 (patch)
tree8c9395621f73841fec9c2698a54e4c66aabf3a6a
parent0dfbecc5fb057dc48dc89f74ccc27b3f8047f3a7 (diff)
downloadaur-448df407b6b9748f66a0ddaf4fecc9e2cbe84258.tar.gz
systemd-selinux 247.1-1 update
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD11
-rw-r--r--initcpio-install-systemd6
3 files changed, 24 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae6fc33715a..0d6759f175b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-selinux
- pkgver = 246.6
+ pkgver = 247.1
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -39,8 +39,8 @@ pkgbase = systemd-selinux
makedepends = systemd
makedepends = libselinux
options = strip
- source = git+https://github.com/systemd/systemd-stable#tag=27d60e13ed5db2194cac14ad4cc86ad06d753805?signed
- source = git+https://github.com/systemd/systemd#tag=v246?signed
+ source = git+https://github.com/systemd/systemd-stable#tag=dcc360e35ecdeadfeaf8441628cfebb452acd59b?signed
+ source = git+https://github.com/systemd/systemd#tag=v247?signed
source = 0001-Use-Arch-Linux-device-access-groups.patch
source = initcpio-hook-udev
source = initcpio-install-systemd
@@ -65,7 +65,7 @@ pkgbase = systemd-selinux
sha512sums = SKIP
sha512sums = e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4
sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
- sha512sums = f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e
+ sha512sums = 8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a
sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -105,7 +105,6 @@ pkgname = systemd-selinux
depends = libcrypt.so
depends = systemd-libs-selinux
depends = libidn2
- depends = libidn2.so
depends = lz4
depends = pam-selinux
depends = libelf
@@ -127,9 +126,9 @@ pkgname = systemd-selinux
optdepends = polkit: allow administration as unprivileged user
optdepends = curl: machinectl pull-tar and pull-raw
provides = nss-myhostname
- provides = systemd-tools=246.6
- provides = udev=246.6
- provides = systemd=246.6-1
+ provides = systemd-tools=247.1
+ provides = udev=247.1
+ provides = systemd=247.1-1
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -137,11 +136,13 @@ pkgname = systemd-selinux
conflicts = selinux-systemd
backup = etc/pam.d/systemd-user
backup = etc/systemd/coredump.conf
+ backup = etc/systemd/homed.conf
backup = etc/systemd/journald.conf
backup = etc/systemd/journal-remote.conf
backup = etc/systemd/journal-upload.conf
backup = etc/systemd/logind.conf
backup = etc/systemd/networkd.conf
+ backup = etc/systemd/pstore.conf
backup = etc/systemd/resolved.conf
backup = etc/systemd/sleep.conf
backup = etc/systemd/system.conf
@@ -163,7 +164,7 @@ pkgname = systemd-libs-selinux
provides = libsystemd.so
provides = libudev.so
provides = libsystemd-selinux
- provides = systemd-libs=246.6-1
+ provides = systemd-libs=247.1-1
conflicts = libsystemd
conflicts = libsystemd-selinux
conflicts = systemd-libs
@@ -175,16 +176,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
- provides = systemd-resolvconf=246.6-1
+ provides = systemd-resolvconf=247.1-1
conflicts = openresolv
- conflicts = systemd-resolvconf=246.6-1
+ conflicts = systemd-resolvconf=247.1-1
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=246.6-1
- provides = selinux-systemd-sysvcompat=246.6-1
+ provides = systemd-sysvcompat=247.1-1
+ provides = selinux-systemd-sysvcompat=247.1-1
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 4557bf9db34..1446afa89ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
-_tag='27d60e13ed5db2194cac14ad4cc86ad06d753805' # git rev-parse v${pkgver}
-pkgver=246.6
+_tag='dcc360e35ecdeadfeaf8441628cfebb452acd59b' # git rev-parse v${pkgver}
+pkgver=247.1
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -59,7 +59,7 @@ sha512sums=('SKIP'
'SKIP'
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- 'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
+ '8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -120,6 +120,7 @@ build() {
local _meson_options=(
-Dversion-tag="${pkgver}-${pkgrel}-arch"
+ -Dmode=release
-Daudit=true
-Dgnu-efi=true
@@ -174,7 +175,7 @@ package_systemd-selinux() {
license=('GPL2' 'LGPL2.1')
depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so'
- 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs-selinux' 'libidn2' 'libidn2.so' 'lz4' 'pam-selinux'
+ 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs-selinux' 'libidn2' 'lz4' 'pam-selinux'
'libelf' 'libseccomp' 'libseccomp.so' 'util-linux-selinux' 'libblkid.so'
'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit'
'libp11-kit.so' 'openssl')
@@ -189,11 +190,13 @@ package_systemd-selinux() {
'curl: machinectl pull-tar and pull-raw')
backup=(etc/pam.d/systemd-user
etc/systemd/coredump.conf
+ etc/systemd/homed.conf
etc/systemd/journald.conf
etc/systemd/journal-remote.conf
etc/systemd/journal-upload.conf
etc/systemd/logind.conf
etc/systemd/networkd.conf
+ etc/systemd/pstore.conf
etc/systemd/resolved.conf
etc/systemd/sleep.conf
etc/systemd/system.conf
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index 9e23070dd53..18846528cec 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -106,11 +106,11 @@ add_systemd_drop_in() {
build() {
local rules unit
- # from base
- add_binary /bin/mount
add_binary /usr/bin/kmod /usr/bin/modprobe
- add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/mount
add_binary /usr/bin/sulogin
+ add_binary /usr/bin/umount
+ add_binary /usr/lib/systemd/systemd /init
map add_binary \
/usr/bin/journalctl \