From owner-svn-ports-head@freebsd.org Wed Apr 20 09:08:04 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD802B15542; Wed, 20 Apr 2016 09:08:04 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4C501A34; Wed, 20 Apr 2016 09:08:04 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3K983Mo067338; Wed, 20 Apr 2016 09:08:03 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K983uE067331; Wed, 20 Apr 2016 09:08:03 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201604200908.u3K983uE067331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Wed, 20 Apr 2016 09:08:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413677 - in head: . security security/engine_pkcs11 security/libp11 security/libp11/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2016 09:08:04 -0000 Author: ale Date: Wed Apr 20 09:08:03 2016 New Revision: 413677 URL: https://svnweb.freebsd.org/changeset/ports/413677 Log: Update libp11 to 0.4.0 release. engine_pkcs11 has been merged into libp11. Added: head/security/libp11/files/ head/security/libp11/files/patch-configure.ac (contents, props changed) head/security/libp11/files/patch-src_Makefile.am (contents, props changed) Deleted: head/security/engine_pkcs11/ Modified: head/MOVED head/security/Makefile head/security/libp11/Makefile head/security/libp11/distinfo head/security/libp11/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Wed Apr 20 08:40:26 2016 (r413676) +++ head/MOVED Wed Apr 20 09:08:03 2016 (r413677) @@ -8281,3 +8281,4 @@ devel/libmcs||2016-04-13|Development no www/node-devel|www/node|2016-04-13|Upstream no longer releases a development version graphics/kipi-plugin-googledrive||2016-04-14|Merged into graphics/kipi-plugin-googleservices graphics/kipi-plugin-picasawebexport||2016-04-14|Merged into graphics/kipi-plugin-googleservices +security/engine_pkcs11|security/libp11|2016-04-20|Merged Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Wed Apr 20 08:40:26 2016 (r413676) +++ head/security/Makefile Wed Apr 20 09:08:03 2016 (r413677) @@ -119,7 +119,6 @@ SUBDIR += elixir-comeonin SUBDIR += elixir-comeonin_i18n SUBDIR += elixir-jose - SUBDIR += engine_pkcs11 SUBDIR += erlang-jose SUBDIR += erlang-p1tls SUBDIR += esteidfirefoxplugin Modified: head/security/libp11/Makefile ============================================================================== --- head/security/libp11/Makefile Wed Apr 20 08:40:26 2016 (r413676) +++ head/security/libp11/Makefile Wed Apr 20 09:08:03 2016 (r413677) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= libp11 -PORTVERSION= 0.2.8 -PORTREVISION= 2 +PORTVERSION= 0.4.0 CATEGORIES= security devel -MASTER_SITES= SF/opensc/${PORTNAME} MAINTAINER= ale@FreeBSD.org COMMENT= Small layer on top of PKCS\#11 API @@ -16,28 +14,32 @@ LIB_DEPENDS= libltdl.so:devel/libltdl OPTIONS_DEFINE= DOCS EXAMPLES +USE_GITHUB= yes +GH_ACCOUNT= OpenSC +GH_TAGNAME= ${PORTNAME}-${PORTVERSION} + USE_OPENSSL= yes GNU_CONFIGURE= yes -USES= libtool pkgconfig +USES= autoreconf libtool pkgconfig USE_LDCONFIG= yes +MAKE_JOBS_UNSAFE= yes + CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBASE}/include" \ LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" + OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" -PORTDOCS= * +CONFIGURE_ARGS= --with-enginesdir=${PREFIX}/lib/engines -DOCS_CONFIGURE_ON= --enable-doc +INSTALL_TARGET= install-strip -post-patch: - @${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} 's|install-data-am: install-apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \ - ${WRKSRC}/doc/Makefile.in +PORTDOCS= * post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/Makefile ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/security/libp11/distinfo ============================================================================== --- head/security/libp11/distinfo Wed Apr 20 08:40:26 2016 (r413676) +++ head/security/libp11/distinfo Wed Apr 20 09:08:03 2016 (r413677) @@ -1,2 +1,2 @@ -SHA256 (libp11-0.2.8.tar.gz) = a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691 -SIZE (libp11-0.2.8.tar.gz) = 377508 +SHA256 (OpenSC-libp11-0.4.0-libp11-0.4.0_GH0.tar.gz) = a825db152add1a80f1d538ae91fee55178e2f597520d958ca128aa5bca5f1300 +SIZE (OpenSC-libp11-0.4.0-libp11-0.4.0_GH0.tar.gz) = 101829 Added: head/security/libp11/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libp11/files/patch-configure.ac Wed Apr 20 09:08:03 2016 (r413677) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2016-03-28 16:04:04 UTC ++++ configure.ac +@@ -191,7 +191,7 @@ if test -n "${pkcs11_module}"; then + [Default PKCS#11 module.]) + fi + +-pkgconfigdir="\$(libdir)/pkgconfig" ++pkgconfigdir="\$(prefix)/libdata/pkgconfig" + + AC_SUBST([pkgconfigdir]) + AC_SUBST([apidocdir]) Added: head/security/libp11/files/patch-src_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libp11/files/patch-src_Makefile.am Wed Apr 20 09:08:03 2016 (r413677) @@ -0,0 +1,10 @@ +--- src/Makefile.am.orig 2016-03-28 16:04:04 UTC ++++ src/Makefile.am +@@ -40,6 +40,7 @@ pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -modul + all-local: + cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT) + install-exec-hook: ++ $(MKDIR_P) '$(DESTDIR)$(enginesdir)' + cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT) + + if WIN32 Modified: head/security/libp11/pkg-plist ============================================================================== --- head/security/libp11/pkg-plist Wed Apr 20 08:40:26 2016 (r413676) +++ head/security/libp11/pkg-plist Wed Apr 20 09:08:03 2016 (r413677) @@ -1,11 +1,16 @@ include/libp11.h +lib/engines/libpkcs11.so +lib/engines/pkcs11.so +lib/engines/pkcs11.so.0 +lib/engines/pkcs11.so.0.0.0 lib/libp11.a lib/libp11.so lib/libp11.so.2 -lib/libp11.so.2.2.0 +lib/libp11.so.2.4.0 libdata/pkgconfig/libp11.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/decrypt.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/getrandom.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listkeys.c