summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2020-06-12 21:12:00 +0200
committerNicolas Iooss2020-06-12 21:12:00 +0200
commita0c1be32a0406d5e8744c543535f46cb8eb66158 (patch)
tree8ce36ebd7ca4584b436ac979e2cb4792aa97f585
parentdc04c9c160ae80ec4bbebe7535fecf4638a97063 (diff)
downloadaur-a0c1be32a0406d5e8744c543535f46cb8eb66158.tar.gz
systemd-selinux 245.6-6 update
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD14
-rw-r--r--initcpio-install-systemd33
3 files changed, 23 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index acb6e92c868..912b2ab919f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 245.6
- pkgrel = 2
+ pkgrel = 6
url = https://www.github.com/systemd/systemd
arch = x86_64
groups = selinux
@@ -66,7 +66,7 @@ pkgbase = systemd-selinux
sha512sums = e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4
sha512sums = 85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123
sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
- sha512sums = bc16cd288fa4fe8f8d2d4ba7a3198f942626af08330e4d1656ee38c408b23bb532a1955a1327ec367ae35161e3cc1f336d9285fb9c7d4322f2865451fb9b8961
+ sha512sums = d0218d51c557a8456e8f41a56fa057b525bbcfcfa580cbd58efb14f356854172a8e1f31779e023350645a5e28cd4b9d94b0d7a8a3d2ee22db181c65d8f661a2e
sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -127,7 +127,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=245.6
provides = udev=245.6
- provides = systemd=245.6-2
+ provides = systemd=245.6-6
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -160,7 +160,7 @@ pkgname = systemd-libs-selinux
provides = libsystemd.so
provides = libudev.so
provides = libsystemd-selinux
- provides = systemd-libs=245.6-2
+ provides = systemd-libs=245.6-6
conflicts = libsystemd
conflicts = libsystemd-selinux
conflicts = systemd-libs
@@ -172,16 +172,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
- provides = systemd-resolvconf=245.6-2
+ provides = systemd-resolvconf=245.6-6
conflicts = openresolv
- conflicts = systemd-resolvconf=245.6-2
+ conflicts = systemd-resolvconf=245.6-6
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=245.6-2
- provides = selinux-systemd-sysvcompat=245.6-2
+ provides = systemd-sysvcompat=245.6-6
+ provides = selinux-systemd-sysvcompat=245.6-6
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index a8a80c92479..b624fbca222 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
_tag='a47534aa62edfddb2df86e2d0c208979f24dc8c2' # git rev-parse v${pkgver}
pkgver=245.6
-pkgrel=2
+pkgrel=6
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
groups=('selinux')
@@ -60,7 +60,7 @@ sha512sums=('SKIP'
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- 'bc16cd288fa4fe8f8d2d4ba7a3198f942626af08330e4d1656ee38c408b23bb532a1955a1327ec367ae35161e3cc1f336d9285fb9c7d4322f2865451fb9b8961'
+ 'd0218d51c557a8456e8f41a56fa057b525bbcfcfa580cbd58efb14f356854172a8e1f31779e023350645a5e28cd4b9d94b0d7a8a3d2ee22db181c65d8f661a2e'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -95,6 +95,12 @@ _backports=(
# sd-journal: don't check namespaces if we have no namespace to go by
'2b6df46d21abe8a8b7481e420588a9a129699cf9'
+
+ # network: tc: support Hierarchy Token Bucket (HTB)
+ # (we need this for safe_atou32_full()...)
+ 'b934ac3d6e7dcad114776ef30ee9098693e7ab7e'
+ # basic/user-util: always use base 10 for user/group numbers
+ '156a5fd297b61bce31630d7a52c15614bf784843'
)
_reverts=(
@@ -150,7 +156,11 @@ build() {
-Dman=true
-Dselinux=true
+ # We disable DNSSEC by default, it still causes trouble:
+ # https://github.com/systemd/systemd/issues/10579
+
-Ddbuspolicydir=/usr/share/dbus-1/system.d
+ -Ddefault-dnssec=no
-Ddefault-hierarchy=hybrid
-Ddefault-kill-user-processes=false
-Ddefault-locale=C
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index 0a9740bae70..8bc072b5da4 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -169,36 +169,9 @@ build() {
'group: files' \
'shadow: files'
- add_file /etc/passwd <<EOF
-root:x:0:0:Super User:/root:/bin/sh
-nobody:x:65534:65534:Nobody:/:/usr/bin/nologin
-EOF
-
- add_file /etc/shadow <<EOF
-root:!!:0::::::
-nobody:!!:0::::::
-EOF
-
- add_file /etc/group <<EOF
-root:x:0:
-tty:x:5:
-users:x:985:
-video:x:986:
-uucp:x:987:
-storage:x:988:
-render:x:989:
-optical:x:990:
-lp:x:991:
-kvm:x:992:
-input:x:993:
-disk:x:994:
-audio:x:995:
-utmp:x:996:
-kmem:x:997:
-wheel:x:998:
-adm:x:999:
-nobody:x:65534:
-EOF
+ echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+ echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"
+ getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
add_dir "/etc/modules-load.d"
(