Restore opensc-pkcs11.so functionnality on NetBSD-6.0. libpthread shall not be loaded by dlopen(), therefore we remove the useless dependency on -lpthreaddiff -r1.10 -r1.11 pkgsrc/security/opensc/Makefile
(manu)
@@ -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 | |||
3 | COMMENT= Smart Card drivers and middleware | 3 | COMMENT= Smart Card drivers and middleware | |
4 | LICENSE= gnu-lgpl-v2.1 | 4 | LICENSE= gnu-lgpl-v2.1 | |
5 | 5 | |||
6 | .include "../../security/opensc/Makefile.common" | 6 | .include "../../security/opensc/Makefile.common" | |
7 | 7 | |||
8 | PKGREVISION= 3 | 8 | PKGREVISION= 4 | |
9 | 9 | |||
10 | CONFIGURE_ARGS+= --disable-nsplugin | 10 | CONFIGURE_ARGS+= --disable-nsplugin | |
11 | 11 | |||
12 | EGDIR= ${PREFIX}/share/examples/opensc | 12 | EGDIR= ${PREFIX}/share/examples/opensc | |
13 | CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf | 13 | CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf | |
14 | 14 | |||
15 | INSTALLATION_DIRS= ${EGDIR} | 15 | INSTALLATION_DIRS= ${EGDIR} | |
16 | post-install: | 16 | post-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" |
@@ -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 | |||
6 | OPENSC_PKG_VERSION= 0.11.13 | 6 | OPENSC_PKG_VERSION= 0.11.13 | |
7 | DISTNAME= opensc-${OPENSC_PKG_VERSION} | 7 | DISTNAME= opensc-${OPENSC_PKG_VERSION} | |
8 | CATEGORIES= security | 8 | CATEGORIES= security | |
9 | MASTER_SITES= http://www.opensc-project.org/files/opensc/ | 9 | MASTER_SITES= http://www.opensc-project.org/files/opensc/ | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://www.opensc-project.org/opensc/ | 12 | HOMEPAGE= http://www.opensc-project.org/opensc/ | |
13 | 13 | |||
14 | BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 | 14 | BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 | |
15 | 15 | |||
16 | GNU_CONFIGURE= YES | 16 | GNU_CONFIGURE= YES | |
17 | USE_LIBTOOL= YES | 17 | USE_LIBTOOL= YES | |
18 | USE_OLD_DES_API= YES | 18 | USE_OLD_DES_API= YES | |
19 | USE_TOOLS+= gmake pkg-config | 19 | USE_TOOLS+= gmake pkg-config | |
20 | 20 | |||
21 | .include "options.mk" | 21 | .include "options.mk" | |
22 | 22 | |||
23 | CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} | 23 | CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} | |
24 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | 24 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |
25 | CONFIGURE_ARGS+= --disable-sensitive-logging | 25 | CONFIGURE_ARGS+= --disable-sensitive-logging | |
26 | CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC | |||
27 |
@@ -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 | |||
3 | SHA1 (opensc-0.11.13.tar.gz) = 408b374286004c3df15ec17856f69fd4c2a1aceb | 3 | SHA1 (opensc-0.11.13.tar.gz) = 408b374286004c3df15ec17856f69fd4c2a1aceb | |
4 | RMD160 (opensc-0.11.13.tar.gz) = cd900866e51cd64fa7c5a3287cd58193dec26528 | 4 | RMD160 (opensc-0.11.13.tar.gz) = cd900866e51cd64fa7c5a3287cd58193dec26528 | |
5 | Size (opensc-0.11.13.tar.gz) = 1513327 bytes | 5 | Size (opensc-0.11.13.tar.gz) = 1513327 bytes | |
6 | SHA1 (patch-aa) = ad1c02161590c43170137d1deeaf5e88e7fef1ce | 6 | SHA1 (patch-aa) = ad1c02161590c43170137d1deeaf5e88e7fef1ce | |
7 | SHA1 (patch-ab) = 6d3d055abd1b94c7024838b9b25cc6005af0d36a | 7 | SHA1 (patch-ab) = 6d3d055abd1b94c7024838b9b25cc6005af0d36a | |
8 | SHA1 (patch-ac) = 6c77415312d1ab149a9cbae9c49f4cf31c950502 | 8 | SHA1 (patch-ac) = 6c77415312d1ab149a9cbae9c49f4cf31c950502 | |
9 | SHA1 (patch-ad) = a618df0e8bc59af9ccea3f3b423b363e09ab0a4c | 9 | SHA1 (patch-ad) = a618df0e8bc59af9ccea3f3b423b363e09ab0a4c | |
10 | SHA1 (patch-ae) = 94ca059a2e9bf5689f4193587247e443213df9a4 | 10 | SHA1 (patch-ae) = 94ca059a2e9bf5689f4193587247e443213df9a4 | |
11 | SHA1 (patch-af) = 3b8db1b680c833940973f11b8abb47e34fa5ecd0 | 11 | SHA1 (patch-af) = 3b8db1b680c833940973f11b8abb47e34fa5ecd0 | |
12 | SHA1 (patch-ag) = 1d2de187008d4ce9aac1f97f829aafd035324082 | 12 | SHA1 (patch-ag) = 1d2de187008d4ce9aac1f97f829aafd035324082 | |
13 | SHA1 (patch-ah) = e9a8e3aa06af5a7ce47015f8eba41fd2bb12b32d | 13 | SHA1 (patch-ah) = e9a8e3aa06af5a7ce47015f8eba41fd2bb12b32d | |
14 | SHA1 (patch-configure) = 65af2389d4a3b875ea206542ac94446e0bfc4796 | |||
14 | SHA1 (patch-src_libopensc_card-setcos.c) = 209bf0a92f9872635ea06d5ea9a7742c7874d61d | 15 | SHA1 (patch-src_libopensc_card-setcos.c) = 209bf0a92f9872635ea06d5ea9a7742c7874d61d | |
15 | SHA1 (patch-src_libopensc_cards.h) = ebc1db10feda1b2f6a666842120772908c778db7 | 16 | SHA1 (patch-src_libopensc_cards.h) = ebc1db10feda1b2f6a666842120772908c778db7 | |
17 | SHA1 (patch-src_pkcs11_pkcs11-global.c) = 06c93969a04c930a87a607f6d48a13197c1307bf |
$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.
--- 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;