Import of pkgsrc-2016Q3

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

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

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(),

security/opensc/patches/patch-src_pkcs11_pkcs11-global.c

@@ -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);