Received: by mail.netbsd.org (Postfix, from userid 605) id 1DF2284E09; Sat, 20 Jun 2020 19:03:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9850084DF4 for ; Sat, 20 Jun 2020 19:03:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Fo7WIw_TNp8h for ; Sat, 20 Jun 2020 19:03:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8D2E984D60 for ; Sat, 20 Jun 2020 19:03:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 82266FB28; Sat, 20 Jun 2020 19:03:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592679817243910" MIME-Version: 1.0 Date: Sat, 20 Jun 2020 19:03:37 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/security/pcsc-lite To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200620190337.82266FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1592679817243910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat Jun 20 19:03:37 UTC 2020 Modified Files: pkgsrc/security/pcsc-lite: Makefile PLIST distinfo pkgsrc/security/pcsc-lite/patches: patch-configure patch-src_Makefile.in patch-src_utils.c Added Files: pkgsrc/security/pcsc-lite/patches: patch-src_libpcsclite.pc.in Removed Files: pkgsrc/security/pcsc-lite/patches: patch-src_libpscslite.pc.in patch-src_spy_Makefile.in Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/pcsc-lite/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/pcsc-lite/PLIST cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/pcsc-lite/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/pcsc-lite/patches/patch-configure cvs rdiff -u -r1.6 -r1.7 \ pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in cvs rdiff -u -r1.2 -r0 \ pkgsrc/security/pcsc-lite/patches/patch-src_libpscslite.pc.in cvs rdiff -u -r1.3 -r0 \ pkgsrc/security/pcsc-lite/patches/patch-src_spy_Makefile.in cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/pcsc-lite/patches/patch-src_utils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1592679817243910 Content-Disposition: inline Content-Length: 8211 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/pcsc-lite/Makefile diff -u pkgsrc/security/pcsc-lite/Makefile:1.31 pkgsrc/security/pcsc-lite/Makefile:1.32 --- pkgsrc/security/pcsc-lite/Makefile:1.31 Mon Nov 4 21:12:57 2019 +++ pkgsrc/security/pcsc-lite/Makefile Sat Jun 20 19:03:37 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:57 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2020/06/20 19:03:37 adam Exp $ -DISTNAME= pcsc-lite-1.8.24 -PKGREVISION= 1 +DISTNAME= pcsc-lite-1.9.0 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 @@ -12,24 +11,19 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://pcsclite.apdu.fr/ - COMMENT= Middleware to access a smart card using SCard API (PC/SC) LICENSE= modified-bsd -GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake -USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes .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 +CONFIGURE_ARGS+= --sharedstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-confdir=${PKG_SYSCONFDIR}/reader.conf.d CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers CONFIGURE_ARGS+= --disable-libudev Index: pkgsrc/security/pcsc-lite/PLIST diff -u pkgsrc/security/pcsc-lite/PLIST:1.7 pkgsrc/security/pcsc-lite/PLIST:1.8 --- pkgsrc/security/pcsc-lite/PLIST:1.7 Thu Jan 15 20:56:03 2015 +++ pkgsrc/security/pcsc-lite/PLIST Sat Jun 20 19:03:37 2020 @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2015/01/15 20:56:03 wiz Exp $ -${PLIST.spy}bin/pcsc-spy +@comment $NetBSD: PLIST,v 1.8 2020/06/20 19:03:37 adam Exp $ include/PCSC/debuglog.h include/PCSC/ifdhandler.h include/PCSC/pcsclite.h @@ -7,9 +6,7 @@ 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 Index: pkgsrc/security/pcsc-lite/distinfo diff -u pkgsrc/security/pcsc-lite/distinfo:1.21 pkgsrc/security/pcsc-lite/distinfo:1.22 --- pkgsrc/security/pcsc-lite/distinfo:1.21 Sat Oct 13 10:52:35 2018 +++ pkgsrc/security/pcsc-lite/distinfo Sat Jun 20 19:03:37 2020 @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.21 2018/10/13 10:52:35 mlelstv Exp $ +$NetBSD: distinfo,v 1.22 2020/06/20 19:03:37 adam Exp $ -SHA1 (pcsc-lite-1.8.24.tar.bz2) = a5d48615cddb2b7050b4dc195e938a5d39ef62c4 -RMD160 (pcsc-lite-1.8.24.tar.bz2) = 58fa45643f0348456d5b32a61f188849515f82c4 -SHA512 (pcsc-lite-1.8.24.tar.bz2) = df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c -Size (pcsc-lite-1.8.24.tar.bz2) = 755670 bytes -SHA1 (patch-configure) = 2b0e0065c14d7625469c85e29ce3a47806a1cf55 -SHA1 (patch-src_Makefile.in) = 5ada9cc404927ac9f44824bce1c4a815832a2ac1 +SHA1 (pcsc-lite-1.9.0.tar.bz2) = 15d0ef0282deceae5c0061e11bdc9d18691483c4 +RMD160 (pcsc-lite-1.9.0.tar.bz2) = 62ada092b76a8c512ad67a138b1446c53f746f5d +SHA512 (pcsc-lite-1.9.0.tar.bz2) = 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3 +Size (pcsc-lite-1.9.0.tar.bz2) = 755963 bytes +SHA1 (patch-configure) = d421ffddf787a01c8655c34dda0e4708978c1c6c +SHA1 (patch-src_Makefile.in) = 077837434e4cf503b9556e45102603c408ccb0cb 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 +SHA1 (patch-src_libpcsclite.pc.in) = ba1c8ed98ce81f1fc40ecc8af1b44d0cff8537df +SHA1 (patch-src_utils.c) = 7bfca2b5a097c6a3d4b7736933b670d1d0d63f76 Index: pkgsrc/security/pcsc-lite/patches/patch-configure diff -u pkgsrc/security/pcsc-lite/patches/patch-configure:1.4 pkgsrc/security/pcsc-lite/patches/patch-configure:1.5 --- pkgsrc/security/pcsc-lite/patches/patch-configure:1.4 Wed Oct 1 16:27:03 2014 +++ pkgsrc/security/pcsc-lite/patches/patch-configure Sat Jun 20 19:03:37 2020 @@ -1,6 +1,6 @@ -$NetBSD: patch-configure,v 1.4 2014/10/01 16:27:03 gdt Exp $ +$NetBSD: patch-configure,v 1.5 2020/06/20 19:03:37 adam Exp $ -Make sure libpscslite.so is not linked against -lphtread on NetBSD, as +Make sure libpcsclite.so is not linked against -lphtread on NetBSD, as loading libpthread.so through dlopen() is now forbidden --- configure.orig 2014-09-24 13:04:46.000000000 +0000 Index: pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in diff -u pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in:1.6 pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in:1.7 --- pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in:1.6 Wed Oct 1 16:27:03 2014 +++ pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in Sat Jun 20 19:03:37 2020 @@ -1,12 +1,12 @@ -$NetBSD: patch-src_Makefile.in,v 1.6 2014/10/01 16:27:03 gdt Exp $ +$NetBSD: patch-src_Makefile.in,v 1.7 2020/06/20 19:03:37 adam Exp $ -Make sure libpscslite.so is not linked against -lpthread on NetBSD, as +Make sure libpcsclite.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-09-24 13:04:47.000000000 +0000 +--- src/Makefile.in.orig 2020-06-14 13:43:23.000000000 +0000 +++ src/Makefile.in -@@ -396,6 +396,8 @@ POLKIT_LIBS = @POLKIT_LIBS@ +@@ -436,6 +436,8 @@ POLKIT_LIBS = @POLKIT_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -15,16 +15,15 @@ Disable installation of pcsc-spy RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ -@@ -466,7 +468,7 @@ top_builddir = @top_builddir@ +@@ -507,7 +509,6 @@ 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) -@@ -490,8 +492,8 @@ libpcsclite_la_SOURCES = \ +@@ -529,8 +530,8 @@ libpcsclite_la_SOURCES = \ winscard_msg.c libpcsclite_la_LDFLAGS = -version-info 1:0:0 Index: pkgsrc/security/pcsc-lite/patches/patch-src_utils.c diff -u pkgsrc/security/pcsc-lite/patches/patch-src_utils.c:1.2 pkgsrc/security/pcsc-lite/patches/patch-src_utils.c:1.3 --- pkgsrc/security/pcsc-lite/patches/patch-src_utils.c:1.2 Wed Oct 1 16:27:03 2014 +++ pkgsrc/security/pcsc-lite/patches/patch-src_utils.c Sat Jun 20 19:03:37 2020 @@ -1,6 +1,6 @@ -$NetBSD: patch-src_utils.c,v 1.2 2014/10/01 16:27:03 gdt Exp $ +$NetBSD: patch-src_utils.c,v 1.3 2020/06/20 19:03:37 adam Exp $ -Make sure libpscslite.so is not linked against -lpthread on NetBSD, as +Make sure libpcsclite.so is not linked against -lpthread on NetBSD, as loading libpthread.so through dlopen() is now forbidden. --- src/utils.c.orig 2014-08-08 16:57:27.000000000 +0000 Added files: Index: pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in diff -u /dev/null pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in:1.1 --- /dev/null Sat Jun 20 19:03:37 2020 +++ pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in Sat Jun 20 19:03:37 2020 @@ -0,0 +1,14 @@ +$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} --_----------=_1592679817243910--