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 corrections

5 files changed, 31 insertions, 28 deletions

diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index e5ea5a14bc5..4c6a5b0cf66 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2013/10/05 14:09:00 pettai Exp $
+# $NetBSD: Makefile,v 1.21 2014/02/25 17:47:19 gdt Exp $
 #
 
-DISTNAME=	pcsc-lite-1.8.8
+DISTNAME=	pcsc-lite-1.8.11
 CATEGORIES=	security
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/file/3862/
+# Note that the MASTER_SITES URL is not stable with version changes,
+# and one can end up with an old version if DISTNAME is changed but
+# not the magic number in MASTER_SITES.
+MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/3991/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/security/pcsc-lite/PLIST b/security/pcsc-lite/PLIST
index 09ab1534e9d..443916902ae 100644
--- a/security/pcsc-lite/PLIST
+++ b/security/pcsc-lite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/01/06 16:02:21 pettai Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/02/25 17:47:19 gdt Exp $
 ${PLIST.spy}bin/pcsc-spy
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
@@ -14,4 +14,5 @@ man/man5/reader.conf.5
 man/man8/pcscd.8
 sbin/pcscd
 share/doc/pcsc-lite/README.DAEMON
+share/doc/pcsc-lite/README.polkit
 @pkgdir share/examples/pcsc-lite
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index 71050ff28a6..a3911171431 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2013/10/05 14:09:00 pettai Exp $
+$NetBSD: distinfo,v 1.15 2014/02/25 17:47:19 gdt Exp $
 
-SHA1 (pcsc-lite-1.8.8.tar.bz2) = 714efaaaf5333e4a04309efd3a6dbc8e7edc61ce
-RMD160 (pcsc-lite-1.8.8.tar.bz2) = 209f817276e1a0a9b447096a7ab2b81a7bef5698
-Size (pcsc-lite-1.8.8.tar.bz2) = 551751 bytes
+SHA1 (pcsc-lite-1.8.11.tar.bz2) = b72e506978121cde284f8b0b01986df74728dc7a
+RMD160 (pcsc-lite-1.8.11.tar.bz2) = c8433f0f20516ad03fbea7b3330cfaee2844616a
+Size (pcsc-lite-1.8.11.tar.bz2) = 571837 bytes
 SHA1 (patch-configure) = fdaf3d598c2f03718c585c8201f9ed33970107a0
-SHA1 (patch-src_Makefile.in) = 0d24ae0d16681bd59229bafda731b62c14a9a74c
+SHA1 (patch-src_Makefile.in) = bd5449c8bceb21cf9a22503e6f9254e25e582689
 SHA1 (patch-src_PCSC_reader.h) = 34fa97e93ea770da79a604df17ef62a8bceb3717
 SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67
-SHA1 (patch-src_spy_Makefile.in) = 3c7e3fcbb5e1338e7876e73ae16a047d63963c10
+SHA1 (patch-src_spy_Makefile.in) = 5af1360728d37296c5c6c2c85982403c844ec670
 SHA1 (patch-src_utils.c) = 558e2d67a2d3efa6e5363323ce942fa383620a8a
diff --git a/security/pcsc-lite/patches/patch-src_Makefile.in b/security/pcsc-lite/patches/patch-src_Makefile.in
index 4a955c0b161..397a8bf5ce9 100644
--- a/security/pcsc-lite/patches/patch-src_Makefile.in
+++ b/security/pcsc-lite/patches/patch-src_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_Makefile.in,v 1.4 2013/01/06 16:02:21 pettai Exp $
+$NetBSD: patch-src_Makefile.in,v 1.5 2014/02/25 17:47:19 gdt 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-11-28 17:44:06.000000000 +0000
+--- src/Makefile.in.orig	2014-02-14 16:17:03.000000000 +0000
 +++ src/Makefile.in
-@@ -334,6 +334,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+@@ -396,6 +396,8 @@ POLKIT_LIBS = @POLKIT_LIBS@
  PTHREAD_CC = @PTHREAD_CC@
  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
  PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -15,7 +15,7 @@ Disable installation of pcsc-spy
  RANLIB = @RANLIB@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
-@@ -403,7 +405,7 @@ top_builddir = @top_builddir@
+@@ -466,7 +468,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  usbdropdir = @usbdropdir@
  usbdropdir_exp = @usbdropdir_exp@
@@ -24,7 +24,7 @@ Disable installation of pcsc-spy
  AM_CPPFLAGS = -I$(top_srcdir)/src/PCSC -I$(top_builddir)/src/PCSC \
  	$(SYMBOL_VISIBILITY)
  
-@@ -427,8 +429,8 @@ libpcsclite_la_SOURCES = \
+@@ -490,8 +492,8 @@ libpcsclite_la_SOURCES = \
  	winscard_msg.c
  
  libpcsclite_la_LDFLAGS = -version-info 1:0:0
@@ -33,5 +33,5 @@ Disable installation of pcsc-spy
 +libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE
 +libpcsclite_la_LIBADD = $(LIBPCSC_PTHREAD_CFLAGS) $(PTHREAD_LIBS)
  pcscd_SOURCES = \
- 	atrhandler.c \
- 	atrhandler.h \
+ 	auth.c \
+ 	auth.h \
diff --git a/security/pcsc-lite/patches/patch-src_spy_Makefile.in b/security/pcsc-lite/patches/patch-src_spy_Makefile.in
index 9b9bc32f5bc..48207792d33 100644
--- a/security/pcsc-lite/patches/patch-src_spy_Makefile.in
+++ b/security/pcsc-lite/patches/patch-src_spy_Makefile.in
@@ -1,15 +1,14 @@
-$NetBSD: patch-src_spy_Makefile.in,v 1.1 2013/01/06 16:02:21 pettai Exp $
+$NetBSD: patch-src_spy_Makefile.in,v 1.2 2014/02/25 17:47:19 gdt Exp $
 
 Build fix for dlopen() on NetBSD
 
---- src/spy/Makefile.in.orig	2012-12-15 16:30:04.000000000 +0000
+--- src/spy/Makefile.in.orig	2014-02-14 16:17:03.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
+@@ -124,6 +124,7 @@ am__uninstall_files_from_dir = { \
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ 	"$(DESTDIR)$(man1dir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
++# In earlier versions, pkgsrc patched -ldl to ${DL_LIBS}
+ libpcscspy_la_LIBADD =
+ am_libpcscspy_la_OBJECTS = libpcscspy.lo
+ libpcscspy_la_OBJECTS = $(am_libpcscspy_la_OBJECTS)