diff options
| author | Nicolas Iooss | 2016-10-04 22:57:26 +0200 |
|---|---|---|
| committer | Nicolas Iooss | 2016-10-04 22:57:26 +0200 |
| commit | fe26e18109aa4ac6ae38dcd367bb451910218deb (patch) | |
| tree | ca689c106995d674cc55a63cd79a3c4ce584c573 | |
| parent | d802d83e709e71abbbf23b1a817bbbd2d2a7ee82 (diff) | |
| download | aur-fe26e18109aa4ac6ae38dcd367bb451910218deb.tar.gz | |
systemd-selinux 231-3 update
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | initcpio-install-systemd | 8 |
3 files changed, 21 insertions, 8 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-selinux pkgver = 231 - pkgrel = 1 + pkgrel = 3 url = http://www.freedesktop.org/wiki/Software/systemd arch = i686 arch = x86_64 @@ -41,7 +41,7 @@ pkgbase = systemd-selinux source = udev-hwdb.hook md5sums = SKIP md5sums = 90ea67a7bb237502094914622a39e281 - md5sums = bee7fd6ccda39582259708e3f262ea6d + md5sums = 55ea7d81c02d090b65c42a88f1a5a21a md5sums = 1b3aa3a0551b08af9305d33f85b5c2fc md5sums = 20ead378f5d6df4b2a3e670301510a7d md5sums = ddaef54f68f6c86c6c07835fc668f62a @@ -80,7 +80,7 @@ pkgname = systemd-selinux provides = nss-myhostname provides = systemd-tools=231 provides = udev=231 - provides = systemd=231-1 + provides = systemd=231-3 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -112,15 +112,15 @@ pkgname = libsystemd-selinux depends = xz provides = libsystemd.so provides = libudev.so - provides = libsystemd=231-1 + provides = libsystemd=231-3 conflicts = libsystemd pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support license = GPL2 depends = systemd-selinux - provides = systemd-sysvcompat=231-1 - provides = selinux-systemd-sysvcompat=231-1 + provides = systemd-sysvcompat=231-3 + provides = selinux-systemd-sysvcompat=231-3 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat @@ -7,7 +7,7 @@ pkgbase=systemd-selinux pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux') pkgver=231 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" groups=('selinux') @@ -29,7 +29,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver" 'udev-hwdb.hook') md5sums=('SKIP' '90ea67a7bb237502094914622a39e281' - 'bee7fd6ccda39582259708e3f262ea6d' + '55ea7d81c02d090b65c42a88f1a5a21a' '1b3aa3a0551b08af9305d33f85b5c2fc' '20ead378f5d6df4b2a3e670301510a7d' 'ddaef54f68f6c86c6c07835fc668f62a' @@ -37,6 +37,10 @@ md5sums=('SKIP' 'a475a5ed8f03fb0f6b58b4684998d05c') _backports=( + '531ac2b2349da02acc9c382849758e07eb92b020' # If the notification message length is 0, ignore the message + '8523bf7dd514a3a2c6114b7b8fb8f308b4f09fc4' # pid1: process zero-length notification messages again + '9987750e7a4c62e0eb8473603150596ba7c3a015' # pid1: don't return any error in manager_dispatch_notify_fd() + 'bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d' # Revert "pid1: reconnect to the console before being re-executed" ) prepare() { @@ -167,6 +171,7 @@ package_libsystemd-selinux() { "${pkgname/-selinux}=${pkgver}-${pkgrel}") conflicts=("${pkgname/-selinux}") + # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES. make -C "${pkgbase/-selinux}" DESTDIR="$pkgdir" install-libLTLIBRARIES } diff --git a/initcpio-install-systemd b/initcpio-install-systemd index b57661b3ea92..59c16b7ef63a 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -147,6 +147,7 @@ build() { systemd-journald.service \ systemd-journald-audit.socket \ systemd-journald-dev-log.socket \ + systemd-modules-load.service \ systemd-tmpfiles-setup-dev.service \ systemd-udev-trigger.service \ systemd-udevd-control.socket \ @@ -172,6 +173,13 @@ build() { ExecStart= ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never EOF + + add_dir "/etc/modules-load.d" + ( + . "$_f_config" + set -f + printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf" + ) } help() { |