svn commit: r540634 - head/security/pkcs11-gateway

[Alex Dupre]

Author: ale
Date: Sat Jun 27 20:12:08 2020
New Revision: 540634
URL: https://svnweb.freebsd.org/changeset/ports/540634

Log:
  Update to 1.4 release:
  - add support for linux 64-bit pkcs#11 modules (on amd64)
  - build linux binaries via linuxulator instead of shipping prebuilt binaries
  
  Tested by:	grembo (thanks for your support!)

Modified:
  head/security/pkcs11-gateway/Makefile
  head/security/pkcs11-gateway/distinfo
  head/security/pkcs11-gateway/pkg-descr

Modified: head/security/pkcs11-gateway/Makefile
==============================================================================
--- head/security/pkcs11-gateway/Makefile	Sat Jun 27 19:42:17 2020	(r540633)
+++ head/security/pkcs11-gateway/Makefile	Sat Jun 27 20:12:08 2020	(r540634)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkcs11-gateway
-PORTVERSION=	1.2
+PORTVERSION=	1.4
 CATEGORIES=	security devel linux
 MASTER_SITES=	LOCAL/ale
 
@@ -11,23 +11,37 @@ COMMENT=	Wrapper Cryptoki library to use Linux PKCS\#1
 
 LICENSE=	LGPL20
 
-MAKEFILE=	Makefile.FreeBSD
-USE_LDCONFIG=	yes
 USES=		linux
 
-PLIST_FILES=	bin/pkcs11-gateway lib/libpkcs11-gateway.so \
-		lib/libpkcs11-gateway.so.1
+OPTIONS_DEFINE=	DOCS
 
+USE_LDCONFIG=	yes
+USE_LINUX=	base:run devtools:build
+
+.include <bsd.port.pre.mk>
+
+PKCS11_BINS=	pkcs11-gateway32
+.if ${ARCH} == "amd64"
+PKCS11_BINS+=	pkcs11-gateway64
+.endif
+
+PKCS11_LIB=	libpkcs11-gateway.so
+
+PLIST_FILES=	${PKCS11_BINS:S,^,bin/,} \
+		${PKCS11_LIB:S,^,lib/,}
+
 PORTDOCS=	README
 
-OPTIONS_DEFINE=	DOCS
+do-build:
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.Linuxulator ${PKCS11_BINS})
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.FreeBSD ${PKCS11_LIB})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pkcs11-gateway ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/libpkcs11-gateway.so.1 ${STAGEDIR}${PREFIX}/lib
-	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libpkcs11-gateway.so.1 \
-		libpkcs11-gateway.so
+.for b in ${PKCS11_BINS}
+	${INSTALL_PROGRAM} ${WRKSRC}/${b} ${STAGEDIR}${PREFIX}/bin/
+.endfor
+	${INSTALL_LIB} ${WRKSRC}/libpkcs11-gateway.so ${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/security/pkcs11-gateway/distinfo
==============================================================================
--- head/security/pkcs11-gateway/distinfo	Sat Jun 27 19:42:17 2020	(r540633)
+++ head/security/pkcs11-gateway/distinfo	Sat Jun 27 20:12:08 2020	(r540634)
@@ -1,2 +1,3 @@
-SHA256 (pkcs11-gateway-1.2.tar.gz) = e8da2f77b23c7180f2d48b601ea5059013b6e2039cddc7e5c2140fa0917054ea
-SIZE (pkcs11-gateway-1.2.tar.gz) = 70175
+TIMESTAMP = 1593078368
+SHA256 (pkcs11-gateway-1.4.tar.gz) = 9b93b795ebd7d5809c045a1e2dccb02f20cd0fee629b8954b7083117aaf7bd1b
+SIZE (pkcs11-gateway-1.4.tar.gz) = 49258

Modified: head/security/pkcs11-gateway/pkg-descr
==============================================================================
--- head/security/pkcs11-gateway/pkg-descr	Sat Jun 27 19:42:17 2020	(r540633)
+++ head/security/pkcs11-gateway/pkg-descr	Sat Jun 27 20:12:08 2020	(r540634)
@@ -1,5 +1,5 @@
-pkcs11-gateway is a software that allows you to use a Linux 32-bit PKCS#11
-module on FreeBSD i386/amd64.
+pkcs11-gateway is a software that allows you to use a Linux PKCS#11 module
+on FreeBSD i386/amd64.
 It consists of a FreeBSD Cryptoki wrapper library that serializes and forwards
 PKCS#11 function calls to a Linux server program that dlopen() and use the
 real module. The communication between the two components is via a UNIX socket.