systemd-selinux 219-6 update

1 files changed, 45 insertions, 57 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 36f63b969beb..1c57b5a0e778 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,68 +6,55 @@
 
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
-pkgver=218
-pkgrel=2
+pkgver=219
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 groups=('selinux')
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd'
-             'libxslt' 'util-linux' 'linux-api-headers' 'lz4' 'pam-selinux' 'python'
-             'python-lxml' 'quota-tools' 'shadow-selinux' 'xz' 'audit' 'libselinux')
+             'gtk-doc' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'lz4' 'pam-selinux'
+             'python' 'python-lxml' 'quota-tools' 'shadow-selinux' 'xz' 'audit' 'libselinux')
 options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/${pkgname/-selinux}/${pkgname/-selinux}-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
-        0001-journal-fix-dangling-else-ambiguity.patch
-        0002-nspawn-properly-validate-machine-names.patch
-        0003-systemctl-fix-argument-handling-when-invoked-as-shut.patch
-        0004-systemctl-properly-iterate-through-service-array-whe.patch
-        0005-nss-myhostname-always-will-in-canonical-hostname-fie.patch
-        0010-log-fix-log_full_errno-with-custom-facilities.patch
-        0014-timesyncd-consider-too-long-packets-as-invalid.patch
-        0016-logind-fix-sd_eviocrevoke-ioctl-call.patch
-        0019-sd-bus-fix-handling-of-double-parameters-in-sd_bus_m.patch
-        0021-units-fix-all-TTY-paths-for-container-gettys.patch
-        0024-sd-dhcp-chop-of-trailing-dot-of-DHCP-supplied-host-a.patch
-        0025-logind-handle-closing-sessions-over-daemon-restarts.patch
-        0026-core-make-setting-the-shutdown-watchdog-configuratio.patch
-        0027-sd-rtnl-don-t-fail-event-handler-when-callback-fails.patch
-        0029-config_parse_set_status-put-signals-in-the-correct-s.patch
-        0030-network-address-test-network-avoid-undefined-behavio.patch
-        0033-core-disarm-shutdown-watchdog-if-we-fail-to-set-time.patch
-        0034-exit-on-idle-only-exit-if-actually-idle.patch)
-md5sums=('4e2c511b0a7932d7fc9d79822273aac6'
+        '0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch'
+        '0001-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch'
+        '0001-core-shared-in-deserializing-match-same-files-reache.patch'
+        '0001-tmpfiles-Fix-handling-of-duplicate-lines.patch'
+        '0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch'
+        '0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch'
+        '0001-unit-use-weaker-dependencies-between-mount-and-devic.patch'
+        '0001-core-rework-device-state-logic.patch'
+        '0001-core-don-t-change-removed-devices-to-state-tentative.patch')
+md5sums=('e0d6c9a4b4f69f66932d2230298c9a34'
          '90ea67a7bb237502094914622a39e281'
-         'c9db3010602913559295de3481019681'
+         '58af51bd4c0464f195b3433b4e17cf6c'
          'bde43090d4ac0ef048e3eaee8202a407'
-         '22920ff32e345a26a9c05662ec274314'
-         '6960b43aaec4f899fdf0fe87d0457901'
-         '715cefd0e803d8b441811688fd4da1c3'
-         '3bb57f2812572ee999928ba33b489afe'
-         '5d42fda1f10c02861ee454277b516716'
-         'a079c6e5c8d0184adf47794aaf338ac4'
-         'c9b4e7bff3d1c073852c3d1b3bb8002e'
-         'ae4d820582570ceb7b7c80b6810596f1'
-         '5b212435622f69c2a24b01ef7380bc94'
-         '0523c9ae27abdd30b847625b1c9c7a03'
-         'c0d236b41dd4afad3f91dee72bb296a8'
-         '25e191463fb877fd5dabecb95f15ee8f'
-         '5911ef7d3ab5c5a06076fdea221ea27e'
-         'ab7baf675e224cf19b9194fc1e4ea5ff'
-         '1d6cb563b3864fd8d724982bc2007f16'
-         '529c4fba7e0a709fda9e108e658e76c3'
-         '9d0d909507294afb879965e74fef79c8'
-         'c0b68cefe7f00ea5ec856c64f799cca4')
+         '7cdefc73bf61934c353e4450e280e551'
+         'cb8550749cd52b5902ed6fdf0eb465ec'
+         '9d46aebfc04cc849fd4295f449b239a2'
+         'c4c9c0f0a06314450563ed571962881e'
+         '6b9d611dffd92c94641360c3ef2659c1'
+         '3a0fc672b34ced18ca1364edf8644165'
+         'cd2719e8e93ad662c00bf9f195fdce66'
+         '12e01f00c91e54680098a799517698f2'
+         'd0aa4e5ec598063eab2e79fb95bceece')
 
 prepare() {
   cd "${pkgname/-selinux}-$pkgver"
 
-  for p in "${source[@]}"; do
-    [[ $p = *.patch ]] || continue
-    patch -Np1 <"../$p"
-  done
+  patch -Np1 <../0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch
+  patch -Np1 <../0001-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch
+  patch -Np1 <../0001-core-shared-in-deserializing-match-same-files-reache.patch
+  patch -Np1 <../0001-tmpfiles-Fix-handling-of-duplicate-lines.patch
+  patch -Np1 <../0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch
+  patch -Np1 <../0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch
+  patch -Np1 <../0001-unit-use-weaker-dependencies-between-mount-and-devic.patch
+  patch -Np1 <../0001-core-rework-device-state-logic.patch
+  patch -Np1 <../0001-core-don-t-change-removed-devices-to-state-tentative.patch
 }
 
 build() {
@@ -101,8 +88,8 @@ check() {
 package_systemd-selinux() {
   pkgdesc="system and service manager with SELinux support"
   license=('GPL2' 'LGPL2.1' 'MIT')
-  depends=('acl' 'bash' 'dbus' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'libsystemd-selinux' 'libidn' 'lz4' 'pam-selinux' 'libseccomp'
+  depends=('acl' 'bash' 'dbus' 'glib2' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
+           'libgcrypt' 'libsystemd-selinux' 'libidn' 'lz4' 'pam-selinux' 'libseccomp'
            'util-linux-selinux' 'xz' 'audit' 'libselinux')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
             "${pkgname/-selinux}=${pkgver}-${pkgrel}")
@@ -121,10 +108,14 @@ package_systemd-selinux() {
           etc/dbus-1/system.d/org.freedesktop.locale1.conf
           etc/dbus-1/system.d/org.freedesktop.machine1.conf
           etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/dbus-1/system.d/org.freedesktop.import1.conf
+          etc/dbus-1/system.d/org.freedesktop.network1.conf
           etc/pam.d/systemd-user
           etc/systemd/bootchart.conf
           etc/systemd/coredump.conf
           etc/systemd/journald.conf
+          etc/systemd/journal-remote.conf
+          etc/systemd/journal-upload.conf
           etc/systemd/logind.conf
           etc/systemd/system.conf
           etc/systemd/timesyncd.conf
@@ -137,13 +128,7 @@ package_systemd-selinux() {
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" \
-      "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service" \
-      "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-resolved.service" \
-      "$pkgdir/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service" \
-      "$pkgdir/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants" \
-      "$pkgdir/etc/systemd/system/network-online.target.wants"
+  rm -r "$pkgdir/etc/systemd/system/"*.wants
 
   # get rid of RPM macros
   rm -r "$pkgdir/usr/lib/rpm"
@@ -166,7 +151,10 @@ package_systemd-selinux() {
 
   # 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"