pcsc-lite-1.8.7:

- Fix a problem when a reader is unplugged (and the reader is still in use)

pcsc-lite-1.8.6:
- Fix a problem when only serial drivers are used (no hotplug/USB
  driver)
- increase log buffer size from 160 to 2048. Some "long" log lines where
  truncated.
- Fix redirection of stdin, stdout and stderr to /dev/null when pcscd is
  started as a daemon (default)
- Some other minor improvements and bug corrections

pcsc-lite-1.8.5:
- Fix crash when a reader is unplugged while pcscd is in the middle of a
  PC/SC function
- SCardBeginTransaction(): fix a bug introduced in version 1.8.4
  related to sharing
- Some other minor improvements and bug corrections

pcsc-lite-1.8.4:
- Add [ and ] in the list of accepted characters for a reader name
- truncates the reader name if it is too long instead of rejecting the
  reader
- The restriction to have to call SCardEstablishContext() in each thread
  has been removed. Threads could now share a PC/SC context.
- Fix compiler failure for static driver
- Update IFDHandler API Doxygen regarding the "libusb-1.0" naming scheme
- Some other minor improvements and bug corrections

pcsc-lite-1.8.3:
- ignore directories and hidden (.*) files when parsing a configuration
  directory (like /etc/reader.conf.d/)
- add Mac OS X for PC/SC spy tool
- fix a bug in PC/SC spy tool when loading of the real library fails
- add PCSCv2_PART10_PROPERTY_dwMaxAPDUDataSize,
  PCSCv2_PART10_PROPERTY_wIdVendor and PCSCv2_PART10_PROPERTY_wIdProduct
  from PC/SC v2 part 10 release 2.02.09 (not yet published)
- Some other minor improvements and bug corrections

pcsc-lite-1.8.2:
- rename pcsc-spy.py to pcsc-spy and install it as a normal binary (in
  /usr/local/bin by default)
- write a pcsc-spy.1 manpage
- fix a bug with a multi-slot reader
- Info.plist parser: avoid a buffer read overflow in & management
- Some Doxygen improvements

pcsc-lite-1.8.1:
- Distribute missing files from src/spy/

pcsc-lite-1.8.0:
- PC/SC spy tool
- Support systemd socket activation (the auto start of pcscd from the
  library has been removed. Use systemd instead)
- SCardGetStatusChange(): check all the readers are already known and
  return SCARD_E_UNKNOWN_READER if a reader name is not present.
  Windows XP has this behavior.
- SCardEstablishContext(): Invalidate all the handles in the son after a
  fork
- Add define of FEATURE_EXECUTE_PACE from PCSC v2 Part 10 Amendment 1
  2011-06-03
- Fix some memory leaks reported by Coverity
- Enable silent build by default
- log_line(): correctly calculate delta time when no color is used
  The update of last_time was only done in case of colorization
  (LogDoColor). So on unsupported consoles the time was wrong.
- log_xxd_always(): Use a variable-length array
  The debug message buffer is no more with a fixed size (around 600
  bytes of buffer to log) but uses a variable-length array.
  It is now possible to log extended APDU of 64kB.
  The variable-length array feature is available in GCC in C90 mode and
  is mandatory in C99 standard.
- Some other minor improvements and bug corrections

6 files changed, 60 insertions, 24 deletions

diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index 7813410bb57..2aa0d6dcd6a 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2013/01/02 07:02:53 sbd Exp $
+# $NetBSD: Makefile,v 1.15 2013/01/06 16:02:21 pettai Exp $
 #
 
