Sat Jun 20 19:03:37 2020 UTC ()
pcsc-lite: updated to 1.9.0:

1.9.0:
- SCardEndTransaction(): greatly improve performances (x300)
- tokenparser: accept any Unicode character in a reader name
- Use /run instead of /var/run by default
- Fix a memory leak from a polkit call
- Some other minor improvements

1.8.26:
- Use poll() instead of select() to allow file descriptor higher than FD_SETSIZE
- Enable reader filtering by default
- pcsc-spy:
  . Do not read output buffer after error
  . Adjust code to handle autoallocated buffers
  . fix year-2038 issue by using long instead of int
- Android: fix compilation
- if client/server protocol mismatch:
  . log an explicit message
  . SCardEstablishContext() returns SCARD_E_SERVICE_STOPPED
- polkit: log the error message if polkit_authority_get_sync() fails
- Exit with EXIT_SUCCESS on shutdown to please systemd
- Doxygen: fix minor issues in the documentation
- Add --disable-documentation option
- Fix a minor memory leak

1.8.25:
- Fix a socket issue when pcscd is used inside LXC container
- pcsc-spy: always provide a total time of execution
- Fix resource leak if SCardEstablishContext() fails
- Fix realloc(3) error handling (possible memory leak)
- Remove usage of function chmod(2) to use fchmod(2) (fix race condition)

1.8.24:
- the project moved to https://pcsclite.apdu.fr/
- SCardGetStatusChange(): Fix a rare race condition
- SCardReleaseContext(): do not release a lock owned by another context
- SCardReconnect(): suspend card auto power off
- Allow "=" in serial driver filenames
- Add the thread id in the pcscd log lines
- pcsc-spy: correctly handle incomplete log file
- Simclist: avoid to divide by zero in list_findpos()
- Some other minor improvements


