CVS commit: pkgsrc/security/pcsc-lite

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec 27 22:32:04 UTC 2024

Modified Files:
        pkgsrc/security/pcsc-lite: distinfo
        pkgsrc/security/pcsc-lite/patches: patch-src_auth.c

Log Message:
pcsc-lite: fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/pcsc-lite/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/pcsc-lite/patches/patch-src_auth.c

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/distinfo
diff -u pkgsrc/security/pcsc-lite/distinfo:1.38 pkgsrc/security/pcsc-lite/distinfo:1.39
--- pkgsrc/security/pcsc-lite/distinfo:1.38     Fri Dec 27 14:39:53 2024
+++ pkgsrc/security/pcsc-lite/distinfo  Fri Dec 27 22:32:04 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38 2024/12/27 14:39:53 gdt Exp $
+$NetBSD: distinfo,v 1.39 2024/12/27 22:32:04 adam 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) = 7b3c5a205350ff8a9b257fd5128f6ef597e805ba
-SHA1 (patch-src_auth.c) = aea4b4a0d856efd2b4fd7b8d2ee5f6c54dc59f05
+SHA1 (patch-src_auth.c) = 48fadaf4ba4ceacdd56835f56d0f2f7b999f6aa6
 SHA1 (patch-src_configfile.l) = 2283637df38919f1e7b47beb5a8e6a8b3619b12b

Index: pkgsrc/security/pcsc-lite/patches/patch-src_auth.c
diff -u pkgsrc/security/pcsc-lite/patches/patch-src_auth.c:1.1 pkgsrc/security/pcsc-lite/patches/patch-src_auth.c:1.2
--- pkgsrc/security/pcsc-lite/patches/patch-src_auth.c:1.1      Fri Dec 27 15:10:09 2024
+++ pkgsrc/security/pcsc-lite/patches/patch-src_auth.c  Fri Dec 27 22:32:04 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_auth.c,v 1.1 2024/12/27 15:10:09 gdt Exp $
+$NetBSD: patch-src_auth.c,v 1.2 2024/12/27 22:32:04 adam Exp $
 
 Upstream code blurs checking for libraries (POLKIT), features
 (PEERCRED), and OS, when guarding code that uses the library and
@@ -7,6 +7,8 @@ function otherwise.
 
 Sent upstream 20241227.
 
+On Darwin, cr_pid is not defined.
+
 --- src/auth.c.orig    2024-12-24 10:16:27.000000000 +0000
 +++ src/auth.c
 @@ -51,28 +51,16 @@
@@ -16,7 +18,7 @@ Sent upstream 20241227.
 -#ifdef HAVE_POLKIT
 -
 -#if defined(SO_PEERCRED) || defined(LOCAL_PEERCRED)
-+#if defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED)
++#if defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) && !defined(__APPLE__)
  
  #include <polkit/polkit.h>
  #include <stdbool.h>
@@ -50,7 +52,7 @@ Sent upstream 20241227.
 -#endif
 -
 -#else
-+#else /* defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) */
++#else /* defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) && !defined(__APPLE__) */
  
  unsigned IsClientAuthorized(int socket, const char* action, const char* reader)
  {
@@ -59,4 +61,4 @@ Sent upstream 20241227.
  }
  
 -#endif
-+#endif /* defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) */
++#endif /* defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) && !defined(__APPLE__) */