Update to 229-3

2 files changed, 23 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 483431c3b9a3..d1ea02ab4174 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Feb 18 03:54:32 UTC 2016
+# Mon May 16 13:36:25 UTC 2016
 pkgbase = systemd-knock
-	pkgver = 228
-	pkgrel = 4.1
+	pkgver = 229
+	pkgrel = 3
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
 	arch = x86_64
@@ -32,7 +32,7 @@ pkgbase = systemd-knock
 	makedepends = gnu-efi-libs
 	options = strip
 	options = debug
-	source = git://github.com/systemd/systemd.git#tag=v228
+	source = git://github.com/systemd/systemd.git#tag=v229
 	source = https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-221.patch
 	source = https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-221.patch.sig
 	source = https://repo.parabola.nu/other/systemd/splash-parabola.bmp
@@ -83,9 +83,9 @@ pkgname = systemd-knock
 	optdepends = systemd-knock-sysvcompat: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
 	provides = nss-myhostname
-	provides = systemd-tools=228
-	provides = udev=228
-	provides = systemd=228
+	provides = systemd-tools=229
+	provides = udev=229
+	provides = systemd=229
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -118,23 +118,20 @@ pkgname = libsystemd-knock
 	pkgdesc = systemd client libraries with support for stealth TCP sockets
 	license = GPL2
 	depends = glibc
+	depends = libcap
 	depends = libgcrypt
 	depends = lz4
 	depends = xz
 	provides = libsystemd.so
-	provides = libsystemd-daemon.so
-	provides = libsystemd-id128.so
-	provides = libsystemd-journal.so
-	provides = libsystemd-login.so
 	provides = libudev.so
-	provides = libsystemd=228
+	provides = libsystemd=229
 	conflicts = libsystemd
 
 pkgname = systemd-knock-sysvcompat
 	pkgdesc = sysvinit compat for systemd-knock
 	license = GPL2
 	depends = systemd-knock
-	provides = systemd-sysvcompat=228
+	provides = systemd-sysvcompat=229
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 
diff --git a/PKGBUILD b/PKGBUILD
index 4af1f7c1b575..02d675c418fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 _pkgbase=systemd
 pkgbase=systemd-knock
 pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat')
-pkgver=228
-pkgrel=4.1
+pkgver=229
+pkgrel=3
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -45,20 +45,17 @@ validpgpkeys=(
 prepare() {
   cd "$_pkgbase"
 
-  # sd-ndisc: drop RA packets from non-link-local addresses
-  # https://github.com/systemd/systemd/commit/3ccd31635353
-  # https://github.com/systemd/systemd/issues/1866
-  git cherry-pick -n 3ccd31635353
+  # networkd: FIONREAD is not reliable on some sockets
+  git cherry-pick -n 4edc2c9b6b5b921873eb82e58719ed4d9e0d69bf
 
-  # networkd: link - do not drop config for loopback device
-  # https://github.com/systemd/systemd/commit/e5d44b34cca3
-  # https://github.com/systemd/systemd/issues/2023
-  git cherry-pick -n e5d44b34cca3
+  # fix assertion failure in src/core/timer.c on bootup (FS#48197)
+  git cherry-pick -n 3f51aec8647fe13f4b1e46b2f75ff635403adf91
 
-  # virt: detect dmi before cpuid
-  # https://github.com/systemd/systemd/commit/050e65ada2e0
-  # https://github.com/systemd/systemd/issues/1993
-  git cherry-pick -n 050e65ada2e0
+  # fix udevd error checking from cg_unified() (FS#48188)
+  git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb
+
+  # revert "core: resolve specifier in config_parse_exec()"
+  git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163
 
   # Rename "Linux" -> "GNU/Linux"
   patch -Np1 -i "$srcdir/gnu+linux.patch"
@@ -92,7 +89,6 @@ build() {
       --localstatedir=/var \
       --sysconfdir=/etc \
       --enable-lz4 \
-      --enable-compat-libs \
       --enable-tcp-stealth \
       --disable-audit \
       --disable-ima \
@@ -192,10 +188,9 @@ package_systemd-knock() {
 
 package_libsystemd-knock() {
   pkgdesc="systemd client libraries with support for stealth TCP sockets"
-  depends=('glibc' 'libgcrypt' 'lz4' 'xz')
+  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
   license=('GPL2')
-  provides=('libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
-            'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so' "libsystemd=$pkgver")
+  provides=('libsystemd.so' 'libudev.so' "libsystemd=$pkgver")
   conflicts=('libsystemd')
 
   make -C "$_pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES