Update to 1.8.11 from 1.8.8. Builds on NetBSD/i386 6-stable, not tested (but MAINTAINER=pkgsrc-users, so presumbly that's ok). pkgsrc notes: We used to patch -ldl from spy, but the patch didn't apply and spy is no longer built. So I left a patch that adds a comment to spy Makefile.in. http://ludovicrousseau.blogspot.fr/2014/02/new-version-of-pcsc-lite-1811.html No major changes except polkit support (pushed by RedHat). Changes: pcsc-lite-1.8.11: Ludovic Rousseau 14 February 2014 - Add polkit support. See doc/README.polkit - /etc/reader.conf: CHANNELID and DEVICENAME are both optional but not at the same time - Some other minor improvements and bug corrections 1.8.10: minor bugfix http://ludovicrousseau.blogspot.fr/2013/10/new-version-of-pcsc-lite-189.html After a long (maybe too long) time I now publish a new version of pcsc-lite. A lot a small bugs fixed. Changes pcsc-lite-1.8.9: Ludovic Rousseau 16 October 2013 - SCardEndTransaction(): Return an error if is called with no corresponding SCardBeginTransaction() - SCardGetAttrib(): Add support of SCARD_ATTR_DEVICE_SYSTEM_NAME - SCardGetAttrib(): Fix bug in SCARD_ATTR_DEVICE_FRIENDLY_NAME - SCardBeginTransaction() was not correctly releasing a mutex when the hCard handle was invalidated The problem was that SCardGetStatusChange() was blocked because SCardBeginTransaction() had not released the context mutex. - PCSC/reader.h: Use C99 flexible array member The structures PIN_MODIFY_STRUCTURE and PIN_VERIFY_STRUCTURE now use a C99 flexible array member when available for abData field. uint8_t abData[]; - Add support of --reader-name-no-serial and --reader-name-no-interface It is now possible to NOT add the USB serial number of the reader using --reader-name-no-serial It is now possible to NOT add the CCID interface name of the reader using --reader-name-no-interface - Add support of serialconfdir pkg-config variable It is now possible to use pkg-config to get the directory used by pcscd to fetch serial drivers configurations. $ pkg-config libpcsclite --variable=serialconfdir /etc/reader.conf.d - pcsc-spy: Try to display the thread in the order they appear in the log - pcsc-spy: Add SCARD_ATTR_DEVICE_SYSTEM_NAME - Check the Info.plist file is (a minimum) correct - Update PROTOCOL_VERSION_MINOR from 2 to 3 We broke the API between version 1.8.3 and 1.8.4 by changing the value of MAX_READERNAME. This change should have been made before releasing version 1.8.4 to make mix of versions clearly non working instead of failing with strange errors. - hotplug_libudev.c: Fix a memory leak in case of error - Fix OpenBSD 5.2 compilation regarding dlopen - correctly manage thread safe multi-slot readers - Do not use pthread_atfork() any more (fix problem on FreeBSD) - fix memory leaks. This was not really a problem unless you embedd pcscd in another process and do init/deinit pcscd without exiting the process (as maybe used on Android or iOS). - pcscd.8 manpage: add documentation for --max-thread, --max-card-handle-per-thread, --max-card-handle-per-reader, --force-reader-polling, --error, --critical and --color - Some other minor improvements and bug correctionsdiff -r1.20 -r1.21 pkgsrc/security/pcsc-lite/Makefile
(gdt)
@@ -1,19 +1,22 @@ | @@ -1,19 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2013/10/05 14:09:00 pettai Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2014/02/25 17:47:19 gdt Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= pcsc-lite-1.8.8 | 4 | DISTNAME= pcsc-lite-1.8.11 | |
5 | CATEGORIES= security | 5 | CATEGORIES= security | |
6 | MASTER_SITES= http://alioth.debian.org/frs/download.php/file/3862/ | 6 | # Note that the MASTER_SITES URL is not stable with version changes, | |
7 | # and one can end up with an old version if DISTNAME is changed but | |||
8 | # not the magic number in MASTER_SITES. | |||
9 | MASTER_SITES= https://alioth.debian.org/frs/download.php/file/3991/ | |||
7 | EXTRACT_SUFX= .tar.bz2 | 10 | EXTRACT_SUFX= .tar.bz2 | |
8 | 11 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://pcsclite.alioth.debian.org/ | 13 | HOMEPAGE= http://pcsclite.alioth.debian.org/ | |
11 | COMMENT= Middleware to access a smart card using SCard API (PC/SC) | 14 | COMMENT= Middleware to access a smart card using SCard API (PC/SC) | |
12 | LICENSE= modified-bsd | 15 | LICENSE= modified-bsd | |
13 | 16 | |||
14 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 18 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= pkg-config gmake | 19 | USE_TOOLS+= pkg-config gmake | |
17 | USE_LANGUAGES= c c++ | 20 | USE_LANGUAGES= c c++ | |
18 | 21 | |||
19 | .include "../../mk/bsd.prefs.mk" | 22 | .include "../../mk/bsd.prefs.mk" |
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.5 2013/01/06 16:02:21 pettai Exp $ | 1 | @comment $NetBSD: PLIST,v 1.6 2014/02/25 17:47:19 gdt Exp $ | |
2 | ${PLIST.spy}bin/pcsc-spy | 2 | ${PLIST.spy}bin/pcsc-spy | |
3 | include/PCSC/debuglog.h | 3 | include/PCSC/debuglog.h | |
4 | include/PCSC/ifdhandler.h | 4 | include/PCSC/ifdhandler.h | |
5 | include/PCSC/pcsclite.h | 5 | include/PCSC/pcsclite.h | |
6 | include/PCSC/reader.h | 6 | include/PCSC/reader.h | |
7 | include/PCSC/winscard.h | 7 | include/PCSC/winscard.h | |
8 | include/PCSC/wintypes.h | 8 | include/PCSC/wintypes.h | |
9 | lib/libpcsclite.la | 9 | lib/libpcsclite.la | |
10 | ${PLIST.spy}lib/libpcscspy.la | 10 | ${PLIST.spy}lib/libpcscspy.la | |
11 | lib/pkgconfig/libpcsclite.pc | 11 | lib/pkgconfig/libpcsclite.pc | |
12 | ${PLIST.spy}man/man1/pcsc-spy.1 | 12 | ${PLIST.spy}man/man1/pcsc-spy.1 | |
13 | man/man5/reader.conf.5 | 13 | man/man5/reader.conf.5 | |
14 | man/man8/pcscd.8 | 14 | man/man8/pcscd.8 | |
15 | sbin/pcscd | 15 | sbin/pcscd | |
16 | share/doc/pcsc-lite/README.DAEMON | 16 | share/doc/pcsc-lite/README.DAEMON | |
17 | share/doc/pcsc-lite/README.polkit | |||
17 | @pkgdir share/examples/pcsc-lite | 18 | @pkgdir share/examples/pcsc-lite |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.14 2013/10/05 14:09:00 pettai Exp $ | 1 | $NetBSD: distinfo,v 1.15 2014/02/25 17:47:19 gdt Exp $ | |
2 | 2 | |||
3 | SHA1 (pcsc-lite-1.8.8.tar.bz2) = 714efaaaf5333e4a04309efd3a6dbc8e7edc61ce | 3 | SHA1 (pcsc-lite-1.8.11.tar.bz2) = b72e506978121cde284f8b0b01986df74728dc7a | |
4 | RMD160 (pcsc-lite-1.8.8.tar.bz2) = 209f817276e1a0a9b447096a7ab2b81a7bef5698 | 4 | RMD160 (pcsc-lite-1.8.11.tar.bz2) = c8433f0f20516ad03fbea7b3330cfaee2844616a | |
5 | Size (pcsc-lite-1.8.8.tar.bz2) = 551751 bytes | 5 | Size (pcsc-lite-1.8.11.tar.bz2) = 571837 bytes | |
6 | SHA1 (patch-configure) = fdaf3d598c2f03718c585c8201f9ed33970107a0 | 6 | SHA1 (patch-configure) = fdaf3d598c2f03718c585c8201f9ed33970107a0 | |
7 | SHA1 (patch-src_Makefile.in) = 0d24ae0d16681bd59229bafda731b62c14a9a74c | 7 | SHA1 (patch-src_Makefile.in) = bd5449c8bceb21cf9a22503e6f9254e25e582689 | |
8 | SHA1 (patch-src_PCSC_reader.h) = 34fa97e93ea770da79a604df17ef62a8bceb3717 | 8 | SHA1 (patch-src_PCSC_reader.h) = 34fa97e93ea770da79a604df17ef62a8bceb3717 | |
9 | SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67 | 9 | SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67 | |
10 | SHA1 (patch-src_spy_Makefile.in) = 3c7e3fcbb5e1338e7876e73ae16a047d63963c10 | 10 | SHA1 (patch-src_spy_Makefile.in) = 5af1360728d37296c5c6c2c85982403c844ec670 | |
11 | SHA1 (patch-src_utils.c) = 558e2d67a2d3efa6e5363323ce942fa383620a8a | 11 | SHA1 (patch-src_utils.c) = 558e2d67a2d3efa6e5363323ce942fa383620a8a |
@@ -1,37 +1,37 @@ | @@ -1,37 +1,37 @@ | |||
1 | $NetBSD: patch-src_Makefile.in,v 1.4 2013/01/06 16:02:21 pettai Exp $ | 1 | $NetBSD: patch-src_Makefile.in,v 1.5 2014/02/25 17:47:19 gdt Exp $ | |
2 | 2 | |||
3 | Make sure libpscslite.so is not linked against -lpthread on NetBSD, as | 3 | Make sure libpscslite.so is not linked against -lpthread on NetBSD, as | |
4 | loading libpthread.so through dlopen() is now forbidden. | 4 | loading libpthread.so through dlopen() is now forbidden. | |
5 | Disable installation of pcsc-spy | 5 | Disable installation of pcsc-spy | |
6 | 6 | |||
7 | --- src/Makefile.in.orig 2012-11-28 17:44:06.000000000 +0000 | 7 | --- src/Makefile.in.orig 2014-02-14 16:17:03.000000000 +0000 | |
8 | +++ src/Makefile.in | 8 | +++ src/Makefile.in | |
9 | @@ -334,6 +334,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | 9 | @@ -396,6 +396,8 @@ POLKIT_LIBS = @POLKIT_LIBS@ | |
10 | PTHREAD_CC = @PTHREAD_CC@ | 10 | PTHREAD_CC = @PTHREAD_CC@ | |
11 | PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ | 11 | PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ | |
12 | PTHREAD_LIBS = @PTHREAD_LIBS@ | 12 | PTHREAD_LIBS = @PTHREAD_LIBS@ | |
13 | +LIBPCSC_PTHREAD_CFLAGS = @LIBPCSC_PTHREAD_CFLAGS@ | 13 | +LIBPCSC_PTHREAD_CFLAGS = @LIBPCSC_PTHREAD_CFLAGS@ | |
14 | +LIBPCSC_PTHREAD_LIBS = @LIBPCSC_PTHREAD_LIBS@ | 14 | +LIBPCSC_PTHREAD_LIBS = @LIBPCSC_PTHREAD_LIBS@ | |
15 | RANLIB = @RANLIB@ | 15 | RANLIB = @RANLIB@ | |
16 | SED = @SED@ | 16 | SED = @SED@ | |
17 | SET_MAKE = @SET_MAKE@ | 17 | SET_MAKE = @SET_MAKE@ | |
18 | @@ -403,7 +405,7 @@ top_builddir = @top_builddir@ | 18 | @@ -466,7 +468,7 @@ top_builddir = @top_builddir@ | |
19 | top_srcdir = @top_srcdir@ | 19 | top_srcdir = @top_srcdir@ | |
20 | usbdropdir = @usbdropdir@ | 20 | usbdropdir = @usbdropdir@ | |
21 | usbdropdir_exp = @usbdropdir_exp@ | 21 | usbdropdir_exp = @usbdropdir_exp@ | |
22 | -SUBDIRS = spy | 22 | -SUBDIRS = spy | |
23 | +#SUBDIRS = spy | 23 | +#SUBDIRS = spy | |
24 | AM_CPPFLAGS = -I$(top_srcdir)/src/PCSC -I$(top_builddir)/src/PCSC \ | 24 | AM_CPPFLAGS = -I$(top_srcdir)/src/PCSC -I$(top_builddir)/src/PCSC \ | |
25 | $(SYMBOL_VISIBILITY) | 25 | $(SYMBOL_VISIBILITY) | |
26 | 26 | |||
27 | @@ -427,8 +429,8 @@ libpcsclite_la_SOURCES = \ | 27 | @@ -490,8 +492,8 @@ libpcsclite_la_SOURCES = \ | |
28 | winscard_msg.c | 28 | winscard_msg.c | |
29 | 29 | |||
30 | libpcsclite_la_LDFLAGS = -version-info 1:0:0 | 30 | libpcsclite_la_LDFLAGS = -version-info 1:0:0 | |
31 | -libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE | 31 | -libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE | |
32 | -libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) | 32 | -libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) | |
33 | +libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE | 33 | +libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE | |
34 | +libpcsclite_la_LIBADD = $(LIBPCSC_PTHREAD_CFLAGS) $(PTHREAD_LIBS) | 34 | +libpcsclite_la_LIBADD = $(LIBPCSC_PTHREAD_CFLAGS) $(PTHREAD_LIBS) | |
35 | pcscd_SOURCES = \ | 35 | pcscd_SOURCES = \ | |
36 | atrhandler.c \ | 36 | auth.c \ | |
37 | atrhandler.h \ | 37 | auth.h \ |
@@ -1,15 +1,14 @@ | @@ -1,15 +1,14 @@ | |||
1 | $NetBSD: patch-src_spy_Makefile.in,v 1.1 2013/01/06 16:02:21 pettai Exp $ | 1 | $NetBSD: patch-src_spy_Makefile.in,v 1.2 2014/02/25 17:47:19 gdt Exp $ | |
2 | 2 | |||
3 | Build fix for dlopen() on NetBSD | 3 | Build fix for dlopen() on NetBSD | |
4 | 4 | |||
5 | --- src/spy/Makefile.in.orig 2012-12-15 16:30:04.000000000 +0000 | 5 | --- src/spy/Makefile.in.orig 2014-02-14 16:17:03.000000000 +0000 | |
6 | +++ src/spy/Makefile.in | 6 | +++ src/spy/Makefile.in | |
7 | @@ -293,7 +293,7 @@ dist_bin_SCRIPTS = pcsc-spy | 7 | @@ -124,6 +124,7 @@ am__uninstall_files_from_dir = { \ | |
8 | libpcscspy_la_SOURCES = \ | 8 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ | |
9 | libpcscspy.c | 9 | "$(DESTDIR)$(man1dir)" | |
10 | 10 | LTLIBRARIES = $(lib_LTLIBRARIES) | ||
11 | -libpcscspy_la_LIBADD = -ldl | 11 | +# In earlier versions, pkgsrc patched -ldl to ${DL_LIBS} | |
12 | +libpcscspy_la_LIBADD = ${DL_LIBS} | 12 | libpcscspy_la_LIBADD = | |
13 | man_MANS = pcsc-spy.1 | 13 | am_libpcscspy_la_OBJECTS = libpcscspy.lo | |
14 | EXTRA_DIST = install_spy.sh uninstall_spy.sh pcsc-spy.pod | 14 | libpcscspy_la_OBJECTS = $(am_libpcscspy_la_OBJECTS) | |
15 | CLEANFILES = pcsc-spy.1 |