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

[Dave Reisner]

    Date: Saturday, February 21, 2015 @ 17:36:11
  Author: dreisner
Revision: 231786

upgpkg: systemd 219-2

- create /var/log/journal/remote as part of installation
- add iptables as runtime dep (for networkd)

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------+
 PKGBUILD        |   18 +++++++++++-------
 systemd.install |   13 ++++++++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-21 15:18:07 UTC (rev 231785)
+++ PKGBUILD	2015-02-21 16:36:11 UTC (rev 231786)
@@ -4,13 +4,13 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=219
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd'
-             'libxslt' 'util-linux' 'linux-api-headers' 'lz4' 'pam' 'python'
-             'python-lxml' 'quota-tools' 'shadow' 'xz')
+             'gtk-doc' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'lz4' 'pam'
+             'python' 'python-lxml' 'quota-tools' 'shadow' 'xz')
 options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
@@ -47,8 +47,9 @@
 package_systemd() {
   pkgdesc="system and service manager"
   license=('GPL2' 'LGPL2.1' 'MIT')
-  depends=('acl' 'bash' 'dbus' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux' 'xz')
+  depends=('acl' 'bash' 'dbus' 'glib2' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
+           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux'
+           'xz')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('nss-myhostname' 'systemd-tools' 'udev')
@@ -105,8 +106,11 @@
 
   # ensure proper permissions for /var/log/journal. This is only to placate
   chown root:systemd-journal "$pkgdir/var/log/journal"
-  chmod 2755 "$pkgdir/var/log/journal"{,/remote}
+  chmod 2755 "$pkgdir/var/log/journal"
 
+  # we'll create this on installation
+  rmdir "$pkgdir/var/log/journal/remote"
+
   # fix pam file
   sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user"
 

Modified: systemd.install
===================================================================
--- systemd.install	2015-02-21 15:18:07 UTC (rev 231785)
+++ systemd.install	2015-02-21 16:36:11 UTC (rev 231786)
@@ -146,6 +146,12 @@
   echo '   tuned in /etc/systemd/coredump.conf.'
 }
 
+_219_2_changes() {
+  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+    chgrp systemd-journal-remote var/log/journal/remote
+  fi
+}
+
 post_install() {
   systemd-machine-id-setup
 
@@ -158,6 +164,10 @@
 
   echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
   echo "   bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
+
+  # group 'systemd-journal-remote' is created by systemd-sysusers
+  mkdir -m2755 var/log/journal/remote
+  chgrp systemd-journal-remote var/log/journal/remote
 }
 
 post_upgrade() {
@@ -175,7 +185,8 @@
                     213-4
                     214-2
                     215-2
-                    216-2)
+                    216-2
+                    219-2)
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then