summaryrefslogtreecommitdiff
path: root/libre/systemd
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-10-05 18:10:10 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-10-05 18:16:57 -0300
commita145918e38ddc6eaa6ef3b32c8f902b9077e566a (patch)
tree57fa30a6772ff205c694be7481f7890cee25d138 /libre/systemd
parent5df1be1c74e9a5ee89b3ed141b61d1521ad5f8b8 (diff)
systemd-231-3.parabola1: bump to Arch's revision
* backport fix for local denial-of-service - FS#51035 -> https://bugs.archlinux.org/task/51035 * use correct commit hashes for fixing local DoS - FS#51179 -> https://bugs.archlinux.org/task/51179 * fix graphical crash on reexec
Diffstat (limited to 'libre/systemd')
-rw-r--r--libre/systemd/PKGBUILD9
-rw-r--r--libre/systemd/initcpio-install-systemd8
2 files changed, 15 insertions, 2 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index fafda4b89..2fb205a2c 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat'
'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
pkgver=231
-pkgrel=1.parabola1
+pkgrel=3.parabola1
arch=('i686' 'x86_64' 'armv7h')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -33,7 +33,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
"https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig})
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- 'bee7fd6ccda39582259708e3f262ea6d'
+ '55ea7d81c02d090b65c42a88f1a5a21a'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'36ee74767ac8734dede1cbd0f4f275d7'
'9b9f4a58e4c4009bf5290c5b297600c3'
@@ -49,6 +49,10 @@ md5sums=('SKIP'
validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva
_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() {
@@ -259,6 +263,7 @@ package_nss-resolve() {
depends=('glibc' 'libcap')
license=('GPL2')
+ # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
}
diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd
index b57661b3e..59c16b7ef 100644
--- a/libre/systemd/initcpio-install-systemd
+++ b/libre/systemd/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() {