CVS commit: pkgsrc/security/pcsc-lite

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Dec 27 14:39:54 UTC 2024

Modified Files:
        pkgsrc/security/pcsc-lite: Makefile PLIST distinfo options.mk
        pkgsrc/security/pcsc-lite/patches: patch-meson.build

Log Message:
security/pcsc-lite: Adjust previous based on upstream advice

  - do not install config file; it's for systemd only
  - detangle lib/defines/OS when switching on an implementation that
    uses the lib and defines.  Builds on NetBSD and is likely to work
    where upstream code works


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/security/pcsc-lite/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/pcsc-lite/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/pcsc-lite/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/pcsc-lite/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/pcsc-lite/patches/patch-meson.build

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.50 pkgsrc/security/pcsc-lite/Makefile:1.51
--- pkgsrc/security/pcsc-lite/Makefile:1.50     Fri Dec 27 12:37:28 2024
+++ pkgsrc/security/pcsc-lite/Makefile  Fri Dec 27 14:39:53 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2024/12/27 12:37:28 gdt Exp $
+# $NetBSD: Makefile,v 1.51 2024/12/27 14:39:53 gdt Exp $
 
 DISTNAME=      pcsc-lite-2.3.1
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://pcsclite.apdu.fr/files/
 EXTRACT_SUFX=  .tar.xz
@@ -41,16 +42,6 @@ REPLACE_PYTHON+=     src/spy/pcsc-spy
 BUILD_DEFS+=           VARBASE
 RCD_SCRIPTS=           pcscd
 
-# Reported upstream by email 20241227.  New "default" config file
-# installed in Linuxy place.  For now, hackily move it to be an
-# example,
-post-install:
-       ${MKDIR} -p ${DESTDIR}${PREFIX}/share/examples/pcsc-lite
-       ${MV} ${DESTDIR}${PREFIX}/etc/default/pcscd \
-             ${DESTDIR}${PREFIX}/share/examples/pcsc-lite
-       ${RMDIR} ${DESTDIR}${PREFIX}/etc/default
-       ${RMDIR} ${DESTDIR}${PREFIX}/etc
-
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/security/pcsc-lite/PLIST
diff -u pkgsrc/security/pcsc-lite/PLIST:1.16 pkgsrc/security/pcsc-lite/PLIST:1.17
--- pkgsrc/security/pcsc-lite/PLIST:1.16        Fri Dec 27 12:37:28 2024
+++ pkgsrc/security/pcsc-lite/PLIST     Fri Dec 27 14:39:53 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2024/12/27 12:37:28 gdt Exp $
+@comment $NetBSD: PLIST,v 1.17 2024/12/27 14:39:53 gdt Exp $
 bin/pcsc-spy
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
@@ -19,5 +19,5 @@ man/man5/reader.conf.5
 man/man8/pcscd.8
 sbin/pcscd
 share/doc/pcsc-lite/setup_spy.sh
-share/examples/pcsc-lite/pcscd
 share/metainfo/fr.apdu.pcsclite.metainfo.xml
+${PLIST.polkit}share/polkit-1/actions/org.debian.pcsc-lite.policy

Index: pkgsrc/security/pcsc-lite/distinfo
diff -u pkgsrc/security/pcsc-lite/distinfo:1.37 pkgsrc/security/pcsc-lite/distinfo:1.38
--- pkgsrc/security/pcsc-lite/distinfo:1.37     Fri Dec 27 12:37:28 2024
+++ pkgsrc/security/pcsc-lite/distinfo  Fri Dec 27 14:39:53 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.37 2024/12/27 12:37:28 gdt Exp $
+$NetBSD: distinfo,v 1.38 2024/12/27 14:39:53 gdt Exp $
 
 BLAKE2s (pcsc-lite-2.3.1.tar.xz) = c9bfe1fc91074ca45ca971e1d2179f4ef54aa54123f42c5e0ee5cbf397db3398
 SHA512 (pcsc-lite-2.3.1.tar.xz) = ec70ab3cf338299b3a493344c176b73450631da208714f3ac0fb4d6aa942fdc7487467b971246407fc4f1815fe5e48a0f29dcc109fb5fef838fbce7a2207d87b
 Size (pcsc-lite-2.3.1.tar.xz) = 209724 bytes
-SHA1 (patch-meson.build) = 34e7c0b0af2191d6dd5f270c154beefb84fbc1b8
+SHA1 (patch-meson.build) = 7b3c5a205350ff8a9b257fd5128f6ef597e805ba
+SHA1 (patch-src_auth.c) = aea4b4a0d856efd2b4fd7b8d2ee5f6c54dc59f05
 SHA1 (patch-src_configfile.l) = 2283637df38919f1e7b47beb5a8e6a8b3619b12b

Index: pkgsrc/security/pcsc-lite/options.mk
diff -u pkgsrc/security/pcsc-lite/options.mk:1.5 pkgsrc/security/pcsc-lite/options.mk:1.6
--- pkgsrc/security/pcsc-lite/options.mk:1.5    Fri Dec 27 12:37:29 2024
+++ pkgsrc/security/pcsc-lite/options.mk        Fri Dec 27 14:39:53 2024
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.5 2024/12/27 12:37:29 gdt Exp $
+# $NetBSD: options.mk,v 1.6 2024/12/27 14:39:53 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pcsc-lite
 
 PKG_SUPPORTED_OPTIONS=         polkit
-# Do not suggest polkit, because pcsc-lite fails to build on NetBSD if it
-# is present.  Reported upstream by email 20241227. -gdt
-PKG_SUGGESTED_OPTIONS=
+# polkit is only used on systems that support LOCALCRED (but not
+# LOCAL_CREDS).  \todo Don't suggest on systems where it doesn't help,
+# to reduce bloat.
+PKG_SUGGESTED_OPTIONS=         polkit
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/security/pcsc-lite/patches/patch-meson.build
diff -u pkgsrc/security/pcsc-lite/patches/patch-meson.build:1.1 pkgsrc/security/pcsc-lite/patches/patch-meson.build:1.2
--- pkgsrc/security/pcsc-lite/patches/patch-meson.build:1.1     Wed May  8 18:47:37 2024
+++ pkgsrc/security/pcsc-lite/patches/patch-meson.build Fri Dec 27 14:39:53 2024
@@ -1,10 +1,26 @@
-$NetBSD: patch-meson.build,v 1.1 2024/05/08 18:47:37 adam Exp $
+$NetBSD: patch-meson.build,v 1.2 2024/12/27 14:39:53 gdt Exp $
+
+Do not install file to set environment variables for systemd.
+Reported upstream by email 20241227 (as a bug that systemd files are
+installed on systems without systemd).
 
 Make sure dependencies (opensc) do not get -pthread.
+\todo Report upstream.
 
---- meson.build.orig   2024-05-08 15:33:12.267694241 +0000
+--- meson.build.orig   2024-12-24 10:16:27.000000000 +0000
 +++ meson.build
-@@ -267,7 +267,6 @@ endif
+@@ -264,10 +264,6 @@ install_data('etc/fr.apdu.pcsclite.metai
+   install_dir : 'share/metainfo'
+   )
+ 
+-install_data('etc/pcscd',
+-  install_dir : get_option('sysconfdir') / 'default'
+-  )
+-
+ # generate config.h
+ configure_file(output : 'config.h',
+   configuration : conf_data)
+@@ -308,7 +304,6 @@ endif
  pkg = import('pkgconfig')
  pkg.generate(
    libraries : '-L${libdir} -lpcsclite',