Index: Makefile =================================================================== --- Makefile (revision 452917) +++ Makefile (working copy) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= opensc -PORTVERSION= 0.16.0 +PORTVERSION= 0.17.0 CATEGORIES= security devel -MASTER_SITES= SF/${PORTNAME}/OpenSC/${DISTNAME} MAINTAINER= ale@FreeBSD.org COMMENT= Libraries and utilities to access smart cards @@ -21,11 +20,15 @@ CTAPI_DESC= Use CT-API backend SM_DESC= Enable secure messaging support -USES= libtool pkgconfig gmake ssl +USES= autoreconf libtool pkgconfig gmake ssl GNU_CONFIGURE= yes +USE_GITHUB= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip +GH_ACCOUNT= OpenSC +GH_PROJECT= OpenSC + CONFIGURE_ENV= \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" Index: distinfo =================================================================== --- distinfo (revision 452917) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466410034 -SHA256 (opensc-0.16.0.tar.gz) = 3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729 -SIZE (opensc-0.16.0.tar.gz) = 1760418 +TIMESTAMP = 1509024875 +SHA256 (OpenSC-OpenSC-0.17.0_GH0.tar.gz) = 007c4622afc225b8d7a1bea54f5325affa4417f4e17aaa03256aa9f4c25782fd +SIZE (OpenSC-OpenSC-0.17.0_GH0.tar.gz) = 1407652 Index: files/patch-etc_Makefile.am =================================================================== --- files/patch-etc_Makefile.am (nonexistent) +++ files/patch-etc_Makefile.am (working copy) @@ -0,0 +1,15 @@ +--- etc/Makefile.am.orig 2017-07-18 14:29:50 UTC ++++ etc/Makefile.am +@@ -32,11 +32,7 @@ opensc.conf: opensc.conf.in force + + install-exec-hook: opensc.conf + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +- if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ +- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ +- else \ +- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ +- fi ++ $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf-sample" + + uninstall-hook: opensc.conf + rm -f "$(DESTDIR)$(sysconfdir)/opensc.conf.new" "$(DESTDIR)$(sysconfdir)/opensc.conf" Property changes on: files/patch-etc_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-etc_Makefile.in =================================================================== --- files/patch-etc_Makefile.in (revision 452917) +++ files/patch-etc_Makefile.in (nonexistent) @@ -1,15 +0,0 @@ ---- etc/Makefile.in.orig 2012-12-04 15:43:57.000000000 +0100 -+++ etc/Makefile.in 2012-12-05 10:07:46.000000000 +0100 -@@ -429,11 +429,7 @@ - - install-exec-hook: opensc.conf - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" -- if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ -- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ -- else \ -- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ -- fi -+ $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf-sample" - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: files/patch-etc_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_libopensc_reader-tr03119.c =================================================================== --- files/patch-src_libopensc_reader-tr03119.c (nonexistent) +++ files/patch-src_libopensc_reader-tr03119.c (working copy) @@ -0,0 +1,11 @@ +--- src/libopensc/reader-tr03119.c.orig 2017-07-18 14:29:50 UTC ++++ src/libopensc/reader-tr03119.c +@@ -40,7 +40,7 @@ + #ifndef _BSD_SOURCE + #define _BSD_SOURCE /* See feature_test_macros(7) */ + #endif +-#include ++#include + #endif + + static const u8 escape_cla = 0xff; Property changes on: files/patch-src_libopensc_reader-tr03119.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_pkcs11_openssl.c =================================================================== --- files/patch-src_pkcs11_openssl.c (revision 452917) +++ files/patch-src_pkcs11_openssl.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/pkcs11/openssl.c.orig 2017-04-20 09:37:43.416459000 +0200 -+++ src/pkcs11/openssl.c 2017-04-20 09:38:01.864084000 +0200 -@@ -180,7 +180,7 @@ - e = ENGINE_by_id("gost"); - if (!e) - { --#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST) -+#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST) && !defined(LIBRESSL_VERSION_NUMBER) - ENGINE_load_gost(); - e = ENGINE_by_id("gost"); - #else Property changes on: files/patch-src_pkcs11_openssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 452917) +++ pkg-plist (working copy) @@ -5,6 +5,7 @@ bin/gids-tool bin/iasecc-tool bin/netkey-tool +bin/npa-tool bin/openpgp-tool bin/opensc-explorer bin/opensc-tool @@ -35,12 +36,11 @@ etc/opensc.conf-sample lib/libopensc.a lib/libopensc.so -lib/libopensc.so.4 -lib/libopensc.so.4.0.0 -%%SM%%lib/libsmm-local.a +lib/libopensc.so.5 +lib/libopensc.so.5.0.0 %%SM%%lib/libsmm-local.so -%%SM%%lib/libsmm-local.so.4 -%%SM%%lib/libsmm-local.so.4.0.0 +%%SM%%lib/libsmm-local.so.5 +%%SM%%lib/libsmm-local.so.5.0.0 lib/onepin-opensc-pkcs11.so lib/opensc-pkcs11.so lib/pkcs11-spy.so @@ -47,6 +47,7 @@ lib/pkcs11/onepin-opensc-pkcs11.so lib/pkcs11/opensc-pkcs11.so lib/pkcs11/pkcs11-spy.so +libdata/pkgconfig/opensc-pkcs11.pc %%DATADIR%%/asepcos.profile %%DATADIR%%/authentic.profile %%DATADIR%%/cardos.profile @@ -85,6 +86,7 @@ %%MANPAGES%%man/man1/gids-tool.1.gz %%MANPAGES%%man/man1/iasecc-tool.1.gz %%MANPAGES%%man/man1/netkey-tool.1.gz +%%MANPAGES%%man/man1/npa-tool.1.gz %%MANPAGES%%man/man1/openpgp-tool.1.gz %%MANPAGES%%man/man1/opensc-explorer.1.gz %%MANPAGES%%man/man1/opensc-tool.1.gz