Wed Oct 24 08:33:51 2012 UTC ()
Restore opensc-pkcs11.so functionnality on NetBSD-6.0. libpthread shall
not be loaded by dlopen(), therefore we remove the useless dependency on
-lpthread


(manu)
diff -r1.10 -r1.11 pkgsrc/security/opensc/Makefile
diff -r1.7 -r1.8 pkgsrc/security/opensc/Makefile.common
diff -r1.8 -r1.9 pkgsrc/security/opensc/distinfo
diff -r0 -r1.1 pkgsrc/security/opensc/patches/patch-configure
diff -r0 -r1.1 pkgsrc/security/opensc/patches/patch-src_pkcs11_pkcs11-global.c

cvs diff -r1.10 -r1.11 pkgsrc/security/opensc/Makefile (expand / switch to unified diff)

--- pkgsrc/security/opensc/Makefile 2012/10/23 18:16:38 1.10
+++ pkgsrc/security/opensc/Makefile 2012/10/24 08:33:51 1.11
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.10 2012/10/23 18:16:38 asau Exp $ 1# $NetBSD: Makefile,v 1.11 2012/10/24 08:33:51 manu Exp $
2 2
3COMMENT= Smart Card drivers and middleware 3COMMENT= Smart Card drivers and middleware
4LICENSE= gnu-lgpl-v2.1 4LICENSE= gnu-lgpl-v2.1
5 5
6.include "../../security/opensc/Makefile.common" 6.include "../../security/opensc/Makefile.common"
7 7
8PKGREVISION= 3 8PKGREVISION= 4
9 9
10CONFIGURE_ARGS+= --disable-nsplugin 10CONFIGURE_ARGS+= --disable-nsplugin
11 11
12EGDIR= ${PREFIX}/share/examples/opensc 12EGDIR= ${PREFIX}/share/examples/opensc
13CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf 13CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf
14 14
15INSTALLATION_DIRS= ${EGDIR} 15INSTALLATION_DIRS= ${EGDIR}
16post-install: 16post-install:
17 ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf ${DESTDIR}${EGDIR} 17 ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf ${DESTDIR}${EGDIR}
18 18
19.include "../../devel/libltdl/buildlink3.mk" 19.include "../../devel/libltdl/buildlink3.mk"
20.include "../../devel/readline/buildlink3.mk" 20.include "../../devel/readline/buildlink3.mk"
21.include "../../devel/zlib/buildlink3.mk" 21.include "../../devel/zlib/buildlink3.mk"

cvs diff -r1.7 -r1.8 pkgsrc/security/opensc/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/opensc/Attic/Makefile.common 2012/10/23 18:16:38 1.7
+++ pkgsrc/security/opensc/Attic/Makefile.common 2012/10/24 08:33:51 1.8
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile.common,v 1.7 2012/10/23 18:16:38 asau Exp $ 1# $NetBSD: Makefile.common,v 1.8 2012/10/24 08:33:51 manu Exp $
2# 2#
3# used by security/opensc/Makefile 3# used by security/opensc/Makefile
4# used by security/opensc-signer/Makefile 4# used by security/opensc-signer/Makefile
5 5
6OPENSC_PKG_VERSION= 0.11.13 6OPENSC_PKG_VERSION= 0.11.13
7DISTNAME= opensc-${OPENSC_PKG_VERSION} 7DISTNAME= opensc-${OPENSC_PKG_VERSION}
8CATEGORIES= security 8CATEGORIES= security
9MASTER_SITES= http://www.opensc-project.org/files/opensc/ 9MASTER_SITES= http://www.opensc-project.org/files/opensc/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.opensc-project.org/opensc/ 12HOMEPAGE= http://www.opensc-project.org/opensc/
13 13
14BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 14BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18USE_OLD_DES_API= YES 18USE_OLD_DES_API= YES
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20 20
21.include "options.mk" 21.include "options.mk"
22 22
23CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 23CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
25CONFIGURE_ARGS+= --disable-sensitive-logging 25CONFIGURE_ARGS+= --disable-sensitive-logging
 26CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC
 27

cvs diff -r1.8 -r1.9 pkgsrc/security/opensc/distinfo (expand / switch to unified diff)

