diff options
Diffstat (limited to 'security/opensc')
| -rw-r--r-- | security/opensc/Makefile | 5 | ||||
| -rw-r--r-- | security/opensc/PLIST | 5 | ||||
| -rw-r--r-- | security/opensc/distinfo | 17 | ||||
| -rw-r--r-- | security/opensc/patches/patch-aa | 10 | ||||
| -rw-r--r-- | security/opensc/patches/patch-configure.ac | 10 | ||||
| -rw-r--r-- | security/opensc/patches/patch-src_libopensc_log.c | 8 | ||||
| -rw-r--r-- | security/opensc/patches/patch-src_pkcs11_pkcs11-global.c | 17 |
7 files changed, 28 insertions, 44 deletions
diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 4798ee5f536..a8d6350121c 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2016/03/05 11:29:22 jperkin Exp $ +# $NetBSD: Makefile,v 1.25 2016/08/04 13:08:25 mef Exp $ -OPENSC_PKG_VERSION= 0.15.0 +OPENSC_PKG_VERSION= 0.16.0 DISTNAME= opensc-${OPENSC_PKG_VERSION} -PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opensc/OpenSC/opensc-0.13.0/} diff --git a/security/opensc/PLIST b/security/opensc/PLIST index b0732d9b1a4..fdccb8f3fb6 100644 --- a/security/opensc/PLIST +++ b/security/opensc/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.8 2015/09/07 19:59:42 gdt Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/08/04 13:08:25 mef Exp $ bin/cardos-tool bin/cryptoflex-tool bin/dnie-tool bin/eidenv +bin/gids-tool bin/iasecc-tool bin/netkey-tool bin/openpgp-tool @@ -27,6 +28,7 @@ man/man1/cardos-tool.1 man/man1/cryptoflex-tool.1 man/man1/dnie-tool.1 man/man1/eidenv.1 +man/man1/gids-tool.1 man/man1/iasecc-tool.1 man/man1/netkey-tool.1 man/man1/openpgp-tool.1 @@ -49,6 +51,7 @@ share/opensc/cyberflex.profile share/opensc/entersafe.profile share/opensc/epass2003.profile share/opensc/flex.profile +share/opensc/gids.profile share/opensc/gpk.profile share/opensc/ias_adele_admin1.profile share/opensc/ias_adele_admin2.profile diff --git a/security/opensc/distinfo b/security/opensc/distinfo index bcc87fcf614..de189432acc 100644 --- a/security/opensc/distinfo +++ b/security/opensc/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.13 2015/11/04 01:17:52 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/08/04 13:08:25 mef Exp $ -SHA1 (opensc-0.15.0.tar.gz) = 5bacb5814337af32ee85d49f420acc69ac961106 -RMD160 (opensc-0.15.0.tar.gz) = 90ff185bc82ab0d2b6487ca0fc00310609a674a5 -SHA512 (opensc-0.15.0.tar.gz) = 8d5f84206faa7f673be4ea559025b1317c69636bee0265c466f4fdc5a0a78c7f091df946f90d7622cc5497d57a782bce47edbc67b2c7338053dcd848708399ac -Size (opensc-0.15.0.tar.gz) = 2153075 bytes -SHA1 (patch-aa) = 6863c837654b4fde76fbc7a95fe7fdae33590a50 +SHA1 (opensc-0.16.0.tar.gz) = 8a5616ac514c4fbad50b0505dc61f082de3e479c +RMD160 (opensc-0.16.0.tar.gz) = f785df816560493baceb71e2197346c724fc0834 +SHA512 (opensc-0.16.0.tar.gz) = 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139 +Size (opensc-0.16.0.tar.gz) = 1760418 bytes +SHA1 (patch-aa) = 8344b445def1b1b63519e97fd0185c5cf4b3b636 SHA1 (patch-ab) = c8a8a21ed7fe387aa93e6454e30d284d77ffd67c -SHA1 (patch-configure.ac) = 7cf3afaf292c89ec990935e5a5d64bd015a9b1ce +SHA1 (patch-configure.ac) = 9031a51162d883b3e3118820d400e07ef99dbad9 SHA1 (patch-doc_tools_Makefile.am) = bbfb4ae09bfeef5f4d2ca36da3efda6d1a699a0d SHA1 (patch-src_common_compat__getopt.h) = a9c4fad2d1fd73f5b2c245a364cfd37d838f51eb SHA1 (patch-src_common_compat__getopt__main.c) = 96d51499ea6d48bd53a17e3849c44ae4e0c9b669 -SHA1 (patch-src_libopensc_log.c) = eabe66dd52cedf81b3dffa01e5855a6b4a70416a -SHA1 (patch-src_pkcs11_pkcs11-global.c) = 3390c14a61f4b50d7903faa1c300b3677a4831ac +SHA1 (patch-src_libopensc_log.c) = 1f6107d56298bf3b88d22c627dee6a9840b7309a diff --git a/security/opensc/patches/patch-aa b/security/opensc/patches/patch-aa index fd19c444435..18fc1d7dae6 100644 --- a/security/opensc/patches/patch-aa +++ b/security/opensc/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2015/09/07 19:59:42 gdt Exp $ +$NetBSD: patch-aa,v 1.6 2016/08/04 13:08:25 mef Exp $ Disable installation of config file, because pkgsrc installs config files as examples. ---- etc/Makefile.am.orig 2015-05-16 20:30:24.000000000 +0000 -+++ etc/Makefile.am -@@ -23,13 +23,5 @@ opensc.conf: opensc.conf.in force - -e 's|@DEBUG_FILE[@]|$(DEBUG_FILE)|g' \ +--- etc/Makefile.am.orig 2016-05-31 16:36:09.000000000 +0900 ++++ etc/Makefile.am 2016-08-04 21:48:05.000000000 +0900 +@@ -28,13 +28,5 @@ opensc.conf: opensc.conf.in force + -e 's|@PROFILE_DIR_DEFAULT[@]|$(PROFILE_DIR_DEFAULT)|g' \ < $< > $@ -install-exec-hook: opensc.conf diff --git a/security/opensc/patches/patch-configure.ac b/security/opensc/patches/patch-configure.ac index aeeb2813e29..ff337caced8 100644 --- a/security/opensc/patches/patch-configure.ac +++ b/security/opensc/patches/patch-configure.ac @@ -1,10 +1,10 @@ -$NetBSD: patch-configure.ac,v 1.2 2015/09/07 19:59:42 gdt Exp $ +$NetBSD: patch-configure.ac,v 1.3 2016/08/04 13:08:25 mef Exp $ This hunk has been in pkgsrc for a long time; it needs a comment! ---- configure.ac.orig 2015-05-16 20:30:24.000000000 +0000 -+++ configure.ac -@@ -344,17 +344,6 @@ if test "${WIN32}" = "no"; then +--- configure.ac.orig 2016-06-04 08:22:08.000000000 +0900 ++++ configure.ac 2016-08-04 21:50:22.000000000 +0900 +@@ -384,17 +384,6 @@ if test "${WIN32}" = "no"; then AC_SEARCH_LIBS([dlopen], [dl dld], [], [ AC_MSG_ERROR([unable to find the dlopen() function]) ]) @@ -21,4 +21,4 @@ This hunk has been in pkgsrc for a long time; it needs a comment! - CC="${PTHREAD_CC}" fi - if test "${enable_minidriver}" = "yes"; then + if test "${enable_thread_locking}" = "yes"; then diff --git a/security/opensc/patches/patch-src_libopensc_log.c b/security/opensc/patches/patch-src_libopensc_log.c index eafd464cf5d..dc9b9be54ed 100644 --- a/security/opensc/patches/patch-src_libopensc_log.c +++ b/security/opensc/patches/patch-src_libopensc_log.c @@ -1,12 +1,12 @@ -$NetBSD: patch-src_libopensc_log.c,v 1.2 2015/09/07 19:59:42 gdt Exp $ +$NetBSD: patch-src_libopensc_log.c,v 1.3 2016/08/04 13:08:25 mef Exp $ ---- src/libopensc/log.c.orig 2015-05-16 20:30:24.000000000 +0000 -+++ src/libopensc/log.c +--- src/libopensc/log.c.orig 2016-05-31 16:36:09.000000000 +0900 ++++ src/libopensc/log.c 2016-08-04 21:52:53.000000000 +0900 @@ -91,7 +91,13 @@ static void sc_do_log_va(sc_context_t *c gettimeofday (&tv, NULL); tm = localtime (&tv.tv_sec); strftime (time_string, sizeof(time_string), "%H:%M:%S", tm); -- r = snprintf(p, left, "0x%lx %s.%03ld ", (unsigned long)pthread_self(), time_string, tv.tv_usec / 1000); +- r = snprintf(p, left, "0x%lx %s.%03ld ", (unsigned long)pthread_self(), time_string, (long)tv.tv_usec / 1000); + r = snprintf(p, left, "0x%lx %s.%03ld ", +#ifdef HAVE_PTHREAD + (unsigned long)pthread_self(), diff --git a/security/opensc/patches/patch-src_pkcs11_pkcs11-global.c b/security/opensc/patches/patch-src_pkcs11_pkcs11-global.c deleted file mode 100644 index 5150d8419ac..00000000000 --- a/security/opensc/patches/patch-src_pkcs11_pkcs11-global.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_pkcs11_pkcs11-global.c,v 1.4 2015/09/07 19:59:42 gdt Exp $ - -Use correct size for malloc. - -Not yet reported upstream. - ---- src/pkcs11/pkcs11-global.c.orig 2015-05-16 20:30:24.000000000 +0000 -+++ src/pkcs11/pkcs11-global.c -@@ -46,7 +46,7 @@ extern CK_FUNCTION_LIST pkcs11_function_ - #include <pthread.h> - CK_RV mutex_create(void **mutex) - { -- pthread_mutex_t *m = calloc(1, sizeof(*mutex)); -+ pthread_mutex_t *m = calloc(1, sizeof(*m)); - if (m == NULL) - return CKR_GENERAL_ERROR;; - pthread_mutex_init(m, NULL); |