[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)

[Dave Reisner]

    Date: Friday, September 30, 2016 @ 10:45:29
  Author: dreisner
Revision: 277462

upgpkg: systemd 231-2

- backport fix for local denial-of-service (FS#51035)

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/initcpio-install-systemd

--------------------------+
 PKGBUILD                 |    8 ++++++--
 initcpio-install-systemd |    8 ++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-30 10:06:00 UTC (rev 277461)
+++ PKGBUILD	2016-09-30 10:45:29 UTC (rev 277462)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=231
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -22,7 +22,7 @@
         'udev-hwdb.hook')
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
-         'bee7fd6ccda39582259708e3f262ea6d'
+         '55ea7d81c02d090b65c42a88f1a5a21a'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a'
@@ -30,6 +30,9 @@
          'a475a5ed8f03fb0f6b58b4684998d05c')
 
 _backports=(
+  '531ac2b2349da02acc9c382849758e07eb92b020'
+  'b2922837d67a4bf66c7862b06eb5b513a7fe6ef6'
+  '6bd74eb055ad278904d152b08e26d5ad4241ddb0'
 )
 
 prepare() {
@@ -155,6 +158,7 @@
   license=('GPL2')
   provides=('libsystemd.so' 'libudev.so')
 
+  # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
   make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
 }
 

Modified: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd	2016-09-30 10:06:00 UTC (rev 277461)
+++ initcpio-install-systemd	2016-09-30 10:45:29 UTC (rev 277462)
@@ -147,6 +147,7 @@
             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 @@
 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() {