summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2020-06-20 11:16:22 +0200
committerNicolas Iooss2020-06-20 11:16:22 +0200
commit1f051fc1311a8ac6bda68939490015b76c931299 (patch)
treebeb69e62acf27ed1d61663f415ef8ee01c65702a
parenta0c1be32a0406d5e8744c543535f46cb8eb66158 (diff)
downloadaur-1f051fc1311a8ac6bda68939490015b76c931299.tar.gz
systemd-selinux 245.6-7 update
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD11
2 files changed, 12 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 912b2ab919f..055c4f516cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 245.6
- pkgrel = 6
+ pkgrel = 7
url = https://www.github.com/systemd/systemd
arch = x86_64
groups = selinux
@@ -127,7 +127,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=245.6
provides = udev=245.6
- provides = systemd=245.6-6
+ provides = systemd=245.6-7
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-6
+ provides = systemd-libs=245.6-7
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-6
+ provides = systemd-resolvconf=245.6-7
conflicts = openresolv
- conflicts = systemd-resolvconf=245.6-6
+ conflicts = systemd-resolvconf=245.6-7
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=245.6-6
- provides = selinux-systemd-sysvcompat=245.6-6
+ provides = systemd-sysvcompat=245.6-7
+ provides = selinux-systemd-sysvcompat=245.6-7
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index b624fbca222..c590cfeb73d 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=6
+pkgrel=7
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
groups=('selinux')
@@ -262,11 +262,10 @@ package_systemd-selinux() {
install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
- # ensure proper permissions for /var/log/journal
- # The permissions are stored with named group by tar, so this works with
- # users and groups populated by systemd-sysusers. This is only to prevent a
- # warning from pacman as permissions are set by systemd-tmpfiles anyway.
- install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal
+ # The group 'systemd-journal' is allocated dynamically and may have varying
+ # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles
+ # will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)
+ install -d -o root -g root -m 2755 "$pkgdir"/var/log/journal
# match directory owner/group and mode from [extra]/polkit
install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d