CVS commit: pkgsrc/security/pcsc-lite

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed May  8 18:47:37 UTC 2024

Modified Files:
        pkgsrc/security/pcsc-lite: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/pcsc-lite/patches: patch-meson.build
Removed Files:
        pkgsrc/security/pcsc-lite/patches: patch-configure
            patch-src_Makefile.in patch-src_libpcsclite.pc.in

Log Message:
pcsc-lite: updated to 2.2.1

2.2.1: Ludovic Rousseau

- fix meson related issues
- Some code cleanup

2.2.0: Ludovic Rousseau

- provide files for meson build tool (replaces autoconf/auoomake)
- fix a missing symbol in libpcscspy (bug introduced by the previous version)
- fix shutdown issues with hotplug_libusb
- update pcsc-spy manpage
- update copyright date
- Some other minor improvements


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/security/pcsc-lite/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/pcsc-lite/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/pcsc-lite/distinfo
cvs rdiff -u -r1.6 -r0 pkgsrc/security/pcsc-lite/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pcsc-lite/patches/patch-meson.build
cvs rdiff -u -r1.9 -r0 \
    pkgsrc/security/pcsc-lite/patches/patch-src_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/pcsc-lite/patches/patch-src_libpcsclite.pc.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/pcsc-lite/Makefile
diff -u pkgsrc/security/pcsc-lite/Makefile:1.41 pkgsrc/security/pcsc-lite/Makefile:1.42
--- pkgsrc/security/pcsc-lite/Makefile:1.41     Sun Apr 14 05:54:18 2024
+++ pkgsrc/security/pcsc-lite/Makefile  Wed May  8 18:47:37 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2024/04/14 05:54:18 adam Exp $
+# $NetBSD: Makefile,v 1.42 2024/05/08 18:47:37 adam Exp $
 
-DISTNAME=      pcsc-lite-2.1.0
+DISTNAME=      pcsc-lite-2.2.1
 CATEGORIES=    security
 MASTER_SITES=  https://pcsclite.apdu.fr/files/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://pcsclite.apdu.fr/
@@ -11,32 +11,32 @@ COMMENT=    Middleware to access a smart ca
 LICENSE=       modified-bsd
 
 USE_LANGUAGES= c c++
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config gmake flex
-GNU_CONFIGURE= yes
+USE_TOOLS+=    flex pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
-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
-CONFIGURE_ARGS+=       --disable-libsystemd
-MAKE_DIRS+=            ${VARBASE}/pcsc-lite
-MAKE_DIRS+=            ${PREFIX}/lib/pcsc-lite
-MAKE_DIRS+=            ${PREFIX}/lib/pcsc-lite/drivers
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}/reader.conf.d
+MESON_ARGS+=   -Dipcdir=${VARBASE}/pcsc-lite
+MESON_ARGS+=   -Dlibsystemd=false
+MESON_ARGS+=   -Dlibudev=false
+MESON_ARGS+=   -Dserialconfdir=${PKG_SYSCONFDIR}/reader.conf.d
+MESON_ARGS+=   -Dusbdropdir=${PREFIX}/lib/pcsc-lite/drivers
+
+MAKE_DIRS+=    ${VARBASE}/pcsc-lite
+MAKE_DIRS+=    ${PREFIX}/lib/pcsc-lite
+MAKE_DIRS+=    ${PREFIX}/lib/pcsc-lite/drivers
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/reader.conf.d
 
 EGDIR=                 ${PREFIX}/share/examples/pcsc-lite
 
 PKGCONFIG_OVERRIDE+=   src/libpcsclite.pc.in
+REPLACE_PYTHON+=       src/spy/pcsc-spy
 
 BUILD_DEFS+=           VARBASE
 RCD_SCRIPTS=           pcscd
 
 .include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/application.mk"
 .include "../../security/polkit/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/security/pcsc-lite/PLIST
