libp11: update to 0.4.11

- fixed installation location of openssl engine
- avoid regenerating autoconf bits

New in 0.4.11; 2020-10-11; Michał Trojnara
* Fixed "EVP_PKEY_derive:buffer too small" EC errors (Luka Logar)
* Fixed various memory leaks (Mateusz Kwiatkowski)
* Fixed Windows VERSIONINFO (Pavol Misik)
* Fixed builds with OpenSSL older than 1.0.2 (Michał Trojnara)
* Fixed a double free in EVP_PKEY_meth_free() (Mikhail Durnev)
* Added CKA_VALUE_LEN to EC key derivation template (Michał Trojnara)
* Fixed handling keys without label attribute (efternavn)
* Updated the tests (Anderson Toshiyuki Sasaki)
* Made ECDH-derived keys extractable (Bent Bisballe Nyeng)
* Added support for pin-source within PKCS#11 URI (Stanislav Levin)
* Improved LibreSSL compatibility (patchMonkey156)
* Fixed handling RSA private keys in BIND (Stanislav Levin)
* Added macOS testing support (Stanislav Levin)
* Fixed engine object search algorithm (Anderson Toshiyuki Sasaki)

4 files changed, 19 insertions, 45 deletions

diff --git a/security/libp11/Makefile b/security/libp11/Makefile
index 389f7a5e277..d1927be3a28 100644
--- a/security/libp11/Makefile
+++ b/security/libp11/Makefile
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.15 2020/04/16 12:42:28 manu Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/10 08:25:08 nia Exp $
 #
 
-VERSION=		0.4.10
-DISTNAME=		libp11-${VERSION}
-#PKGREVISION=		1
+DISTNAME=		libp11-0.4.11
 CATEGORIES=		security
-MASTER_SITES=		https://github.com/OpenSC/libp11/archive/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=OpenSC/}
+GITHUB_RELEASE=		${DISTNAME}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://github.com/OpenSC/libp11/wiki
 COMMENT=		Convenience library for easy PKCS\#11 implementation
 LICENSE=		gnu-lgpl-v2.1
 
-WRKSRC=			${WRKDIR}/libp11-libp11-${VERSION}
-
-USE_TOOLS+=		autoconf automake gmake pkg-config
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/src/libp11.pc.in
+PKGCONFIG_OVERRIDE+=	src/libp11.pc.in
+
+CONFIGURE_ARGS+=	--with-enginesdir=${PREFIX}/lib/engines-1.1
 
-pre-configure:
-	cd ${WRKSRC} && ./bootstrap
+CHECK_PORTABILITY_SKIP+=	tests/search-all-matching-tokens.softhsm
+CHECK_PORTABILITY_SKIP+=	tests/pkcs11-uri-without-token.softhsm
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/libp11/PLIST b/security/libp11/PLIST
index 518d0d1f60d..fed7ce87219 100644
--- a/security/libp11/PLIST
+++ b/security/libp11/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2020/04/16 12:42:28 manu Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/04/10 08:25:08 nia Exp $
 include/libp11.h
 include/p11_err.h
+lib/engines-1.1/libpkcs11.so
+lib/engines-1.1/pkcs11.la
 lib/libp11.la
-lib/libpkcs11.so
-lib/pkcs11.la
 lib/pkgconfig/libp11.pc
+share/doc/libp11/NEWS
diff --git a/security/libp11/distinfo b/security/libp11/distinfo
index c760f1da635..901a73577e4 100644
--- a/security/libp11/distinfo
+++ b/security/libp11/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/04/16 12:42:28 manu Exp $
+$NetBSD: distinfo,v 1.7 2021/04/10 08:25:08 nia Exp $
 
-SHA1 (libp11-0.4.10.tar.gz) = 4c7d187e22b85947e943db443feab9a852cc1585
-RMD160 (libp11-0.4.10.tar.gz) = 62ab5cc2cb0b943d91c7daa3e24c82bc17105858
-SHA512 (libp11-0.4.10.tar.gz) = 7f1ce0a6057048787ad604984366c681785bbc10d26fb5a4ba1081780080c3f1b9711796902e05ebe6562251812c321e425af1cf8609ec36f15e954b7fe131e7
-Size (libp11-0.4.10.tar.gz) = 127101 bytes
-SHA1 (patch-Makefile.am) = c1ef488d455013841d973462fb67a64baf4db452
+SHA1 (libp11-0.4.11.tar.gz) = 25bd6376a41b7e10713157c7fd51e4bf5d57cdc7
+RMD160 (libp11-0.4.11.tar.gz) = 00392cf1ae584ecc3075e2c9efd7bb0fc02cd45e
+SHA512 (libp11-0.4.11.tar.gz) = 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
+Size (libp11-0.4.11.tar.gz) = 500433 bytes
diff --git a/security/libp11/patches/patch-Makefile.am b/security/libp11/patches/patch-Makefile.am
deleted file mode 100644
index db12b7daa27..00000000000
--- a/security/libp11/patches/patch-Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.2 2020/03/29 02:13:32 manu Exp $
-
-Don't install NEWS, as usually it is not.
-Don't install a README about a wiki copy that isn't there.
-
-These changes have not yet been submitted upstream.
-
---- Makefile.am.orig	2017-01-26 22:19:45.000000000 +0100
-+++ Makefile.am	2020-03-28 02:57:20.450453387 +0100
-@@ -14,12 +14,13 @@
- EXTRA_DIST = Makefile.mak make.rules.mak README.md
- 
- dist_noinst_DATA = COPYING INSTALL.md
- 
--dist_doc_DATA = NEWS
-+#dist_doc_DATA = NEWS
- 
- # Prerequisites must be first on the list
--SUBDIRS = src doc examples tests
-+SUBDIRS = src
-+# doc examples tests
- 
- # Allow detection of packaged tarball
- dist-hook:
- 	$(MKDIR_P) "$(distdir)/m4"