systemd-knock-227-1: updating version

2 files changed, 37 insertions, 42 deletions

diff --git a/pcr/systemd-knock/PKGBUILD b/pcr/systemd-knock/PKGBUILD
index 9902c5fcd..136393df6 100644
--- a/pcr/systemd-knock/PKGBUILD
+++ b/pcr/systemd-knock/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgbase=systemd
 pkgbase=systemd-knock
 pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat')
-pkgver=226
+pkgver=227
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -33,7 +33,7 @@ md5sums=('SKIP'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '36ee74767ac8734dede1cbd0f4f275d7'
          '9b9f4a58e4c4009bf5290c5b297600c3'
-         '15b4bd1982d5d263f12806b0b1dc3e96')
+         '489e79ba87d2ebdd3cb4ef460a21bd00')
 
 prepare() {
   cd "$_pkgbase"
@@ -67,7 +67,6 @@ build() {
       --enable-tcp-stealth \
       --disable-audit \
       --disable-ima \
-      --disable-kdbus \
       --with-sysvinit-path= \
       --with-sysvrcnd-path= \
       --with-ntp-servers="${timeservers[*]}"
@@ -79,8 +78,8 @@ package_systemd-knock() {
   pkgdesc="system and service manager with support for stealth TCP sockets (Parabola rebranded)"
   license=('GPL2' 'LGPL2.1')
   depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
-           'libgcrypt' 'libsystemd-knock' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux'
-           'xz')
+           'libgcrypt' "libsystemd=$pkgver" 'libidn' 'lz4' 'pam' 'libseccomp'
+           'util-linux' 'xz')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd')
@@ -149,17 +148,11 @@ package_systemd-knock() {
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
+  ### manpages shipped with systemd-sysvcompat
+  rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
 
-  ### split off runtime libraries
-  rm -rf "$srcdir/_libsystemd"
-  install -dm755 "$srcdir"/_libsystemd/usr/lib
-  cd "$srcdir"/_libsystemd
-  mv "$pkgdir"/usr/lib/lib{systemd,udev}*.so* usr/lib
+  ### runtime libraries shipped with libsystemd
+  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
 
   # add example bootctl configuration
   install -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf
@@ -175,7 +168,7 @@ package_libsystemd-knock() {
             'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so' "libsystemd=$pkgver")
   conflicts=('libsystemd')
 
-  mv "$srcdir/_libsystemd"/* "$pkgdir"
+  make -C "$_pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
 }
 
 package_systemd-knock-sysvcompat() {
@@ -185,7 +178,10 @@ package_systemd-knock-sysvcompat() {
   conflicts=('sysvinit' 'systemd-sysvcompat')
   depends=('systemd-knock')
 
-  mv "$srcdir/_sysvcompat"/* "$pkgdir"
+  install -dm755 "$pkgdir"/usr/share/man/man8
+  cp -d --no-preserve=ownership,timestamp \
+    "$_pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+    "$pkgdir"/usr/share/man/man8
 
   install -dm755 "$pkgdir/usr/bin"
   for tool in runlevel reboot shutdown poweroff halt telinit; do
diff --git a/pcr/systemd-knock/gnu+linux.patch b/pcr/systemd-knock/gnu+linux.patch
index 36cab8289..3101bc4a9 100644
--- a/pcr/systemd-knock/gnu+linux.patch
+++ b/pcr/systemd-knock/gnu+linux.patch
@@ -283,9 +283,9 @@ diff -Nur a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
      size of the address, including the initial 0 byte, and set the
      <parameter>path</parameter> to the initial 0 byte of the socket
 diff -Nur a/man/sd_notify.xml b/man/sd_notify.xml
---- a/man/sd_notify.xml	2015-09-11 14:55:47.374340946 -0300
-+++ b/man/sd_notify.xml	2015-09-11 15:34:14.466855938 -0300
-@@ -295,7 +295,7 @@
+--- a/man/sd_notify.xml	2015-10-17 07:04:47.746947733 -0300
++++ b/man/sd_notify.xml	2015-10-17 07:05:10.849133263 -0300
+@@ -316,7 +316,7 @@
      referenced in the <varname>$NOTIFY_SOCKET</varname> environment
      variable. If the first character of
      <varname>$NOTIFY_SOCKET</varname> is <literal>@</literal>, the
@@ -342,21 +342,21 @@ diff -Nur a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
  
      <para>See the <ulink
 diff -Nur a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
---- a/man/systemd-machine-id-setup.xml	2015-09-11 14:55:47.379340981 -0300
-+++ b/man/systemd-machine-id-setup.xml	2015-09-11 15:46:03.880182303 -0300
-@@ -78,7 +78,7 @@
-     must ensure that the UUID passed is sufficiently unique and is
-     different for every booted instanced of the VM.</para>
- 
--    <para>Similar, if run inside a Linux container environment and a
-+    <para>Similar, if run inside a GNU/Linux container environment and a
-     UUID is set for the container this is used to initialize the
-     machine ID. For details see the documentation of the <ulink
-     url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
+--- a/man/systemd-machine-id-setup.xml	2015-10-17 07:04:47.750280903 -0300
++++ b/man/systemd-machine-id-setup.xml	2015-10-17 07:06:27.455327461 -0300
+@@ -88,7 +88,7 @@
+       and is different for every booted instance of the
+       VM.</para></listitem>
+ 
+-      <listitem><para>Similar, if run inside a Linux container
++      <listitem><para>Similar, if run inside a GNU/Linux container
+       environment and a UUID is configured for the container this is
+       used to initialize the machine ID. For details see the
+       documentation of the <ulink
 diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
---- a/man/systemd-nspawn.xml	2015-09-20 20:12:13.806705513 -0300
-+++ b/man/systemd-nspawn.xml	2015-09-20 20:12:54.388005823 -0300
-@@ -91,7 +91,7 @@
+--- a/man/systemd-nspawn.xml	2015-10-17 07:04:47.753614071 -0300
++++ b/man/systemd-nspawn.xml	2015-10-17 07:05:10.849133263 -0300
+@@ -91,14 +91,14 @@
  
      <para>In contrast to
      <citerefentry project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> <command>systemd-nspawn</command>
@@ -365,8 +365,7 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
      container.</para>
  
      <para>Use a tool like
-@@ -99,7 +99,7 @@
-     <citerefentry project='die-net'><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+     <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      or
 -    <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>
@@ -374,7 +373,7 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
      to set up an OS directory tree suitable as file system hierarchy
      for <command>systemd-nspawn</command> containers.</para>
  
-@@ -838,46 +838,35 @@
+@@ -837,46 +837,35 @@
      <title>Examples</title>
  
      <example>
@@ -433,9 +432,9 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
        in a namespace container in it.</para>
      </example>
  
-@@ -916,7 +905,7 @@
+@@ -914,7 +903,7 @@
+       <citerefentry project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
        <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-       <citerefentry project='die-net'><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
        <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 -      <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 +      <citerefentry project='parabola'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
@@ -467,8 +466,8 @@ diff -Nur a/man/systemd.socket.xml b/man/systemd.socket.xml
          can be inherited between processes.</para></listitem>
        </varlistentry>
 diff -Nur a/man/systemd.xml b/man/systemd.xml
---- a/man/systemd.xml	2015-09-11 14:55:47.386341030 -0300
-+++ b/man/systemd.xml	2015-09-11 16:31:49.069636893 -0300
+--- a/man/systemd.xml	2015-10-17 07:04:47.756947238 -0300
++++ b/man/systemd.xml	2015-10-17 07:05:10.849133263 -0300
 @@ -61,7 +61,7 @@
    <refsect1>
      <title>Description</title>
@@ -478,7 +477,7 @@ diff -Nur a/man/systemd.xml b/man/systemd.xml
      systems. When run as first process on boot (as PID 1), it acts as
      init system that brings up and maintains userspace
      services.</para>
-@@ -826,10 +826,10 @@
+@@ -858,10 +858,10 @@
      <title>Kernel Command Line</title>
  
      <para>When run as system instance systemd parses a number of