(adam)
diff -r1.31 -r1.32 pkgsrc/security/pcsc-lite/Makefile
diff -r1.7 -r1.8 pkgsrc/security/pcsc-lite/PLIST
diff -r1.21 -r1.22 pkgsrc/security/pcsc-lite/distinfo
diff -r1.4 -r1.5 pkgsrc/security/pcsc-lite/patches/patch-configure
diff -r1.6 -r1.7 pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in
diff -r0 -r1.1 pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in
diff -r1.2 -r0 pkgsrc/security/pcsc-lite/patches/patch-src_libpscslite.pc.in
diff -r1.3 -r0 pkgsrc/security/pcsc-lite/patches/patch-src_spy_Makefile.in
diff -r1.2 -r1.3 pkgsrc/security/pcsc-lite/patches/patch-src_utils.c
cvs diff -r1.31 -r1.32 pkgsrc/security/pcsc-lite/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/Makefile 2019/11/04 21:12:57 1.31
+++ pkgsrc/security/pcsc-lite/Makefile 2020/06/20 19:03:37 1.32
@@ -1,45 +1,39 @@ @@ -1,45 +1,39 @@
1# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:57 rillig Exp $ 1# $NetBSD: Makefile,v 1.32 2020/06/20 19:03:37 adam Exp $
2 2
3DISTNAME= pcsc-lite-1.8.24 3DISTNAME= pcsc-lite-1.9.0
4PKGREVISION= 1 
5CATEGORIES= security 4CATEGORIES= security
6# Note that the MASTER_SITES URL is not stable with version changes, 5# 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 6# and one can end up with an old version if DISTNAME is changed but
8# not the magic number in MASTER_SITES. 7# not the magic number in MASTER_SITES.
9# https://alioth.debian.org/frs/?group_id=30105&release_id=2031#pcsclite-_1.8.18-title-content 8# https://alioth.debian.org/frs/?group_id=30105&release_id=2031#pcsclite-_1.8.18-title-content
10MASTER_SITES= https://pcsclite.apdu.fr/files/ 9MASTER_SITES= https://pcsclite.apdu.fr/files/
11EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
12 11
13MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://pcsclite.apdu.fr/ 13HOMEPAGE= https://pcsclite.apdu.fr/
15 
16COMMENT= Middleware to access a smart card using SCard API (PC/SC) 14COMMENT= Middleware to access a smart card using SCard API (PC/SC)
17LICENSE= modified-bsd 15LICENSE= modified-bsd
18 16
19GNU_CONFIGURE= yes 17USE_LANGUAGES= c c++
20USE_LIBTOOL= yes 18USE_LIBTOOL= yes
21USE_TOOLS+= pkg-config gmake 19USE_TOOLS+= pkg-config gmake
22USE_LANGUAGES= c c++ 20GNU_CONFIGURE= yes
23 21
24.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
25 23
26PLIST_VARS+= spy 24CONFIGURE_ARGS+= --sharedstatedir=${VARBASE}
27#REPLACE_PYTHON= src/spy/pcsc-spy 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
28#.include "../../lang/python/application.mk" 26CONFIGURE_ARGS+= --enable-confdir=${PKG_SYSCONFDIR}/reader.conf.d
29 
30CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} 
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 
32CONFIGURE_ARGS+= --enable-confdir=${PKG_SYSCONFDIR:Q}/reader.conf.d 
33CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite 27CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite
34CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers 28CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers
35CONFIGURE_ARGS+= --disable-libudev 29CONFIGURE_ARGS+= --disable-libudev
36CONFIGURE_ARGS+= --disable-libsystemd 30CONFIGURE_ARGS+= --disable-libsystemd
37MAKE_DIRS+= ${VARBASE}/pcsc-lite 31MAKE_DIRS+= ${VARBASE}/pcsc-lite
38MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite 32MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite
39MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite/drivers 33MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite/drivers
40MAKE_DIRS+= ${PKG_SYSCONFDIR}/reader.conf.d 34MAKE_DIRS+= ${PKG_SYSCONFDIR}/reader.conf.d
41 35
42EGDIR= ${PREFIX}/share/examples/pcsc-lite 36EGDIR= ${PREFIX}/share/examples/pcsc-lite
43 37
44PKGCONFIG_OVERRIDE+= src/libpcsclite.pc.in 38PKGCONFIG_OVERRIDE+= src/libpcsclite.pc.in
45 39
cvs diff -r1.7 -r1.8 pkgsrc/security/pcsc-lite/PLIST (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/PLIST 2015/01/15 20:56:03 1.7
+++ pkgsrc/security/pcsc-lite/PLIST 2020/06/20 19:03:37 1.8
@@ -1,17 +1,14 @@ @@ -1,17 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2015/01/15 20:56:03 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.8 2020/06/20 19:03:37 adam Exp $
2${PLIST.spy}bin/pcsc-spy 
3include/PCSC/debuglog.h 2include/PCSC/debuglog.h
4include/PCSC/ifdhandler.h 3include/PCSC/ifdhandler.h
5include/PCSC/pcsclite.h 4include/PCSC/pcsclite.h
6include/PCSC/reader.h 5include/PCSC/reader.h
7include/PCSC/winscard.h 6include/PCSC/winscard.h
8include/PCSC/wintypes.h 7include/PCSC/wintypes.h
9lib/libpcsclite.la 8lib/libpcsclite.la
10${PLIST.spy}lib/libpcscspy.la 
11lib/pkgconfig/libpcsclite.pc 9lib/pkgconfig/libpcsclite.pc
12${PLIST.spy}man/man1/pcsc-spy.1 
13man/man5/reader.conf.5 10man/man5/reader.conf.5
14man/man8/pcscd.8 11man/man8/pcscd.8
15sbin/pcscd 12sbin/pcscd
16share/doc/pcsc-lite/README.DAEMON 13share/doc/pcsc-lite/README.DAEMON
17share/doc/pcsc-lite/README.polkit 14share/doc/pcsc-lite/README.polkit
cvs diff -r1.21 -r1.22 pkgsrc/security/pcsc-lite/distinfo (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/distinfo 2018/10/13 10:52:35 1.21
+++ pkgsrc/security/pcsc-lite/distinfo 2020/06/20 19:03:37 1.22
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.21 2018/10/13 10:52:35 mlelstv Exp $ 1$NetBSD: distinfo,v 1.22 2020/06/20 19:03:37 adam Exp $
2 2
3SHA1 (pcsc-lite-1.8.24.tar.bz2) = a5d48615cddb2b7050b4dc195e938a5d39ef62c4 3SHA1 (pcsc-lite-1.9.0.tar.bz2) = 15d0ef0282deceae5c0061e11bdc9d18691483c4
4RMD160 (pcsc-lite-1.8.24.tar.bz2) = 58fa45643f0348456d5b32a61f188849515f82c4 4RMD160 (pcsc-lite-1.9.0.tar.bz2) = 62ada092b76a8c512ad67a138b1446c53f746f5d
5SHA512 (pcsc-lite-1.8.24.tar.bz2) = df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c 5SHA512 (pcsc-lite-1.9.0.tar.bz2) = 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
6Size (pcsc-lite-1.8.24.tar.bz2) = 755670 bytes 6Size (pcsc-lite-1.9.0.tar.bz2) = 755963 bytes
7SHA1 (patch-configure) = 2b0e0065c14d7625469c85e29ce3a47806a1cf55 7SHA1 (patch-configure) = d421ffddf787a01c8655c34dda0e4708978c1c6c
8SHA1 (patch-src_Makefile.in) = 5ada9cc404927ac9f44824bce1c4a815832a2ac1 8SHA1 (patch-src_Makefile.in) = 077837434e4cf503b9556e45102603c408ccb0cb
9SHA1 (patch-src_PCSC_reader.h) = 8ea2b7be9b3bae56cdae64b950373c8eeda2813a 9SHA1 (patch-src_PCSC_reader.h) = 8ea2b7be9b3bae56cdae64b950373c8eeda2813a
10SHA1 (patch-src_libpscslite.pc.in) = ba1c8ed98ce81f1fc40ecc8af1b44d0cff8537df 10SHA1 (patch-src_libpcsclite.pc.in) = ba1c8ed98ce81f1fc40ecc8af1b44d0cff8537df
11SHA1 (patch-src_spy_Makefile.in) = b50d3d0365409a2f718ac61f698a97e6e2e834db 11SHA1 (patch-src_utils.c) = 7bfca2b5a097c6a3d4b7736933b670d1d0d63f76
12SHA1 (patch-src_utils.c) = 39c9126fb4f4b67a96328ba5abd448bf007cbbea 
cvs diff -r1.4 -r1.5 pkgsrc/security/pcsc-lite/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/patches/patch-configure 2014/10/01 16:27:03 1.4
+++ pkgsrc/security/pcsc-lite/patches/patch-configure 2020/06/20 19:03:37 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-configure,v 1.4 2014/10/01 16:27:03 gdt Exp $ 1$NetBSD: patch-configure,v 1.5 2020/06/20 19:03:37 adam Exp $
2 2
3Make sure libpscslite.so is not linked against -lphtread on NetBSD, as 3Make sure libpcsclite.so is not linked against -lphtread on NetBSD, as
4loading libpthread.so through dlopen() is now forbidden 4loading libpthread.so through dlopen() is now forbidden
5 5
6--- configure.orig 2014-09-24 13:04:46.000000000 +0000 6--- configure.orig 2014-09-24 13:04:46.000000000 +0000
7+++ configure 7+++ configure
8@@ -680,6 +680,8 @@ LIBTOOL 8@@ -680,6 +680,8 @@ LIBTOOL
9 PTHREAD_CFLAGS 9 PTHREAD_CFLAGS
10 PTHREAD_LIBS 10 PTHREAD_LIBS
11 PTHREAD_CC 11 PTHREAD_CC
12+LIBPCSC_PTHREAD_CFLAGS 12+LIBPCSC_PTHREAD_CFLAGS
13+LIBPCSC_PTHREAD_LIBS 13+LIBPCSC_PTHREAD_LIBS
14 ax_pthread_config 14 ax_pthread_config
15 ac_ct_AR 15 ac_ct_AR
16 AR 16 AR
cvs diff -r1.6 -r1.7 pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in 2014/10/01 16:27:03 1.6
+++ pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in 2020/06/20 19:03:37 1.7
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1$NetBSD: patch-src_Makefile.in,v 1.6 2014/10/01 16:27:03 gdt Exp $ 1$NetBSD: patch-src_Makefile.in,v 1.7 2020/06/20 19:03:37 adam Exp $
2 2
3Make sure libpscslite.so is not linked against -lpthread on NetBSD, as 3Make sure libpcsclite.so is not linked against -lpthread on NetBSD, as
4loading libpthread.so through dlopen() is now forbidden. 4loading libpthread.so through dlopen() is now forbidden.
5Disable installation of pcsc-spy 5Disable installation of pcsc-spy
6 6
7--- src/Makefile.in.orig 2014-09-24 13:04:47.000000000 +0000 7--- src/Makefile.in.orig 2020-06-14 13:43:23.000000000 +0000
8+++ src/Makefile.in 8+++ src/Makefile.in
9@@ -396,6 +396,8 @@ POLKIT_LIBS = @POLKIT_LIBS@ 9@@ -436,6 +436,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@@ -466,7 +468,7 @@ top_builddir = @top_builddir@ 18@@ -507,7 +509,6 @@ 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 
24 AM_CPPFLAGS = -I$(top_srcdir)/src/PCSC -I$(top_builddir)/src/PCSC \ 23 AM_CPPFLAGS = -I$(top_srcdir)/src/PCSC -I$(top_builddir)/src/PCSC \
25 $(SYMBOL_VISIBILITY) 24 $(SYMBOL_VISIBILITY)
26  25
27@@ -490,8 +492,8 @@ libpcsclite_la_SOURCES = \ 26@@ -529,8 +530,8 @@ libpcsclite_la_SOURCES = \
28 winscard_msg.c 27 winscard_msg.c
29  28
30 libpcsclite_la_LDFLAGS = -version-info 1:0:0 29 libpcsclite_la_LDFLAGS = -version-info 1:0:0
31-libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE 30-libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE
32-libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) 31-libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
33+libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE 32+libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE
34+libpcsclite_la_LIBADD = $(LIBPCSC_PTHREAD_CFLAGS) $(PTHREAD_LIBS) 33+libpcsclite_la_LIBADD = $(LIBPCSC_PTHREAD_CFLAGS) $(PTHREAD_LIBS)
35 pcscd_SOURCES = \ 34 pcscd_SOURCES = \
36 auth.c \ 35 auth.c \
37 auth.h \ 36 auth.h \
File Added: pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in
$NetBSD: patch-src_libpcsclite.pc.in,v 1.1 2020/06/20 19:03:37 adam Exp $

Make sure dependencies (opensc) do not get -pthread.

--- 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
-Libs.private: @PTHREAD_LIBS@
-Cflags: -I${includedir} @PTHREAD_CFLAGS@
+Libs.private:
+Cflags: -I${includedir}
File Deleted: pkgsrc/security/pcsc-lite/patches/Attic/patch-src_libpscslite.pc.in
File Deleted: pkgsrc/security/pcsc-lite/patches/Attic/patch-src_spy_Makefile.in
cvs diff -r1.2 -r1.3 pkgsrc/security/pcsc-lite/patches/Attic/patch-src_utils.c (expand / switch to unified diff)

--- pkgsrc/security/pcsc-lite/patches/Attic/patch-src_utils.c 2014/10/01 16:27:03 1.2
+++ pkgsrc/security/pcsc-lite/patches/Attic/patch-src_utils.c 2020/06/20 19:03:37 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-src_utils.c,v 1.2 2014/10/01 16:27:03 gdt Exp $ 1$NetBSD: patch-src_utils.c,v 1.3 2020/06/20 19:03:37 adam Exp $
2 2
3Make sure libpscslite.so is not linked against -lpthread on NetBSD, as 3Make sure libpcsclite.so is not linked against -lpthread on NetBSD, as
4loading libpthread.so through dlopen() is now forbidden. 4loading libpthread.so through dlopen() is now forbidden.
5 5
6--- src/utils.c.orig 2014-08-08 16:57:27.000000000 +0000 6--- src/utils.c.orig 2014-08-08 16:57:27.000000000 +0000
7+++ src/utils.c 7+++ src/utils.c
8@@ -151,6 +151,7 @@ long int time_sub(struct timeval *a, str 8@@ -151,6 +151,7 @@ long int time_sub(struct timeval *a, str
9 return r.tv_sec * 1000000 + r.tv_usec; 9 return r.tv_sec * 1000000 + r.tv_usec;
10 } /* time_sub */ 10 } /* time_sub */
11  11
12+#ifndef LIBPCSCLITE 12+#ifndef LIBPCSCLITE
13 int ThreadCreate(pthread_t * pthThread, int attributes, 13 int ThreadCreate(pthread_t * pthThread, int attributes,
14 PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg) 14 PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
15 { 15 {
16@@ -186,3 +187,4 @@ error: 16@@ -186,3 +187,4 @@ error: