CVS commit: pkgsrc/security/pcsc-lite/patches

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Dec 27 15:10:09 UTC 2024

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

Log Message:
security/pcsc-lite: Actually add patch from previous


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 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.

Added files:

Index: pkgsrc/security/pcsc-lite/patches/patch-src_auth.c
diff -u /dev/null pkgsrc/security/pcsc-lite/patches/patch-src_auth.c:1.1
--- /dev/null   Fri Dec 27 15:10:09 2024
+++ pkgsrc/security/pcsc-lite/patches/patch-src_auth.c  Fri Dec 27 15:10:09 2024
@@ -0,0 +1,62 @@
+$NetBSD: patch-src_auth.c,v 1.1 2024/12/27 15:10:09 gdt Exp $
+
+Upstream code blurs checking for libraries (POLKIT), features
+(PEERCRED), and OS, when guarding code that uses the library and
+features.  Change to a single guard, and using the fallback allow
+function otherwise.
+
+Sent upstream 20241227.
+
+--- src/auth.c.orig    2024-12-24 10:16:27.000000000 +0000
++++ src/auth.c
+@@ -51,28 +51,16 @@
+ 
+ #include <errno.h>
+ 
+-#ifdef HAVE_POLKIT
+-
+-#if defined(SO_PEERCRED) || defined(LOCAL_PEERCRED)
++#if defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED)
+ 
+ #include <polkit/polkit.h>
+ #include <stdbool.h>
+ 
+-#ifdef __FreeBSD__
+-
+ #include <sys/ucred.h>
+ typedef struct xucred platform_cred;
+ #define       CRED_PID(uc)    (uc).cr_pid
+ #define       CRED_UID(uc)    (uc).cr_uid
+ 
+-#else
+-
+-typedef struct ucred platform_cred;
+-#define       CRED_PID(uc)    (uc).pid
+-#define       CRED_UID(uc)    (uc).uid
+-
+-#endif
+-
+ extern bool disable_polkit;
+ 
+ /* Returns non zero when the client is authorized */
+@@ -180,13 +168,7 @@ cleanup1:
+       return ret;
+ }
+ 
+-#else
+-
+-#error polkit is enabled, but no socket cred implementation for this platform
+-
+-#endif
+-
+-#else
++#else /* defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) */
+ 
+ unsigned IsClientAuthorized(int socket, const char* action, const char* reader)
+ {
+@@ -197,4 +179,4 @@ unsigned IsClientAuthorized(int socket, 
+       return 1;
+ }
+ 
+-#endif
++#endif /* defined(POLKIT) && defined(SO_PEERCRED) || defined(LOCAL_PEERCRED) */