upgrade package to v1.1.1

3 files changed, 30 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a43b8fd8e4e8..cdcf740897bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
+# Generated by mksrcinfo v8
+# Tue Jul 10 23:28:57 UTC 2018
 pkgbase = libkcapi
 	pkgdesc = Linux Kernel Crypto API User Space Interface Library
-	pkgver = 1.0.3
+	pkgver = 1.1.1
 	pkgrel = 1
 	url = http://www.chronox.de/libkcapi.html
 	arch = i686
 	arch = x86_64
-	arch = armv6
-	arch = armv7
+	arch = armv6h
+	arch = armv7h
 	arch = aarch64
-	license = MIT
+	license = BSD
+	license = GPL2
 	makedepends = autoconf
 	makedepends = automake
 	makedepends = m4
 	makedepends = make
 	makedepends = pkg-config
-	source = http://www.chronox.de/libkcapi/libkcapi-1.0.3.tar.xz
-	source = http://www.chronox.de/libkcapi/libkcapi-1.0.3.tar.xz.asc
+	source = http://www.chronox.de/libkcapi/libkcapi-1.1.1.tar.xz
+	source = http://www.chronox.de/libkcapi/libkcapi-1.1.1.tar.xz.asc
 	source = makefile.patch
-	validpgpkeys = 5F0D446594D2BF6977A9828AF02C639D843B5F11
-	sha256sums = 4bf40617d3d0373890f710bb7c9434c2dbca8a4a9f380b6bcc34a4f3614c3f29
+	sha256sums = a6cb952a7151184f6e74180e2624f7016f3bfe1fdf88535e9f3380af9864e03a
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cdabc890e40..7d517e032829 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Vincent Bernardoff <vb AT luminar.eu.org>
 
 pkgname=libkcapi
-pkgver=1.0.3
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="Linux Kernel Crypto API User Space Interface Library"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -11,10 +11,10 @@ license=('BSD' 'GPL2')
 source=("http://www.chronox.de/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://www.chronox.de/$pkgname/$pkgname-$pkgver.tar.xz.asc"
         "makefile.patch")
-sha256sums=("4bf40617d3d0373890f710bb7c9434c2dbca8a4a9f380b6bcc34a4f3614c3f29"
+sha256sums=("a6cb952a7151184f6e74180e2624f7016f3bfe1fdf88535e9f3380af9864e03a"
             "SKIP"
             "SKIP")
-validpgpkeys=("5F0D446594D2BF6977A9828AF02C639D843B5F11")
+validpgpkeys=("3BCC43D4D2C87D1784B69EE4421EE936326AC15B")
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/makefile.patch b/makefile.patch
index 530a94dbfae4..74cfea3ffa68 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,13 +1,23 @@
---- src/libkcapi-1.0.3/Makefile.am	2018-01-12 22:41:55.000000000 +0100
-+++ Makefile.am	2018-01-25 15:34:35.649902674 +0100
-@@ -131,8 +131,8 @@
+--- libkcapi-1.1.1/Makefile.am	2018-07-11 01:22:56.943190820 +0200
++++ libkcapi-1.1.1/Makefile.am.patch	2018-07-11 01:25:57.253183003 +0200
+@@ -153,19 +153,8 @@
  
  install-exec-hook:
  	(cd $(DESTDIR)$(bindir) && \
--	($(foreach link, $(kcapi_hasher_links), ln -f kcapi-hasher $(link);)) && \
--	($(foreach link, $(kcapi_hasher_links), openssl sha256 -hmac orboDeJITITejsirpADONivirpUkvarP $(link) > .$(link).hmac;)))
-+	($(foreach link, $(kcapi_hasher_links), ln -f kcapi-hasher $(link)-kcapi;)) && \
-+	($(foreach link, $(kcapi_hasher_links), openssl sha256 -hmac orboDeJITITejsirpADONivirpUkvarP $(link)-kcapi > .$(link)-kcapi.hmac;)))
+-	($(foreach link, $(hasher_links), $(LN) -f kcapi-hasher $(link);)))
++	($(foreach link, $(hasher_links), $(LN) -f kcapi-hasher $(link)-kcapi;)))
+ 	-rm -f $(DESTDIR)$(bindir)/kcapi-hasher
+-if HAVE_OPENSSL
+-	$(MKDIR_P) $(DESTDIR)$(CHECK_DIR_BIN_FC)
+-	$(MKDIR_P) $(DESTDIR)$(CHECK_DIR_BIN_HC)
+-	(cd $(DESTDIR)$(bindir) && \
+-	($(foreach link, $(hasher_links_fc), \
+-		$(CHECKSUM_CMD_FC) $(link) > $(DESTDIR)$(CHECK_DIR_BIN_FC)/$(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);) \
+-	$(foreach link, $(hasher_links_hc), \
+-		$(CHECKSUM_CMD_HC) $(link) > $(DESTDIR)$(CHECK_DIR_BIN_HC)/$(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);):))
+-	($(foreach lib, $(wildcard $(DESTDIR)$(libdir)/libkcapi.so*), \
+-		$(CHECKSUM_CMD_FC) $(lib)  > $(DESTDIR)$(CHECK_DIR_LIB)/$(CHECK_PREFIX)$(notdir $(lib)).$(CHECK_SUFFIX);):)
+-endif
  endif
  
  if ENABLE_KCAPI_RNGAPP