CVS commit: pkgsrc/security/pcsc-lite

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 10 09:33:58 UTC 2024

Modified Files:
        pkgsrc/security/pcsc-lite: Makefile distinfo
Added Files:
        pkgsrc/security/pcsc-lite/patches: patch-src_configfile.l

Log Message:
pcsc-lite: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/security/pcsc-lite/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/security/pcsc-lite/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/pcsc-lite/patches/patch-src_configfile.l

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.46 pkgsrc/security/pcsc-lite/Makefile:1.47
--- pkgsrc/security/pcsc-lite/Makefile:1.46     Wed Jun  5 20:25:16 2024
+++ pkgsrc/security/pcsc-lite/Makefile  Mon Jun 10 09:33:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2024/06/05 20:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2024/06/10 09:33:58 jperkin Exp $
 
 DISTNAME=      pcsc-lite-2.2.3
 PKGREVISION=   1
@@ -31,6 +31,8 @@ MAKE_DIRS+=   ${PREFIX}/lib/pcsc-lite
 MAKE_DIRS+=    ${PREFIX}/lib/pcsc-lite/drivers
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/reader.conf.d
 
+LDFLAGS.SunOS+=        -lsocket
+
 EGDIR=                 ${PREFIX}/share/examples/pcsc-lite
 
 PKGCONFIG_OVERRIDE+=   src/libpcsclite.pc.in

Index: pkgsrc/security/pcsc-lite/distinfo
diff -u pkgsrc/security/pcsc-lite/distinfo:1.34 pkgsrc/security/pcsc-lite/distinfo:1.35
--- pkgsrc/security/pcsc-lite/distinfo:1.34     Mon May 27 07:44:17 2024
+++ pkgsrc/security/pcsc-lite/distinfo  Mon Jun 10 09:33:58 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.34 2024/05/27 07:44:17 adam Exp $
+$NetBSD: distinfo,v 1.35 2024/06/10 09:33:58 jperkin Exp $
 
 BLAKE2s (pcsc-lite-2.2.3.tar.xz) = 11649836a45dc921f45fcc29ee99167f8905b18c95a4cb84af7a52ccb8513fcb
 SHA512 (pcsc-lite-2.2.3.tar.xz) = 417410f92a14eff78231ff6007ed801d71ae89c62914a88f21e8cd199e4792f00df09c28604e138efe269c7a6df9c8fd891401c6be77fb8cd8639b7890a9e00c
 Size (pcsc-lite-2.2.3.tar.xz) = 207892 bytes
 SHA1 (patch-meson.build) = 34e7c0b0af2191d6dd5f270c154beefb84fbc1b8
+SHA1 (patch-src_configfile.l) = 2283637df38919f1e7b47beb5a8e6a8b3619b12b

Added files:

Index: pkgsrc/security/pcsc-lite/patches/patch-src_configfile.l
diff -u /dev/null pkgsrc/security/pcsc-lite/patches/patch-src_configfile.l:1.1
--- /dev/null   Mon Jun 10 09:33:58 2024
+++ pkgsrc/security/pcsc-lite/patches/patch-src_configfile.l    Mon Jun 10 09:33:58 2024
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_configfile.l,v 1.1 2024/06/10 09:33:58 jperkin Exp $
+
+SunOS has no dirent d_type.
+
+--- src/configfile.l.orig      2024-06-10 09:29:24.980256046 +0000
++++ src/configfile.l
+@@ -301,9 +301,11 @@ int DBGetReaderListDir(const char *reade
+                       snprintf(filename, sizeof(filename), "%s/%s",
+                               readerconf_dir, direntry->d_name);
+ 
++#ifndef __sun
+                       /* skip non regular files */
+                       if (direntry->d_type == DT_UNKNOWN)
+                       {
++#endif
+                               struct stat st;
+ 
+                               if (lstat(filename, &st) != 0)
+@@ -319,6 +321,7 @@ int DBGetReaderListDir(const char *reade
+                                               direntry->d_name);
+                                       continue;
+                               }
++#ifndef __sun
+                       }
+                       else
+                               if (direntry->d_type != DT_REG)
+@@ -327,6 +330,7 @@ int DBGetReaderListDir(const char *reade
+                                               direntry->d_name);
+                                       continue;
+                               }
++#endif
+ 
+                       /* skip files starting with . like ., .., .svn, etc */
+                       if ('.' == direntry->d_name[0])