Update to 228-4

* libmicrohttpd 0.9.48 rebuild
* detect dmi before cpuid

2 files changed, 11 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6455c3a1411..02189bedfb63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Feb  6 22:00:08 UTC 2016
 pkgbase = systemd-knock
 	pkgver = 228
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
 	arch = x86_64
@@ -63,7 +65,7 @@ pkgname = systemd-knock
 	depends = hwids
 	depends = libcap
 	depends = libgcrypt
-	depends = libsystemd=228
+	depends = libsystemd-knock
 	depends = libidn
 	depends = lz4
 	depends = pam
diff --git a/PKGBUILD b/PKGBUILD
index 5e48c96fb0c4..20b4fda32777 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=systemd
 pkgbase=systemd-knock
 pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat')
 pkgver=228
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -49,6 +49,11 @@ prepare() {
   # https://github.com/systemd/systemd/issues/2023
   git cherry-pick -n e5d44b34cca3
 
+  # virt: detect dmi before cpuid
+  # https://github.com/systemd/systemd/commit/050e65ada2e0
+  # https://github.com/systemd/systemd/issues/1993
+  git cherry-pick -n 050e65ada2e0
+
   # Rename "Linux" -> "GNU/Linux"
   patch -Np1 -i "$srcdir/gnu+linux.patch"
   sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c
@@ -97,7 +102,7 @@ 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=$pkgver" 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
+           'libgcrypt' 'libsystemd-knock' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
            'util-linux' 'xz')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')