pcsc-lite-1.8.12: Ludovic Rousseau

24 September 2014
- make hotplug using libudev (default) more robust
- add ReiserFS file system support (for configuration files)
- add musl libC support (increase the thread stack)
- Some other minor improvements and bug corrections

8 files changed, 36 insertions, 38 deletions

diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index a70b7198dd6..187494328d4 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.22 2014/03/17 17:44:23 gdt Exp $
+# $NetBSD: Makefile,v 1.23 2014/10/01 16:27:03 gdt Exp $
 #
 
-DISTNAME=	pcsc-lite-1.8.11
-PKGREVISION=	1
+DISTNAME=	pcsc-lite-1.8.12
 CATEGORIES=	security
 # 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/
+MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/4115/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index a3911171431..7dd801d1daf 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2014/02/25 17:47:19 gdt Exp $
+$NetBSD: distinfo,v 1.16 2014/10/01 16:27:03 gdt Exp $
 
-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) = bd5449c8bceb21cf9a22503e6f9254e25e582689
-SHA1 (patch-src_PCSC_reader.h) = 34fa97e93ea770da79a604df17ef62a8bceb3717
-SHA1 (patch-src_libpscslite.pc.in) = db7dff9cf062dd72f75960a6e62242d0da793e67
-SHA1 (patch-src_spy_Makefile.in) = 5af1360728d37296c5c6c2c85982403c844ec670
-SHA1 (patch-src_utils.c) = 558e2d67a2d3efa6e5363323ce942fa383620a8a
+SHA1 (pcsc-lite-1.8.12.tar.bz2) = dc06f6971c2111a82597a337de560b065dd317a8
+RMD160 (pcsc-lite-1.8.12.tar.bz2) = f0f5be03cf4800c69ef4c7383ef6942c654812c4
+Size (pcsc-lite-1.8.12.tar.bz2) = 580449 bytes
+SHA1 (patch-configure) = 2b0e0065c14d7625469c85e29ce3a47806a1cf55
+SHA1 (patch-src_Makefile.in) = 5ada9cc404927ac9f44824bce1c4a815832a2ac1
+SHA1 (patch-src_PCSC_reader.h) = 8ea2b7be9b3bae56cdae64b950373c8eeda2813a
+SHA1 (patch-src_libpscslite.pc.in) = ba1c8ed98ce81f1fc40ecc8af1b44d0cff8537df
+SHA1 (patch-src_spy_Makefile.in) = b50d3d0365409a2f718ac61f698a97e6e2e834db
+SHA1 (patch-src_utils.c) = 39c9126fb4f4b67a96328ba5abd448bf007cbbea
diff --git a/security/pcsc-lite/patches/patch-configure b/security/pcsc-lite/patches/patch-configure
index 17c31ac1073..f31c2ac289f 100644
--- a/security/pcsc-lite/patches/patch-configure
+++ b/security/pcsc-lite/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.3 2013/01/06 16:02:21 pettai Exp $
+$NetBSD: patch-configure,v 1.4 2014/10/01 16:27:03 gdt Exp $
 
 Make sure libpscslite.so is not linked against -lphtread on NetBSD, as
 loading libpthread.so through dlopen() is now forbidden
 
---- configure.orig	2012-11-28 17:44:05.000000000 +0000
+--- configure.orig	2014-09-24 13:04:46.000000000 +0000
 +++ configure
-@@ -675,6 +675,8 @@ LIBTOOL
+@@ -680,6 +680,8 @@ LIBTOOL
  PTHREAD_CFLAGS
  PTHREAD_LIBS
  PTHREAD_CC
@@ -14,7 +14,7 @@ loading libpthread.so through dlopen() is now forbidden
  ax_pthread_config
  ac_ct_AR
  AR
-@@ -13654,7 +13656,7 @@ fi
+@@ -13732,7 +13734,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
  
-@@ -13811,7 +13813,7 @@ fi
+@@ -13889,7 +13891,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 397a8bf5ce9..316d13fdc29 100644
--- a/security/pcsc-lite/patches/patch-src_Makefile.in
+++ b/security/pcsc-lite/patches/patch-src_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile.in,v 1.5 2014/02/25 17:47:19 gdt Exp $
+$NetBSD: patch-src_Makefile.in,v 1.6 2014/10/01 16:27:03 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	2014-02-14 16:17:03.000000000 +0000
+--- src/Makefile.in.orig	2014-09-24 13:04:47.000000000 +0000
 +++ src/Makefile.in
 @@ -396,6 +396,8 @@ POLKIT_LIBS = @POLKIT_LIBS@
  PTHREAD_CC = @PTHREAD_CC@
