libp11: update to 0.4.16

See release notes since 0.4.13:

https://github.com/OpenSC/libp11/releases/tag/libp11-0.4.14

https://github.com/OpenSC/libp11/releases/tag/libp11-0.4.15

https://github.com/OpenSC/libp11/releases/tag/libp11-0.4.16

Signed-off-by: Daniel Golle <[email protected]>

diff --git a/libs/libp11/Makefile b/libs/libp11/Makefile
index c7d94920d22553e3b3fe84c71a97e380237a2b66..5aa09522583a99e57ecab338d0e938c84f51baae 100644 (file)
--- a/libs/libp11/Makefile
+++ b/libs/libp11/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libp11
-PKG_VERSION:=0.4.13
+PKG_VERSION:=0.4.16
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=d25dd9cff1b623e12d51b6d2c100e26063582d25c9a6f57c99d41f2da9567086
+PKG_HASH:=97777640492fa9e5831497e5892e291dfbf39a7b119d9cb6abb3ec8c56d17553
 
 PKG_MAINTAINER:=Daniel Golle <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later

diff --git a/libs/libp11/patches/001-fix-install.patch b/libs/libp11/patches/001-fix-install.patch
index ae91a914fbe1c25ec6fb20d76be4a53d7fe20e61..315f589966e311f1577e1d29c503543621d610d0 100644 (file)
--- a/libs/libp11/patches/001-fix-install.patch
+++ b/libs/libp11/patches/001-fix-install.patch
@@ -1,8 +1,8 @@
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -56,13 +56,6 @@ libpkcs11_la_SOURCES = $(pkcs11_la_SOURC
- libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS)
+@@ -66,16 +66,6 @@ libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS
  libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD)
+ endif
  
 -# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
 -check-local: $(LTLIBRARIES)
@@ -10,13 +10,16 @@
 -
 -install-exec-hook:
 -      cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+-if LIBP11_OSSL_PROVIDER
+-      cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+-endif
 -
  if WIN32
  # def file required for MS users to build library
  mylibdir=$(libdir)
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -965,7 +965,7 @@ distdir-am: $(DISTFILES)
+@@ -1057,7 +1057,7 @@ distdir-am: $(DISTFILES)
          fi; \
        done
  check-am: all-am
@@ -25,29 +28,35 @@
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
  install-enginesexecLTLIBRARIES: install-libLTLIBRARIES
-@@ -1060,7 +1060,7 @@ install-dvi-am:
- 
- install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES
+@@ -1158,7 +1158,7 @@ install-dvi-am:
+ install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES \
+       install-providersexecLTLIBRARIES
        @$(NORMAL_INSTALL)
 -      $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 +      $(MAKE) $(AM_MAKEFLAGS)
  install-html: install-html-am
  
  install-html-am:
-@@ -1127,14 +1127,14 @@ uninstall-am: uninstall-enginesexecLTLIB
+@@ -1228,7 +1228,7 @@ uninstall-am: uninstall-enginesexecLTLIB
  .MAKE: all check-am install-am install-exec-am install-strip
  
  .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
 -      check-local clean clean-enginesexecLTLIBRARIES clean-generic \
 +      clean clean-enginesexecLTLIBRARIES clean-generic \
-       clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
-       ctags-am distclean distclean-compile distclean-generic \
-       distclean-hdr distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-enginesexecLTLIBRARIES install-exec install-exec-am \
--      install-exec-hook install-html install-html-am \
-+      install-html install-html-am \
-       install-includeHEADERS install-info install-info-am \
-       install-libLTLIBRARIES install-man install-mylibDATA \
-       install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+       clean-libLTLIBRARIES clean-libtool \
+       clean-providersexecLTLIBRARIES cscopelist-am ctags ctags-am \
+       distclean distclean-compile distclean-generic distclean-hdr \
+@@ -1253,13 +1253,6 @@ uninstall-am: uninstall-enginesexecLTLIB
+ 
+       $(srcdir)/config.h.in $(srcdir)/config.h.in~
+ 
+-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
+-check-local: $(LTLIBRARIES)
+-      cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+-
+-install-exec-hook:
+-      cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+-@LIBP11_OSSL_PROVIDER_TRUE@   cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+ @[email protected]/@WIN_LIBPREFIX@p11-@[email protected]:      libp11.la
+ .rc.lo:
+       $(LTRCCOMPILE) -i "$<" -o "$@"