-DISTNAME=	pcsc-lite-1.7.4
+DISTNAME=	pcsc-lite-1.8.7
 CATEGORIES=	security
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3598/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3842/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@NetBSD.org
@@ -13,9 +13,15 @@ LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config gmake
 USE_LANGUAGES=	c c++
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=    spy
+#REPLACE_PYTHON=		src/spy/pcsc-spy
+#.include "../../lang/python/application.mk"
+
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-confdir=${PKG_SYSCONFDIR:Q}/reader.conf.d
@@ -34,6 +40,6 @@ PKGCONFIG_OVERRIDE+=	src/libpcsclite.pc.in
 BUILD_DEFS+=		VARBASE
 INSTALLATION_DIRS=	${EGDIR}
 
-
 .include "../../devel/libusb1/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pcsc-lite/PLIST b/security/pcsc-lite/PLIST
index 8a6deac65ad..09ab1534e9d 100644
--- a/security/pcsc-lite/PLIST
+++ b/security/pcsc-lite/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2012/12/14 23:50:33 pettai Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/01/06 16:02:21 pettai Exp $
+${PLIST.spy}bin/pcsc-spy
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
 include/PCSC/pcsclite.h
@@ -6,8 +7,11 @@ include/PCSC/reader.h
 include/PCSC/winscard.h
 include/PCSC/wintypes.h
 lib/libpcsclite.la
+${PLIST.spy}lib/libpcscspy.la
 lib/pkgconfig/libpcsclite.pc
+${PLIST.spy}man/man1/pcsc-spy.1
 man/man5/reader.conf.5
 man/man8/pcscd.8
 sbin/pcscd
 share/doc/pcsc-lite/README.DAEMON
+@pkgdir share/examples/pcsc-lite
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index a921b67f3e0..4412132a736 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.12 2012/12/14 23:50:33 pettai Exp $
+$NetBSD: distinfo,v 1.13 2013/01/06 16:02:21 pettai Exp $
 
-SHA1 (pcsc-lite-1.7.4.tar.bz2) = 6b815a1367390921ce4935f97de5cacb6965c9a7
-RMD160 (pcsc-lite-1.7.4.tar.bz2) = 0bec1904894e7b04cbeca8f60da35b64ac950279
-Size (pcsc-lite-1.7.4.tar.bz2) = 503848 bytes
-SHA1 (patch-configure) = af17586545a8c12a0d5ce649e28d525d56779a60
-SHA1 (patch-src_Makefile.in) = 213d54a70dff6aec55ccd74aeb721600aff6978b
+SHA1 (pcsc-lite-1.8.7.tar.bz2) = ebaa3594b6149b6da42d38085df108b5e710266e
+RMD160 (pcsc-lite-1.8.7.tar.bz2) = d08cace5c79aba21bfc3355640aabd1078272043
+Size (pcsc-lite-1.8.7.tar.bz2) = 552310 bytes
+SHA1 (patch-configure) = fdaf3d598c2f03718c585c8201f9ed33970107a0
+SHA1 (patch-src_Makefile.in) = 0d24ae0d16681bd59229bafda731b62c14a9a74c
 SHA1 (patch-src_PCSC_reader.h) = 34fa97e93ea770da79a604df17ef62a8bceb3717
 SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67
+SHA1 (patch-src_spy_Makefile.in) = 3c7e3fcbb5e1338e7876e73ae16a047d63963c10
 SHA1 (patch-src_utils.c) = 558e2d67a2d3efa6e5363323ce942fa383620a8a
diff --git a/security/pcsc-lite/patches/patch-configure b/security/pcsc-lite/patches/patch-configure
index 1789c2ae7f8..17c31ac1073 100644
--- a/security/pcsc-lite/patches/patch-configure
+++ b/security/pcsc-lite/patches/patch-configure
@@ -1,20 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2012/12/14 23:50:36 pettai Exp $
+$NetBSD: patch-configure,v 1.3 2013/01/06 16:02:21 pettai Exp $
 
 Make sure libpscslite.so is not linked against -lphtread on NetBSD, as
 loading libpthread.so through dlopen() is now forbidden
 
---- configure.orig	2012-12-11 21:43:14.000000000 +0000
+--- configure.orig	2012-11-28 17:44:05.000000000 +0000
 +++ configure
