p11-kit: update to 0.23.10.

This is a development release, but gnutls needs at least 0.23.x,
so take the latest development release.

0.23.10 (devel)
 * filter: Respect "write-protected" vendor-specific attribute in
   PKCS#11 URI [PR#129]
 * server: Improve shell integration and documentation [PR#107, PR#108]
 * proxy: Reuse existing slot ID mapping in after fork() [PR#120]
 * trust: Forcibly mark "Default Trust" read-only [PR#123]
 * New function p11_kit_override_system_files() which can be used for
   testing [PR#110]
 * trust: Filter out duplicate extensions [PR#69]
 * Update translations [PR#128]
 * Bug fixes [PR#125, PR#126]

0.23.9 (devel)
 * Fix p11-kit server regressions [PR#103, PR#104]
 * trust: Respect anyExtendedKeyUsage in CA certificates [PR#99]
 * Build fixes related to reallocarray [PR#96, PR#98, PR#100]

0.23.8 (devel)
 * Improve vendor query attributes handling in PKCS#11 URI [PR#92]
 * Add OTP and GOST mechanisms to pkcs11.h [PR#90, PR#91]
 * New envvar P11_KIT_NO_USER_CONFIG to stop looking at user
   configurations [PR#87]
 * Build fixes for Solaris and 32-bit big-endian platforms [PR#81, PR#86]

0.23.7 (devel)
 * Fix memory issues with "p11-kit server" [PR#78]
 * Build fixes [PR#77 ...]

0.23.6 (devel)
 * Port "p11-kit server" to Windows and portability fixes of the RPC
   protocol [PR#67, PR#72, PR#74]
 * Recover the old behavior of "trust anchor --remove" [PR#70, PR#71]
 * Build fixes [PR#63 ...]

0.23.5 (devel)
 * Fix license notice of common/unix-peer.c [PR#58]
 * Remove systemd unit files for now [PR#60]
 * Build fixes for FreeBSD [PR#56]

0.23.4 (devel)
 * Recognize query attributes defined in PKCS#11 URI (RFC7512) [PR#31,
   PR#37, PR#52]
 * The trust policy module now recognizes CKA_NSS_MOZILLA_CA_POLICY
   attribute, used by Firefox [#99453, PR#46]
 * Add 'trust dump' command to dump all PKCS#11 objects in the
   persistence format [PR#44]
 * New experimental 'p11-kit server' command that allows PKCS#11
   forwarding through a Unix domain socket.  A client-side module
   p11-kit-client.so is also provided [PR#15]
 * Add systemd unit files for exporting the proxy module through a
   Unix domain socket [PR#35]
 * New P11KitIter API to iterate over slots, tokens, and modules in
   addition to objects [PR#28]
 * libffi dependency is now optional [PR#9]
 * Build fixes for FreeBSD, macOS, and Windows [PR#32, PR#39, PR#45]

0.23.3 (devel)
 * Install private executables in libexecdir [#98817]
 * Fix link error of proxy module on macOS [#98022]
 * Use new PKCS#11 URI specification for URIs [#97245]
 * Support x-init-reserved argument of C_Initialize() in remote modules [#80519]
 * Incorporate changes from PKCS#11 2.40 specification
 * Bump libtool library version
 * Documentation fixes
 * Build fixes [#87192 ...]

0.23.2 (devel)
 * Fix forking issues with libffi [#90289 ...]
 * Updated translations
 * Build fixes [#90827 #89081 #92434 #92520 #92445 #92551 #92843 #92842 #92807 #93211 ...]

0.23.1 (devel)
 * Use new PKCS#11 URI draft fields for URIs [#86474 #87582]
 * Add pem-directory-hash extract format
 * Build fixes

8 files changed, 88 insertions, 21 deletions

diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 8d4f36de71e..9099cb05d03 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2017/08/24 14:50:19 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.6 2018/04/17 13:26:15 wiz Exp $
 
-DISTNAME=	p11-kit-0.22.1
-PKGREVISION=	1
+DISTNAME=	p11-kit-0.23.10
 CATEGORIES=	security
-MASTER_SITES=	http://p11-glue.freedesktop.org/releases/
+#MASTER_SITES=	http://p11-glue.freedesktop.org/releases/
+MASTER_SITES+=	${MASTER_SITE_GITHUB:=p11-glue/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://p11-glue.freedesktop.org/p11-kit.html
-COMMENT=	PKCS#11 module manager
+COMMENT=	PKCS\#11 module manager
 LICENSE=	modified-bsd
 
 DEPENDS=	mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
diff --git a/security/p11-kit/PLIST b/security/p11-kit/PLIST
index ef43083d55b..03995ac196e 100644
--- a/security/p11-kit/PLIST
+++ b/security/p11-kit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/13 03:10:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/04/17 13:26:15 wiz Exp $
 bin/p11-kit
 bin/trust
 include/p11-kit-1/p11-kit/deprecated.h
@@ -11,10 +11,12 @@ include/p11-kit-1/p11-kit/remote.h
 include/p11-kit-1/p11-kit/uri.h
 lib/libp11-kit.la
 lib/p11-kit-proxy.so
-lib/p11-kit/p11-kit-remote
-lib/p11-kit/trust-extract-compat
+lib/pkcs11/p11-kit-client.la
 lib/pkcs11/p11-kit-trust.la
 lib/pkgconfig/p11-kit-1.pc
+libexec/p11-kit/p11-kit-remote
+libexec/p11-kit/p11-kit-server
+libexec/p11-kit/trust-extract-compat
 share/examples/p11-kit/pkcs11.conf.example
 share/gtk-doc/html/p11-kit/config-example.html
 share/gtk-doc/html/p11-kit/config-files.html
@@ -29,7 +31,6 @@ share/gtk-doc/html/p11-kit/devel.html
 share/gtk-doc/html/p11-kit/gtk-doc.css
 share/gtk-doc/html/p11-kit/home.png
 share/gtk-doc/html/p11-kit/index.html
-share/gtk-doc/html/p11-kit/index.sgml
 share/gtk-doc/html/p11-kit/left-insensitive.png
 share/gtk-doc/html/p11-kit/left.png
 share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
@@ -42,6 +43,7 @@ share/gtk-doc/html/p11-kit/p11-kit.devhelp2
 share/gtk-doc/html/p11-kit/p11-kit.html
 share/gtk-doc/html/p11-kit/pkcs11-conf.html
 share/gtk-doc/html/p11-kit/reference.html
+share/gtk-doc/html/p11-kit/remoting.html
 share/gtk-doc/html/p11-kit/right-insensitive.png
 share/gtk-doc/html/p11-kit/right.png
 share/gtk-doc/html/p11-kit/sharing-managed.html
diff --git a/security/p11-kit/buildlink3.mk b/security/p11-kit/buildlink3.mk
index 91b830a6bb3..1b035daa1eb 100644
--- a/security/p11-kit/buildlink3.mk
+++ b/security/p11-kit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/02/03 14:43:12 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/04/17 13:26:15 wiz Exp $
 
 BUILDLINK_TREE+=	p11-kit
 
@@ -6,7 +6,10 @@ BUILDLINK_TREE+=	p11-kit
 P11_KIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p11-kit+=	p11-kit>=0.10
+BUILDLINK_API_DEPENDS.p11-kit+=	p11-kit>=0.23
 BUILDLINK_PKGSRCDIR.p11-kit?=	../../security/p11-kit
+.include "../../devel/libffi/buildlink3.mk"
+.include "../../security/libtasn1/buildlink3.mk"
 .endif	# P11_KIT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-p11-kit
diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo
index d97f0b4d265..aab0ff49b16 100644
--- a/security/p11-kit/distinfo
+++ b/security/p11-kit/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.3 2016/03/13 03:10:36 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2018/04/17 13:26:15 wiz Exp $
 
-SHA1 (p11-kit-0.22.1.tar.gz) = f92e357ab9bdb27a5a22daa99d738e278f03c947
-RMD160 (p11-kit-0.22.1.tar.gz) = 6e14580a0d81c9e41f9ff9f95a6f78c58102f8cf
-SHA512 (p11-kit-0.22.1.tar.gz) = 500b0c922e98ed2d28133f93629bf762b873c8f6c638ccb4ba2b4f2df548c519f8ce27f1efae66193f88027d1b548908dbe3f5e84106a52ab972e29771c1d37b
-Size (p11-kit-0.22.1.tar.gz) = 992099 bytes
-SHA1 (patch-Makefile.in) = 1db1ed011c07bf7ac3022249e0f3b80630a6034e
+SHA1 (p11-kit-0.23.10.tar.gz) = 88cdf4e7c50e3da02f1e69173d731410f6123efe
+RMD160 (p11-kit-0.23.10.tar.gz) = 5c87af0f7a088b58789859f42a95b9e2d038c5bb
+SHA512 (p11-kit-0.23.10.tar.gz) = 42a004613f951e4e18c10cd204bcba348267cc7b3ae0d9f26d69012b086af446947660575d5751539b8d4dd77fa9b684054ad5ac978119e0a2e94fcdf9842178
+Size (p11-kit-0.23.10.tar.gz) = 1121419 bytes
+SHA1 (patch-Makefile.in) = 8257299a8c1dc0b93e6ff919749823cbe83bc38c
+SHA1 (patch-common_debug.c) = d711b2dabff5a64cb0b524cfbda67043311b9cf6
+SHA1 (patch-common_message.c) = 8e098702b38c86ad8564510fb47bd97e1f62d4ab
+SHA1 (patch-p11-kit_test-server.sh) = 32768acd75723228adcaa5ead9139a9899918366
diff --git a/security/p11-kit/patches/patch-Makefile.in b/security/p11-kit/patches/patch-Makefile.in
index 73c7632ca3c..71854766330 100644
--- a/security/p11-kit/patches/patch-Makefile.in
+++ b/security/p11-kit/patches/patch-Makefile.in
@@ -1,9 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.1 2016/03/13 03:10:36 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2018/04/17 13:26:15 wiz Exp $
 
---- Makefile.in.orig	2015-12-07 13:51:02.000000000 +0000
+Install examples into pkgsrc example directory.
+
+--- Makefile.in.orig	2018-02-27 15:35:35.000000000 +0000
 +++ Makefile.in
-@@ -1355,7 +1355,7 @@ libp11_kit_testable_la_LIBADD = $(libp11
- 
+@@ -1636,7 +1636,7 @@ libp11_kit_testable_la_LIBADD = $(COMMON
+ @OS_WIN32_FALSE@p11_kit_client_la_LIBADD = $(libp11_kit_la_LIBADD)
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = p11-kit/p11-kit-1.pc
 -exampledir = $(p11_system_config)
diff --git a/security/p11-kit/patches/patch-common_debug.c b/security/p11-kit/patches/patch-common_debug.c
new file mode 100644
index 00000000000..9d21572bd22
--- /dev/null
+++ b/security/p11-kit/patches/patch-common_debug.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-common_debug.c,v 1.1 2018/04/17 13:26:15 wiz Exp $
+
+NetBSD does not have uselocale()
+https://github.com/p11-glue/p11-kit/issues/143
+
+--- common/debug.c.orig	2018-01-31 12:47:38.000000000 +0000
++++ common/debug.c
+@@ -162,7 +162,7 @@ p11_debug_message_err (int flag,
+ 		va_end (args);
+ 
+ 		snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum);
+-#ifdef HAVE_STRERROR_L
++#if defined(HAVE_STRERROR_L) && !defined(__NetBSD__)
+ 		loc = uselocale ((locale_t) 0);
+ 		if (loc != NULL)
+ 			strncpy (strerr, strerror_l (errnum, loc), sizeof (strerr));
diff --git a/security/p11-kit/patches/patch-common_message.c b/security/p11-kit/patches/patch-common_message.c
new file mode 100644
index 00000000000..576a42ae042
--- /dev/null
+++ b/security/p11-kit/patches/patch-common_message.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-common_message.c,v 1.1 2018/04/17 13:26:15 wiz Exp $
+
+NetBSD does not have uselocale()
+https://github.com/p11-glue/p11-kit/issues/143
+
+--- common/message.c.orig	2018-01-31 12:47:38.000000000 +0000
++++ common/message.c
+@@ -118,7 +118,7 @@ p11_message_err (int errnum,
+ 	buffer[length] = 0;
+ 
+ 	snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum);
+-#ifdef HAVE_STRERROR_L
++#if defined(HAVE_STRERROR_L) && !defined(__NetBSD__)
+ 	loc = uselocale ((locale_t) 0);
+ 	if (loc != NULL)
+ 		strncpy (strerr, strerror_l (errnum, loc), sizeof (strerr));
diff --git a/security/p11-kit/patches/patch-p11-kit_test-server.sh b/security/p11-kit/patches/patch-p11-kit_test-server.sh
new file mode 100644
index 00000000000..2acd5174654
--- /dev/null
+++ b/security/p11-kit/patches/patch-p11-kit_test-server.sh
@@ -0,0 +1,25 @@
+$NetBSD: patch-p11-kit_test-server.sh,v 1.1 2018/04/17 13:26:15 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- p11-kit/test-server.sh.orig	2018-01-31 12:47:38.000000000 +0000
++++ p11-kit/test-server.sh
+@@ -24,8 +24,8 @@ fi
+ 
+ . ./start.env
+ 
+-test "${P11_KIT_SERVER_ADDRESS+set}" == set || exit 1
+-test "${P11_KIT_SERVER_PID+set}" == set || exit 1
++test "${P11_KIT_SERVER_ADDRESS+set}" = set || exit 1
++test "${P11_KIT_SERVER_PID+set}" = set || exit 1
+ 
+ "$abs_top_builddir"/p11-kit-server -s -k > stop.env 2> stop.err
+ if test $? -ne 0; then
+@@ -35,5 +35,5 @@ fi
+ 
+ . ./stop.env
+ 
+-test "${P11_KIT_SERVER_ADDRESS-unset}" == unset || exit 1
+-test "${P11_KIT_SERVER_PID-unset}" == unset || exit 1
++test "${P11_KIT_SERVER_ADDRESS-unset}" = unset || exit 1
++test "${P11_KIT_SERVER_PID-unset}" = unset || exit 1