From ebcc6ca2983acaed0fda42145693709de83bfbe3 Mon Sep 17 00:00:00 2001 From: gdt Date: Fri, 30 Nov 2012 14:28:55 +0000 Subject: Don't pass pthread flags to depending packages. This is necessary to avoid making opensc threaded, since then it can't be dlopened by a non-threaded program. Add patch comments. Set LICENSE (modified-bsd, verified via wdiff). This change is almost entirely due to manu@. --- security/pcsc-lite/Makefile | 5 ++-- security/pcsc-lite/distinfo | 11 +++++--- security/pcsc-lite/patches/patch-aa | 6 +++- security/pcsc-lite/patches/patch-configure.in | 32 ++++++++++++++++++++++ security/pcsc-lite/patches/patch-src_Makefile.am | 21 ++++++++++++++ security/pcsc-lite/patches/patch-src_Makefile.in | 7 ++--- .../pcsc-lite/patches/patch-src_libpscslite.pc.in | 15 ++++++++++ security/pcsc-lite/patches/patch-src_thread_unix.c | 7 ++--- 8 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 security/pcsc-lite/patches/patch-configure.in create mode 100644 security/pcsc-lite/patches/patch-src_Makefile.am create mode 100644 security/pcsc-lite/patches/patch-src_libpscslite.pc.in (limited to 'security') diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile index ad85577eb78..07327cdb498 100644 --- a/security/pcsc-lite/Makefile +++ b/security/pcsc-lite/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2012/10/24 09:01:40 manu Exp $ +# $NetBSD: Makefile,v 1.12 2012/11/30 14:28:55 gdt Exp $ # DISTNAME= pcsc-lite-1.5.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= security MASTER_SITES= http://alioth.debian.org/frs/download.php/3082/ EXTRACT_SUFX= .tar.bz2 @@ -10,6 +10,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= shannonjr@NetBSD.org HOMEPAGE= http://pcsclite.alioth.debian.org/ COMMENT= Middleware to access a smart card using SCard API (PC/SC) +LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo index 52ce32c4f5b..2fb0a8188f5 100644 --- a/security/pcsc-lite/distinfo +++ b/security/pcsc-lite/distinfo @@ -1,11 +1,14 @@ -$NetBSD: distinfo,v 1.10 2012/10/24 09:01:40 manu Exp $ +$NetBSD: distinfo,v 1.11 2012/11/30 14:28:55 gdt Exp $ SHA1 (pcsc-lite-1.5.5.tar.bz2) = 6791a8bd07f69972f708d4bdd03d6b1056c7af3e RMD160 (pcsc-lite-1.5.5.tar.bz2) = 99f56839483d7364426e0d70ec6825f551b4c49e Size (pcsc-lite-1.5.5.tar.bz2) = 465947 bytes -SHA1 (patch-aa) = a30db3af5181f7d37d16c25d2679070e2fdf6652 +SHA1 (patch-aa) = 71f39c897a104a87e5d3cbc031e1fdb4af7de272 SHA1 (patch-ab) = 3fe33345975fcd61611dae8d7aaf9b6ee5329d9e SHA1 (patch-ac) = 1abf0c4bb7199998fb8d81ef8514f8f80f460ccc SHA1 (patch-configure) = 6b7f6b9333a93b731822456cec980c11bba27ba6 -SHA1 (patch-src_Makefile.in) = daa2dd2e1fc1a901df782654300a8277b5a4b4cd -SHA1 (patch-src_thread_unix.c) = 6d5576db605cfe6d430c96101774736b30d0c9e7 +SHA1 (patch-configure.in) = 35622b5461da2f31f1da0b151241a664848b15cd +SHA1 (patch-src_Makefile.am) = 1bc3f82848accf2fe372a18a82ff915b0f8daac2 +SHA1 (patch-src_Makefile.in) = 885dec5cbc389b237e32b5cc72332a6ae001398e +SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67 +SHA1 (patch-src_thread_unix.c) = f12b233d3604e11694a38826b987470f6fb407e4 diff --git a/security/pcsc-lite/patches/patch-aa b/security/pcsc-lite/patches/patch-aa index f1514d1db7a..d3d4b01372a 100644 --- a/security/pcsc-lite/patches/patch-aa +++ b/security/pcsc-lite/patches/patch-aa @@ -1,4 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2009/04/30 06:24:11 hasso Exp $ +$NetBSD: patch-aa,v 1.3 2012/11/30 14:28:55 gdt Exp $ + +Add NetBSD to apple/sun conditional. + +This should be sent upstream. --- src/PCSC/reader.h.in.orig 2009-03-24 21:41:03 +0200 +++ src/PCSC/reader.h.in 2009-04-30 09:03:08 +0300 diff --git a/security/pcsc-lite/patches/patch-configure.in b/security/pcsc-lite/patches/patch-configure.in new file mode 100644 index 00000000000..8c47ae49565 --- /dev/null +++ b/security/pcsc-lite/patches/patch-configure.in @@ -0,0 +1,32 @@ +$NetBSD: patch-configure.in,v 1.1 2012/11/30 14:28:55 gdt Exp $ + +Make sure libpscslite.so is not linked against -lpthread on NetBSD, as +loading libpthread.so through dlopen() is now forbidden. + +This should be addressed upstream, but may be controversial. + +--- ./configure.in.orig 2012-10-24 06:33:56.000000000 +0200 ++++ ./configure.in 2012-10-24 06:36:19.000000000 +0200 +@@ -75,8 +75,22 @@ + + AC_SUBST(PTHREAD_LIBS) + AC_SUBST(PTHREAD_CFLAGS) + ++case `uname` in ++NetBSD) ++ LIBPCSC_PTHREAD_LIBS='' ++ LIBPCSC_PTHREAD_CFLAGS='' ++ ;; ++*) ++ LIBPCSC_PTHREAD_LIBS=$PTHREAD_LIBS ++ LIBPCSC_PTHREAD_CFLAGS=$PTHREAD_CFLAGS ++ ;; ++esac ++ ++AC_SUBST(LIBPCSC_PTHREAD_LIBS) ++AC_SUBST(LIBPCSC_PTHREAD_CFLAGS) ++ + # Add libtool support + AM_PROG_LIBTOOL + # Automatically update the libtool script if it becomes out-of-date + #AC_SUBST(LIBTOOL_DEPS) diff --git a/security/pcsc-lite/patches/patch-src_Makefile.am b/security/pcsc-lite/patches/patch-src_Makefile.am new file mode 100644 index 00000000000..32a8989e82d --- /dev/null +++ b/security/pcsc-lite/patches/patch-src_Makefile.am @@ -0,0 +1,21 @@ +$NetBSD: patch-src_Makefile.am,v 1.1 2012/11/30 14:28:55 gdt Exp $ + +Make sure libpscslite.so is not linked against -lpthread on NetBSD, as +loading libpthread.so through dlopen() is now forbidden. + +--- ./src/Makefile.am.orig 2012-10-24 06:33:12.000000000 +0200 ++++ ./src/Makefile.am 2012-10-24 06:33:37.000000000 +0200 +@@ -30,11 +30,11 @@ + thread_unix.c \ + utils.c \ + winscard_msg.c + libpcsclite_la_LDFLAGS = -version-info 1:0:0 +-libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE ++libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE + libpcsclite_la_LIBADD = $(COREFOUNDATION) $(LIBSMARTCARD) $(LIBDL) \ +- $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) ++ $(LIBPCSC_PTHREAD_CFLAGS) $(LIBPCSC_PTHREAD_LIBS) + + pcscd_SOURCES = \ + atrhandler.c \ + atrhandler.h \ diff --git a/security/pcsc-lite/patches/patch-src_Makefile.in b/security/pcsc-lite/patches/patch-src_Makefile.in index 61cfbc83ff8..3a6c9ca62fe 100644 --- a/security/pcsc-lite/patches/patch-src_Makefile.in +++ b/security/pcsc-lite/patches/patch-src_Makefile.in @@ -1,8 +1,7 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2012/10/24 09:01:41 manu Exp $ - -Make sure libpscslite.so is not linked against -lphtread on NetBSD, as -loading libpthread.so through dlopen() is now forbidden +$NetBSD: patch-src_Makefile.in,v 1.2 2012/11/30 14:28:55 gdt Exp $ +Make sure libpscslite.so is not linked against -lpthread on NetBSD, as +loading libpthread.so through dlopen() is now forbidden. --- ./src/Makefile.in.orig 2012-10-24 06:31:51.000000000 +0200 +++ ./src/Makefile.in 2012-10-24 06:33:06.000000000 +0200 diff --git a/security/pcsc-lite/patches/patch-src_libpscslite.pc.in b/security/pcsc-lite/patches/patch-src_libpscslite.pc.in new file mode 100644 index 00000000000..4fe5b4a8569 --- /dev/null +++ b/security/pcsc-lite/patches/patch-src_libpscslite.pc.in @@ -0,0 +1,15 @@ +$NetBSD: patch-src_libpscslite.pc.in,v 1.1 2012/11/30 14:28:55 gdt Exp $ + +Make sure dependencies (opensc) do not get -pthread. + +--- src/libpcsclite.pc.in.orig 2012-11-30 10:43:54.000000000 +0100 ++++ src/libpcsclite.pc.in 2012-11-30 10:46:24.000000000 +0100 +@@ -7,6 +7,6 @@ + Name: PCSC Lite + Description: PC/SC smart card interface + Version: @VERSION@ + Libs: -L${libdir} -lpcsclite +-Libs.private: @PTHREAD_LIBS@ +-Cflags: -I${includedir} @PTHREAD_CFLAGS@ ++Libs.private: ++Cflags: -I${includedir} diff --git a/security/pcsc-lite/patches/patch-src_thread_unix.c b/security/pcsc-lite/patches/patch-src_thread_unix.c index 05a1d9084a3..fbab9987650 100644 --- a/security/pcsc-lite/patches/patch-src_thread_unix.c +++ b/security/pcsc-lite/patches/patch-src_thread_unix.c @@ -1,8 +1,7 @@ -$NetBSD: patch-src_thread_unix.c,v 1.1 2012/10/24 09:01:41 manu Exp $ - -Make sure libpscslite.so is not linked against -lphtread on NetBSD, as -loading libpthread.so through dlopen() is now forbidden +$NetBSD: patch-src_thread_unix.c,v 1.2 2012/11/30 14:28:55 gdt Exp $ +Make sure libpscslite.so is not linked against -lpthread on NetBSD, as +loading libpthread.so through dlopen() is now forbidden. --- ./src/thread_unix.c.orig 2012-10-24 06:22:45.000000000 +0200 +++ ./src/thread_unix.c 2012-10-24 06:23:57.000000000 +0200 -- cgit v1.2.3