-@@ -654,6 +654,8 @@ LIBTOOL
+@@ -675,6 +675,8 @@ LIBTOOL
  PTHREAD_CFLAGS
  PTHREAD_LIBS
  PTHREAD_CC
 +LIBPCSC_PTHREAD_CFLAGS
 +LIBPCSC_PTHREAD_LIBS
- acx_pthread_config
- PKG_CONFIG_LIBDIR
- PKG_CONFIG_PATH
-@@ -13327,7 +13329,7 @@ fi
+ ax_pthread_config
+ ac_ct_AR
+ AR
+@@ -13654,7 +13656,7 @@ fi
  
  
  # disable libudev check is USB is not used
@@ -23,7 +23,7 @@ loading libpthread.so through dlopen() is now forbidden
  	use_libudev="no"
  fi
  
-@@ -13484,7 +13486,7 @@ fi
+@@ -13811,7 +13813,7 @@ fi
  
  
  # disable libusb check is USB is not used
diff --git a/security/pcsc-lite/patches/patch-src_Makefile.in b/security/pcsc-lite/patches/patch-src_Makefile.in
index bb874b57878..4a955c0b161 100644
--- a/security/pcsc-lite/patches/patch-src_Makefile.in
+++ b/security/pcsc-lite/patches/patch-src_Makefile.in
@@ -1,11 +1,12 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2012/12/14 23:50:36 pettai Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2013/01/06 16:02:21 pettai Exp $
 
 Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
 loading libpthread.so through dlopen() is now forbidden.
+Disable installation of pcsc-spy
 
---- src/Makefile.in.orig	2012-12-12 09:03:13.000000000 +0000
+--- src/Makefile.in.orig	2012-11-28 17:44:06.000000000 +0000
 +++ src/Makefile.in
-@@ -249,6 +249,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+@@ -334,6 +334,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
  PTHREAD_CC = @PTHREAD_CC@
  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
  PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -14,7 +15,16 @@ loading libpthread.so through dlopen() is now forbidden.
  RANLIB = @RANLIB@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
-@@ -340,8 +342,8 @@ libpcsclite_la_SOURCES = \
+@@ -403,7 +405,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ usbdropdir = @usbdropdir@
+ usbdropdir_exp = @usbdropdir_exp@
+-SUBDIRS = spy
++#SUBDIRS = spy
+ AM_CPPFLAGS = -I$(top_srcdir)/src/PCSC -I$(top_builddir)/src/PCSC \
+ 	$(SYMBOL_VISIBILITY)
+ 
+@@ -427,8 +429,8 @@ libpcsclite_la_SOURCES = \
  	winscard_msg.c
  
  libpcsclite_la_LDFLAGS = -version-info 1:0:0
diff --git a/security/pcsc-lite/patches/patch-src_spy_Makefile.in b/security/pcsc-lite/patches/patch-src_spy_Makefile.in
new file mode 100644
index 00000000000..9b9bc32f5bc
--- /dev/null
+++ b/security/pcsc-lite/patches/patch-src_spy_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_spy_Makefile.in,v 1.1 2013/01/06 16:02:21 pettai Exp $
+
+Build fix for dlopen() on NetBSD
+
+--- src/spy/Makefile.in.orig	2012-12-15 16:30:04.000000000 +0000
++++ src/spy/Makefile.in
+@@ -293,7 +293,7 @@ dist_bin_SCRIPTS = pcsc-spy
+ libpcscspy_la_SOURCES = \
+ 	libpcscspy.c
+ 
+-libpcscspy_la_LIBADD = -ldl
++libpcscspy_la_LIBADD = ${DL_LIBS}
+ man_MANS = pcsc-spy.1
+ EXTRA_DIST = install_spy.sh uninstall_spy.sh pcsc-spy.pod
+ CLEANFILES = pcsc-spy.1