diff --git a/security/pcsc-lite/patches/patch-src_PCSC_reader.h b/security/pcsc-lite/patches/patch-src_PCSC_reader.h
index a4cef4e87ca..1c98966816d 100644
--- a/security/pcsc-lite/patches/patch-src_PCSC_reader.h
+++ b/security/pcsc-lite/patches/patch-src_PCSC_reader.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_PCSC_reader.h,v 1.1 2012/12/14 23:50:36 pettai Exp $
+$NetBSD: patch-src_PCSC_reader.h,v 1.2 2014/10/01 16:27:03 gdt Exp $
 
 Add NetBSD to apple/sun conditional.
 This should be sent upstream.
 
---- src/PCSC/reader.h.orig	2011-06-22 06:38:16.000000000 +0000
+--- src/PCSC/reader.h.orig	2014-02-14 16:15:44.000000000 +0000
 +++ src/PCSC/reader.h
-@@ -128,7 +128,7 @@
+@@ -155,7 +155,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
  
  /* Set structure elements aligment on bytes
   * http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html */
@@ -14,7 +14,7 @@ This should be sent upstream.
  #pragma pack(1)
  #else
  #pragma pack(push, 1)
-@@ -213,7 +213,7 @@ typedef struct {
+@@ -252,7 +252,7 @@ typedef struct {
  } PIN_PROPERTIES_STRUCTURE;
  
  /* restore default structure elements alignment */
diff --git a/security/pcsc-lite/patches/patch-src_libpscslite.pc.in b/security/pcsc-lite/patches/patch-src_libpscslite.pc.in
index 4fe5b4a8569..caef24721dd 100644
--- a/security/pcsc-lite/patches/patch-src_libpscslite.pc.in
+++ b/security/pcsc-lite/patches/patch-src_libpscslite.pc.in
@@ -1,11 +1,10 @@
-$NetBSD: patch-src_libpscslite.pc.in,v 1.1 2012/11/30 14:28:55 gdt Exp $
+$NetBSD: patch-src_libpscslite.pc.in,v 1.2 2014/10/01 16:27:03 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
+--- src/libpcsclite.pc.in.orig	2013-07-31 17:13:56.000000000 +0000
++++ src/libpcsclite.pc.in
+@@ -9,5 +9,5 @@ Name: PCSC Lite
  Description: PC/SC smart card interface
  Version: @VERSION@
  Libs: -L${libdir} -lpcsclite
diff --git a/security/pcsc-lite/patches/patch-src_spy_Makefile.in b/security/pcsc-lite/patches/patch-src_spy_Makefile.in
index 48207792d33..d281c40e869 100644
--- a/security/pcsc-lite/patches/patch-src_spy_Makefile.in
+++ b/security/pcsc-lite/patches/patch-src_spy_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_spy_Makefile.in,v 1.2 2014/02/25 17:47:19 gdt Exp $
+$NetBSD: patch-src_spy_Makefile.in,v 1.3 2014/10/01 16:27:03 gdt Exp $
 
 Build fix for dlopen() on NetBSD
 
---- src/spy/Makefile.in.orig	2014-02-14 16:17:03.000000000 +0000
+--- src/spy/Makefile.in.orig	2014-09-24 13:04:47.000000000 +0000
 +++ src/spy/Makefile.in
 @@ -124,6 +124,7 @@ am__uninstall_files_from_dir = { \
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
diff --git a/security/pcsc-lite/patches/patch-src_utils.c b/security/pcsc-lite/patches/patch-src_utils.c
index d788ff5d10b..98a8b8e44fb 100644
--- a/security/pcsc-lite/patches/patch-src_utils.c
+++ b/security/pcsc-lite/patches/patch-src_utils.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_utils.c,v 1.1 2012/12/14 23:50:36 pettai Exp $
+$NetBSD: patch-src_utils.c,v 1.2 2014/10/01 16:27:03 gdt Exp $
 
 Make sure libpscslite.so is not linked against -lpthread on NetBSD, as
 loading libpthread.so through dlopen() is now forbidden.
 
---- src/utils.c.orig	2012-12-12 09:49:16.000000000 +0000
+--- src/utils.c.orig	2014-08-08 16:57:27.000000000 +0000
 +++ src/utils.c
-@@ -117,6 +117,7 @@ long int time_sub(struct timeval *a, str
+@@ -151,6 +151,7 @@ long int time_sub(struct timeval *a, str
  	return r.tv_sec * 1000000 + r.tv_usec;
  } /* time_sub */
  
@@ -13,8 +13,8 @@ loading libpthread.so through dlopen() is now forbidden.
  int ThreadCreate(pthread_t * pthThread, int attributes,
  	PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
  {
-@@ -142,3 +143,4 @@ int ThreadCreate(pthread_t * pthThread, 
- 	ret = pthread_attr_destroy(&attr);
+@@ -186,3 +187,4 @@ error:
+ 	pthread_attr_destroy(&attr);
  	return ret;
  }
-+#endif /* LIBPCSCLITE */
++#endif /*  LIBPCSCLITE */