Update to 0.17.0 release.

PR:		223265
Submitted by:	ehaupt

6 files changed, 28 insertions, 26 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index a6b9c622eb64..92bc143d990e 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	opensc
-PORTVERSION=	0.16.0
+PORTVERSION=	0.17.0
 CATEGORIES=	security devel
-MASTER_SITES=	SF/${PORTNAME}/OpenSC/${DISTNAME}
+MASTER_SITES=	https://github.com/OpenSC/OpenSC/releases/download/0.17.0/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Libraries and utilities to access smart cards
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 8ec08b2a3913..6586a9a5a2d2 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466410034
-SHA256 (opensc-0.16.0.tar.gz) = 3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729
-SIZE (opensc-0.16.0.tar.gz) = 1760418
+TIMESTAMP = 1509027157
+SHA256 (opensc-0.17.0.tar.gz) = be73c6816867ab4721e6a9ae7dba8e890c5f169f0a2cbb4bf354e0f30a948300
+SIZE (opensc-0.17.0.tar.gz) = 1950547
diff --git a/security/opensc/files/patch-etc_Makefile.in b/security/opensc/files/patch-etc_Makefile.in
index a619e2322692..e7c475009d64 100644
--- a/security/opensc/files/patch-etc_Makefile.in
+++ b/security/opensc/files/patch-etc_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- etc/Makefile.in.orig	2017-07-19 07:30:34 UTC
++++ etc/Makefile.in
+@@ -548,11 +548,7 @@ opensc.conf: opensc.conf.in force
  
  install-exec-hook: opensc.conf
  	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
@@ -11,5 +11,5 @@
 -	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.
+ uninstall-hook: opensc.conf
+ 	rm -f "$(DESTDIR)$(sysconfdir)/opensc.conf.new" "$(DESTDIR)$(sysconfdir)/opensc.conf"
diff --git a/security/opensc/files/patch-src_libopensc_reader-tr03119.c b/security/opensc/files/patch-src_libopensc_reader-tr03119.c
new file mode 100644
index 000000000000..4491a3e4718b
--- /dev/null
+++ b/security/opensc/files/patch-src_libopensc_reader-tr03119.c
@@ -0,0 +1,11 @@
+--- src/libopensc/reader-tr03119.c.orig	2017-10-26 14:16:19 UTC
++++ src/libopensc/reader-tr03119.c
+@@ -40,7 +40,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE             /* See feature_test_macros(7) */
+ #endif
+-#include <endian.h>
++#include <sys/endian.h>
+ #endif
+ 
+ static const u8 escape_cla                          = 0xff;
diff --git a/security/opensc/files/patch-src_pkcs11_openssl.c b/security/opensc/files/patch-src_pkcs11_openssl.c
deleted file mode 100644
index 6af255f8d054..000000000000
--- a/security/opensc/files/patch-src_pkcs11_openssl.c
+++ /dev/null
@@ -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
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 527dd0c7b902..fd273caf0f9d 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -5,6 +5,7 @@ bin/eidenv
 bin/gids-tool
 bin/iasecc-tool
 bin/netkey-tool
+bin/npa-tool
 bin/openpgp-tool
 bin/opensc-explorer
 bin/opensc-tool
@@ -35,18 +36,18 @@ etc/bash_completion.d/westcos-tool
 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
 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 @@ lib/pkcs11/pkcs11-spy.so
 %%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