security/p11-kit: update to 0.23.4

 - Remove patches merged upstream
 - Add a workaround for missing getpeereid() check
 - Fix missing headers for kill(2) and SIGKILL
 - Add a workaround to skip installation of the
   systemd related bits
 - Define TEST_TARGET

6 files changed, 38 insertions, 28 deletions

diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 9975f46..6595cb4 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p11-kit
-PORTVERSION=	0.23.3
+PORTVERSION=	0.23.4
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${PORTVERSION}/
 
@@ -17,12 +17,15 @@ LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-debug=no \
 		--with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -DHAVE_GETPEEREID=1"
 MAKE_ENV=	exampledir=${STAGEDIR}${EXAMPLESDIR}
 INSTALL_TARGET=	install-strip
 
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
+TEST_TARGET=	check
+
 pre-configure:
 	@${REINPLACE_CMD} -e \
 	's|exampledir = $$(p11_system_config)|exampledir = ${EXAMPLESDIR}|' \
diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo
index ed71924..1f00f25 100644
--- a/security/p11-kit/distinfo
+++ b/security/p11-kit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482251495
-SHA256 (p11-kit-0.23.3.tar.gz) = d487f04dba3f9e8256f53034c59c944ca45fd7b8434c095da6a74079644dcd82
-SIZE (p11-kit-0.23.3.tar.gz) = 1047441
+TIMESTAMP = 1487783387
+SHA256 (p11-kit-0.23.4.tar.gz) = 495382c88bd727cdab42204551b571234c1c6ee626fcc84fe50b7cd0676673ae
+SIZE (p11-kit-0.23.4.tar.gz) = 1075189
diff --git a/security/p11-kit/files/patch-Makefile.in b/security/p11-kit/files/patch-Makefile.in
index c3c2e46..d3b96c2 100644
--- a/security/p11-kit/files/patch-Makefile.in
+++ b/security/p11-kit/files/patch-Makefile.in
@@ -1,11 +1,21 @@
---- Makefile.in.orig	2016-12-20 16:51:38 UTC
+--- Makefile.in.orig	2017-02-23 06:26:31 UTC
 +++ Makefile.in
-@@ -4246,7 +4246,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -1438,9 +1438,7 @@ libp11_kit_testable_la_LIBADD = $(COMMON
+ @OS_WIN32_TRUE@	$(NULL)
  
- # Proxy module is actually same as library, so install a link
- @OS_WIN32_FALSE@install-exec-hook:
--@OS_WIN32_FALSE@	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.{so,dylib}` $(DESTDIR)$(libdir)/p11-kit-proxy.so
-+@OS_WIN32_FALSE@	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.so` $(DESTDIR)$(libdir)/p11-kit-proxy.so
- @OS_WIN32_FALSE@	$(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
+ systemduserdir = $(prefix)/lib/systemd/user
+-systemduser_DATA = \
+-	p11-kit/p11-kit-remote.socket \
+-	p11-kit/p11-kit-remote@.service
++systemduser_DATA = $(NULL)
  
- @WITH_TRUST_MODULE_TRUE@asn:
+ @OS_WIN32_FALSE@p11_kit_client_la_LDFLAGS = \
+ @OS_WIN32_FALSE@	-no-undefined -module -avoid-version \
+@@ -4390,7 +4388,6 @@ install-data-am: install-configDATA inst
+ 	install-moduleLTLIBRARIES install-pkgconfigDATA \
+ 	install-privatePROGRAMS install-systemduserDATA
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive
+ 
+ install-dvi-am:
diff --git a/security/p11-kit/files/patch-common__compat.c b/security/p11-kit/files/patch-common__compat.c
deleted file mode 100644
index f67aba4..0000000
--- a/security/p11-kit/files/patch-common__compat.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- common/compat.c.orig	2014-10-06 05:29:32 UTC
-+++ common/compat.c
-@@ -34,12 +34,6 @@
- 
- #include "config.h"
- 
--/*
-- * This is needed to expose pthread_mutexattr_settype and PTHREAD_MUTEX_DEFAULT
-- * on older pthreads implementations
-- */
--#define _XOPEN_SOURCE 700
--
- #include "compat.h"
- 
- #include <assert.h>
diff --git a/security/p11-kit/files/patch-p11-kit_test-transport.c b/security/p11-kit/files/patch-p11-kit_test-transport.c
new file mode 100644
index 0000000..72eb18b
--- /dev/null
+++ b/security/p11-kit/files/patch-p11-kit_test-transport.c
@@ -0,0 +1,10 @@
+--- p11-kit/test-transport.c.orig	2017-02-16 16:01:14 UTC
++++ p11-kit/test-transport.c
+@@ -45,6 +45,7 @@
+ 
+ #include <errno.h>
+ #include <sys/types.h>
++#include <signal.h>
+ #ifdef OS_UNIX
+ #include <sys/socket.h>
+ #include <sys/un.h>
diff --git a/security/p11-kit/pkg-plist b/security/p11-kit/pkg-plist
index 242089d..4091bb9 100644
--- a/security/p11-kit/pkg-plist
+++ b/security/p11-kit/pkg-plist
@@ -10,11 +10,13 @@ include/p11-kit-1/p11-kit/remote.h
 include/p11-kit-1/p11-kit/uri.h
 lib/libp11-kit.so
 lib/libp11-kit.so.0
-lib/libp11-kit.so.0.2.0
+lib/libp11-kit.so.0.3.0
 lib/p11-kit-proxy.so
+lib/pkcs11/p11-kit-client.so
 lib/pkcs11/p11-kit-trust.so
 libdata/pkgconfig/p11-kit-1.pc
 libexec/p11-kit/p11-kit-remote
+libexec/p11-kit/p11-kit-server
 libexec/p11-kit/trust-extract-compat
 share/gtk-doc/html/p11-kit/config-example.html
 share/gtk-doc/html/p11-kit/config-files.html