svn commit: r434674 - in head/security/p11-kit: . files

[Roman Bogorodskiy]

Author: novel
Date: Thu Feb 23 16:10:09 2017
New Revision: 434674
URL: https://svnweb.freebsd.org/changeset/ports/434674

Log:
  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

Added:
  head/security/p11-kit/files/patch-p11-kit_test-transport.c   (contents, props changed)
Deleted:
  head/security/p11-kit/files/patch-common__compat.c
Modified:
  head/security/p11-kit/Makefile
  head/security/p11-kit/distinfo
  head/security/p11-kit/files/patch-Makefile.in
  head/security/p11-kit/pkg-plist

Modified: head/security/p11-kit/Makefile
==============================================================================
--- head/security/p11-kit/Makefile	Thu Feb 23 15:08:12 2017	(r434673)
+++ head/security/p11-kit/Makefile	Thu Feb 23 16:10:09 2017	(r434674)
@@ -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/libtas
 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}|' \

Modified: head/security/p11-kit/distinfo
==============================================================================
--- head/security/p11-kit/distinfo	Thu Feb 23 15:08:12 2017	(r434673)
+++ head/security/p11-kit/distinfo	Thu Feb 23 16:10:09 2017	(r434674)
@@ -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

Modified: head/security/p11-kit/files/patch-Makefile.in
==============================================================================
--- head/security/p11-kit/files/patch-Makefile.in	Thu Feb 23 15:08:12 2017	(r434673)
+++ head/security/p11-kit/files/patch-Makefile.in	Thu Feb 23 16:10:09 2017	(r434674)
@@ -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 at install-exec-hook:
-- at OS_WIN32_FALSE@	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.{so,dylib}` $(DESTDIR)$(libdir)/p11-kit-proxy.so
-+ at 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 at .service
++systemduser_DATA = $(NULL)
  
- @WITH_TRUST_MODULE_TRUE at asn:
+ @OS_WIN32_FALSE at 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:

Added: head/security/p11-kit/files/patch-p11-kit_test-transport.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/p11-kit/files/patch-p11-kit_test-transport.c	Thu Feb 23 16:10:09 2017	(r434674)
@@ -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>

Modified: head/security/p11-kit/pkg-plist
==============================================================================
--- head/security/p11-kit/pkg-plist	Thu Feb 23 15:08:12 2017	(r434673)
+++ head/security/p11-kit/pkg-plist	Thu Feb 23 16:10:09 2017	(r434674)
@@ -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