Fri Nov 30 14:28:55 2012 UTC ()
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@.


(gdt)
diff -r1.11 -r1.12 pkgsrc/security/pcsc-lite/Makefile
diff -r1.10 -r1.11 pkgsrc/security/pcsc-lite/distinfo
diff -r1.2 -r1.3 pkgsrc/security/pcsc-lite/patches/patch-aa
diff -r0 -r1.1 pkgsrc/security/pcsc-lite/patches/patch-configure.in
diff -r0 -r1.1 pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.am
diff -r0 -r1.1 pkgsrc/security/pcsc-lite/patches/patch-src_libpscslite.pc.in
diff -r1.1 -r1.2 pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in
diff -r1.1 -r1.2 pkgsrc/security/pcsc-lite/patches/patch-src_thread_unix.c
cvs diff -r1.11 -r1.12 pkgsrc/security/pcsc-lite/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/Makefile 2012/10/24 09:01:40 1.11
+++ pkgsrc/security/pcsc-lite/Makefile 2012/11/30 14:28:55 1.12
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.11 2012/10/24 09:01:40 manu Exp $ 1# $NetBSD: Makefile,v 1.12 2012/11/30 14:28:55 gdt Exp $
2# 2#
3 3
4DISTNAME= pcsc-lite-1.5.5 4DISTNAME= pcsc-lite-1.5.5
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://alioth.debian.org/frs/download.php/3082/ 7MASTER_SITES= http://alioth.debian.org/frs/download.php/3082/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= shannonjr@NetBSD.org 10MAINTAINER= shannonjr@NetBSD.org
11HOMEPAGE= http://pcsclite.alioth.debian.org/ 11HOMEPAGE= http://pcsclite.alioth.debian.org/
12COMMENT= Middleware to access a smart card using SCard API (PC/SC) 12COMMENT= Middleware to access a smart card using SCard API (PC/SC)
 13LICENSE= modified-bsd