diff -u pkgsrc/security/pcsc-lite/PLIST:1.11 pkgsrc/security/pcsc-lite/PLIST:1.12
--- pkgsrc/security/pcsc-lite/PLIST:1.11        Sun Apr 14 05:54:18 2024
+++ pkgsrc/security/pcsc-lite/PLIST     Wed May  8 18:47:37 2024
@@ -1,15 +1,20 @@
-@comment $NetBSD: PLIST,v 1.11 2024/04/14 05:54:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/05/08 18:47:37 adam Exp $
+bin/pcsc-spy
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
 include/PCSC/pcsclite.h
 include/PCSC/reader.h
 include/PCSC/winscard.h
 include/PCSC/wintypes.h
-lib/libpcsclite.la
-lib/libpcsclite_real.la
+lib/libpcsclite.so
+lib/libpcsclite.so.1
+lib/libpcsclite_real.so
+lib/libpcsclite_real.so.1
+lib/libpcscspy.so
+lib/libpcscspy.so.0
 lib/pkgconfig/libpcsclite.pc
-man/man5/reader.conf.5
+man/man1/pcsc-spy.1
 man/man8/pcscd.8
 sbin/pcscd
-share/doc/pcsc-lite/README.polkit
+share/doc/pcsc-lite/setup_spy.sh
 share/polkit-1/actions/org.debian.pcsc-lite.policy

Index: pkgsrc/security/pcsc-lite/distinfo
diff -u pkgsrc/security/pcsc-lite/distinfo:1.31 pkgsrc/security/pcsc-lite/distinfo:1.32
--- pkgsrc/security/pcsc-lite/distinfo:1.31     Sun Apr 14 05:54:18 2024
+++ pkgsrc/security/pcsc-lite/distinfo  Wed May  8 18:47:37 2024
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.31 2024/04/14 05:54:18 adam Exp $
+$NetBSD: distinfo,v 1.32 2024/05/08 18:47:37 adam Exp $
 
-BLAKE2s (pcsc-lite-2.1.0.tar.bz2) = f39ad5c446dd38940c3d0d9dedca26673c4650130084918a048e851bf8f43051
-SHA512 (pcsc-lite-2.1.0.tar.bz2) = 3e69631fba7a246935a654a6e750cd3d3826ceff15d606558b168f57c6d7627afea46b90e996c82734b705c76084f9259d057c68f49797bbc90359aa3d1c8992
-Size (pcsc-lite-2.1.0.tar.bz2) = 825196 bytes
-SHA1 (patch-configure) = ff31450a3d94bd0d85ca8d94630583e5095124db
-SHA1 (patch-src_Makefile.in) = 90e5e7493cc7a60b4142d512c426815154ba78f2
-SHA1 (patch-src_libpcsclite.pc.in) = ba1c8ed98ce81f1fc40ecc8af1b44d0cff8537df
+BLAKE2s (pcsc-lite-2.2.1.tar.xz) = 06b92263795c1eb3dc440f65c2edcd1d4c5aff20f07c044c1cf2f2d349a28bae
+SHA512 (pcsc-lite-2.2.1.tar.xz) = 691898140247b3206e3c93f38bf5e8227a88178ab691179ee55d57e870af73b6c26b0487ae78891fb417a169beceda18d99721574e48ee112e2fce2e12120d41
+Size (pcsc-lite-2.2.1.tar.xz) = 207664 bytes
+SHA1 (patch-meson.build) = 34e7c0b0af2191d6dd5f270c154beefb84fbc1b8

Added files:

Index: pkgsrc/security/pcsc-lite/patches/patch-meson.build
diff -u /dev/null pkgsrc/security/pcsc-lite/patches/patch-meson.build:1.1
--- /dev/null   Wed May  8 18:47:37 2024
+++ pkgsrc/security/pcsc-lite/patches/patch-meson.build Wed May  8 18:47:37 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.1 2024/05/08 18:47:37 adam Exp $
+
+Make sure dependencies (opensc) do not get -pthread.
+
+--- meson.build.orig   2024-05-08 15:33:12.267694241 +0000
++++ meson.build
+@@ -267,7 +267,6 @@ endif
+ pkg = import('pkgconfig')
+ pkg.generate(
+   libraries : '-L${libdir} -lpcsclite',
+-  libraries_private : '-pthread',
+   subdirs : 'PCSC',
+   version : meson.project_version(),
+   name : 'PCSC Lite',