--- pkgsrc/security/opensc/distinfo 2011/05/27 10:05:52 1.8
+++ pkgsrc/security/opensc/distinfo 2012/10/24 08:33:51 1.9
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: distinfo,v 1.8 2011/05/27 10:05:52 kivinen Exp $ 1$NetBSD: distinfo,v 1.9 2012/10/24 08:33:51 manu Exp $
2 2
3SHA1 (opensc-0.11.13.tar.gz) = 408b374286004c3df15ec17856f69fd4c2a1aceb 3SHA1 (opensc-0.11.13.tar.gz) = 408b374286004c3df15ec17856f69fd4c2a1aceb
4RMD160 (opensc-0.11.13.tar.gz) = cd900866e51cd64fa7c5a3287cd58193dec26528 4RMD160 (opensc-0.11.13.tar.gz) = cd900866e51cd64fa7c5a3287cd58193dec26528
5Size (opensc-0.11.13.tar.gz) = 1513327 bytes 5Size (opensc-0.11.13.tar.gz) = 1513327 bytes
6SHA1 (patch-aa) = ad1c02161590c43170137d1deeaf5e88e7fef1ce 6SHA1 (patch-aa) = ad1c02161590c43170137d1deeaf5e88e7fef1ce
7SHA1 (patch-ab) = 6d3d055abd1b94c7024838b9b25cc6005af0d36a 7SHA1 (patch-ab) = 6d3d055abd1b94c7024838b9b25cc6005af0d36a
8SHA1 (patch-ac) = 6c77415312d1ab149a9cbae9c49f4cf31c950502 8SHA1 (patch-ac) = 6c77415312d1ab149a9cbae9c49f4cf31c950502
9SHA1 (patch-ad) = a618df0e8bc59af9ccea3f3b423b363e09ab0a4c 9SHA1 (patch-ad) = a618df0e8bc59af9ccea3f3b423b363e09ab0a4c
10SHA1 (patch-ae) = 94ca059a2e9bf5689f4193587247e443213df9a4 10SHA1 (patch-ae) = 94ca059a2e9bf5689f4193587247e443213df9a4
11SHA1 (patch-af) = 3b8db1b680c833940973f11b8abb47e34fa5ecd0 11SHA1 (patch-af) = 3b8db1b680c833940973f11b8abb47e34fa5ecd0
12SHA1 (patch-ag) = 1d2de187008d4ce9aac1f97f829aafd035324082 12SHA1 (patch-ag) = 1d2de187008d4ce9aac1f97f829aafd035324082
13SHA1 (patch-ah) = e9a8e3aa06af5a7ce47015f8eba41fd2bb12b32d 13SHA1 (patch-ah) = e9a8e3aa06af5a7ce47015f8eba41fd2bb12b32d
 14SHA1 (patch-configure) = 65af2389d4a3b875ea206542ac94446e0bfc4796
14SHA1 (patch-src_libopensc_card-setcos.c) = 209bf0a92f9872635ea06d5ea9a7742c7874d61d 15SHA1 (patch-src_libopensc_card-setcos.c) = 209bf0a92f9872635ea06d5ea9a7742c7874d61d
15SHA1 (patch-src_libopensc_cards.h) = ebc1db10feda1b2f6a666842120772908c778db7 16SHA1 (patch-src_libopensc_cards.h) = ebc1db10feda1b2f6a666842120772908c778db7
 17SHA1 (patch-src_pkcs11_pkcs11-global.c) = 06c93969a04c930a87a607f6d48a13197c1307bf

File Added: pkgsrc/security/opensc/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2012/10/24 08:33:51 manu Exp $

Make sure we do not link against -lpthread, as we only need mutexes
that can be found in libc.

Linking with -lpthread hurst with opensc-pkcs11.so since NetBSD-6.0
libpthread cannot be loaded by dlopen()

--- configure.orig	2012-10-19 11:29:36.000000000 +0200
+++ configure	2012-10-19 14:57:03.000000000 +0200
@@ -12821,8 +12821,17 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 acx_pthread_ok=no
 
+case "${host_cpu}-${host_os}" in
+        *netbsd*)
+		acx_pthread_ok=yes
+		PTHREAD_CFLAGS=""
+		PTHREAD_LIBS=""
+		LIBS="$LIBS -lltdl"
+	;;
+esac
+
 # We used to check for pthread.h first, but this fails if pthread.h
 # requires special compiler flags (e.g. on True64 or Sequent).
 # It gets checked for in the link test anyway.
 

File Added: pkgsrc/security/opensc/patches/Attic/patch-src_pkcs11_pkcs11-global.c
--- src/pkcs11/pkcs11-global.c.orig	2012-10-22 09:11:56.000000000 +0200
+++ src/pkcs11/pkcs11-global.c	2012-10-22 09:12:14.000000000 +0200
@@ -43,9 +43,9 @@
 #if defined(HAVE_PTHREAD) && defined(PKCS11_THREAD_LOCKING)
 #include <pthread.h>
 CK_RV mutex_create(void **mutex)
 {
-	pthread_mutex_t *m = (pthread_mutex_t *) malloc(sizeof(*mutex));
+	pthread_mutex_t *m = (pthread_mutex_t *) malloc(sizeof(*m));
 	if (m == NULL)
 		return CKR_GENERAL_ERROR;;
 	pthread_mutex_init(m, NULL);
 	*mutex = m;