13 14
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
17USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
18 19
19.include "options.mk" 20.include "options.mk"
20 21
21CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} 22CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q}
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
23CONFIGURE_ARGS+= --enable-confdir=${PKG_SYSCONFDIR:Q} 24CONFIGURE_ARGS+= --enable-confdir=${PKG_SYSCONFDIR:Q}
24CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite 25CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite
25CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers 26CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers
cvs diff -r1.10 -r1.11 pkgsrc/security/pcsc-lite/distinfo (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/distinfo 2012/10/24 09:01:40 1.10
+++ pkgsrc/security/pcsc-lite/distinfo 2012/11/30 14:28:55 1.11
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1$NetBSD: distinfo,v 1.10 2012/10/24 09:01:40 manu Exp $ 1$NetBSD: distinfo,v 1.11 2012/11/30 14:28:55 gdt Exp $
2 2
3SHA1 (pcsc-lite-1.5.5.tar.bz2) = 6791a8bd07f69972f708d4bdd03d6b1056c7af3e 3SHA1 (pcsc-lite-1.5.5.tar.bz2) = 6791a8bd07f69972f708d4bdd03d6b1056c7af3e
4RMD160 (pcsc-lite-1.5.5.tar.bz2) = 99f56839483d7364426e0d70ec6825f551b4c49e 4RMD160 (pcsc-lite-1.5.5.tar.bz2) = 99f56839483d7364426e0d70ec6825f551b4c49e
5Size (pcsc-lite-1.5.5.tar.bz2) = 465947 bytes 5Size (pcsc-lite-1.5.5.tar.bz2) = 465947 bytes
6SHA1 (patch-aa) = a30db3af5181f7d37d16c25d2679070e2fdf6652 6SHA1 (patch-aa) = 71f39c897a104a87e5d3cbc031e1fdb4af7de272
7SHA1 (patch-ab) = 3fe33345975fcd61611dae8d7aaf9b6ee5329d9e 7SHA1 (patch-ab) = 3fe33345975fcd61611dae8d7aaf9b6ee5329d9e
8SHA1 (patch-ac) = 1abf0c4bb7199998fb8d81ef8514f8f80f460ccc 8SHA1 (patch-ac) = 1abf0c4bb7199998fb8d81ef8514f8f80f460ccc
9SHA1 (patch-configure) = 6b7f6b9333a93b731822456cec980c11bba27ba6 9SHA1 (patch-configure) = 6b7f6b9333a93b731822456cec980c11bba27ba6
10SHA1 (patch-src_Makefile.in) = daa2dd2e1fc1a901df782654300a8277b5a4b4cd 10SHA1 (patch-configure.in) = 35622b5461da2f31f1da0b151241a664848b15cd
11SHA1 (patch-src_thread_unix.c) = 6d5576db605cfe6d430c96101774736b30d0c9e7 11SHA1 (patch-src_Makefile.am) = 1bc3f82848accf2fe372a18a82ff915b0f8daac2
 12SHA1 (patch-src_Makefile.in) = 885dec5cbc389b237e32b5cc72332a6ae001398e
 13SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67
 14SHA1 (patch-src_thread_unix.c) = f12b233d3604e11694a38826b987470f6fb407e4
cvs diff -r1.2 -r1.3 pkgsrc/security/pcsc-lite/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/patches/Attic/patch-aa 2009/04/30 06:24:11 1.2
+++ pkgsrc/security/pcsc-lite/patches/Attic/patch-aa 2012/11/30 14:28:55 1.3
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1$NetBSD: patch-aa,v 1.2 2009/04/30 06:24:11 hasso Exp $ 1$NetBSD: patch-aa,v 1.3 2012/11/30 14:28:55 gdt Exp $
 2
 3Add NetBSD to apple/sun conditional.
 4
 5This should be sent upstream.
2 6
3--- src/PCSC/reader.h.in.orig 2009-03-24 21:41:03 +0200 7--- src/PCSC/reader.h.in.orig 2009-03-24 21:41:03 +0200
4+++ src/PCSC/reader.h.in 2009-04-30 09:03:08 +0300 8+++ src/PCSC/reader.h.in 2009-04-30 09:03:08 +0300
5@@ -126,7 +126,7 @@ 9@@ -126,7 +126,7 @@
6  10
7 /* Set structure elements aligment on bytes 11 /* Set structure elements aligment on bytes
8 * http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html */ 12 * http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html */
9-#if defined(__APPLE__) | defined(sun) 13-#if defined(__APPLE__) | defined(sun)
10+#if defined(__APPLE__) | defined(sun) | defined(__NetBSD__) 14+#if defined(__APPLE__) | defined(sun) | defined(__NetBSD__)
11 #pragma pack(1) 15 #pragma pack(1)
12 #else 16 #else
13 #pragma pack(push, 1) 17 #pragma pack(push, 1)
14@@ -213,7 +213,7 @@ typedef struct { 18@@ -213,7 +213,7 @@ typedef struct {
File Added: pkgsrc/security/pcsc-lite/patches/Attic/patch-configure.in
$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)
File Added: pkgsrc/security/pcsc-lite/patches/Attic/patch-src_Makefile.am
$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 \
File Added: pkgsrc/security/pcsc-lite/patches/Attic/patch-src_libpscslite.pc.in
$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}
cvs diff -r1.1 -r1.2 pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in 2012/10/24 09:01:41 1.1
+++ pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in 2012/11/30 14:28:55 1.2
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1$NetBSD: patch-src_Makefile.in,v 1.1 2012/10/24 09:01:41 manu Exp $ 1$NetBSD: patch-src_Makefile.in,v 1.2 2012/11/30 14:28:55 gdt Exp $
2 
3Make sure libpscslite.so is not linked against -lphtread on NetBSD, as 
4loading libpthread.so through dlopen() is now forbidden 
5 2
 3Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
 4loading libpthread.so through dlopen() is now forbidden.
6 5
7--- ./src/Makefile.in.orig 2012-10-24 06:31:51.000000000 +0200 6--- ./src/Makefile.in.orig 2012-10-24 06:31:51.000000000 +0200
8+++ ./src/Makefile.in 2012-10-24 06:33:06.000000000 +0200 7+++ ./src/Makefile.in 2012-10-24 06:33:06.000000000 +0200
9@@ -220,8 +220,10 @@ 8@@ -220,8 +220,10 @@
10 PKG_CONFIG = @PKG_CONFIG@ 9 PKG_CONFIG = @PKG_CONFIG@
11 PTHREAD_CC = @PTHREAD_CC@ 10 PTHREAD_CC = @PTHREAD_CC@
12 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ 11 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
13 PTHREAD_LIBS = @PTHREAD_LIBS@ 12 PTHREAD_LIBS = @PTHREAD_LIBS@
14+LIBPCSC_PTHREAD_CFLAGS = @LIBPCSC_PTHREAD_CFLAGS@ 13+LIBPCSC_PTHREAD_CFLAGS = @LIBPCSC_PTHREAD_CFLAGS@
15+LIBPCSC_PTHREAD_LIBS = @LIBPCSC_PTHREAD_LIBS@ 14+LIBPCSC_PTHREAD_LIBS = @LIBPCSC_PTHREAD_LIBS@
16 RANLIB = @RANLIB@ 15 RANLIB = @RANLIB@
17 SED = @SED@ 16 SED = @SED@
18 SET_MAKE = @SET_MAKE@ 17 SET_MAKE = @SET_MAKE@
cvs diff -r1.1 -r1.2 pkgsrc/security/pcsc-lite/patches/Attic/patch-src_thread_unix.c (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/patches/Attic/patch-src_thread_unix.c 2012/10/24 09:01:41 1.1
+++ pkgsrc/security/pcsc-lite/patches/Attic/patch-src_thread_unix.c 2012/11/30 14:28:55 1.2
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1$NetBSD: patch-src_thread_unix.c,v 1.1 2012/10/24 09:01:41 manu Exp $ 1$NetBSD: patch-src_thread_unix.c,v 1.2 2012/11/30 14:28:55 gdt Exp $
2 
3Make sure libpscslite.so is not linked against -lphtread on NetBSD, as 
4loading libpthread.so through dlopen() is now forbidden 
5 2
 3Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
 4loading libpthread.so through dlopen() is now forbidden.
6 5
7--- ./src/thread_unix.c.orig 2012-10-24 06:22:45.000000000 +0200 6--- ./src/thread_unix.c.orig 2012-10-24 06:22:45.000000000 +0200
8+++ ./src/thread_unix.c 2012-10-24 06:23:57.000000000 +0200 7+++ ./src/thread_unix.c 2012-10-24 06:23:57.000000000 +0200
9@@ -58,9 +58,9 @@ 8@@ -58,9 +58,9 @@
10 return pthread_mutex_unlock(mMutex); 9 return pthread_mutex_unlock(mMutex);
11 else 10 else
12 return -1; 11 return -1;
13 } 12 }
14- 13-
15+#ifndef LIBPCSCLITE 14+#ifndef LIBPCSCLITE
16 INTERNAL int SYS_ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes, 15 INTERNAL int SYS_ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes,
17 PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg) 16 PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
18 { 17 {