CVS commit: pkgsrc/security/p11-kit

["Charlotte Koch" <charlotte%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   charlotte
Date:           Tue Apr  2 02:13:01 UTC 2024

Modified Files:
        pkgsrc/security/p11-kit: distinfo
        pkgsrc/security/p11-kit/patches: patch-common_compat.c
Added Files:
        pkgsrc/security/p11-kit/patches: patch-common_message.c

Log Message:
security/p11-kit: Add DragonFly support


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/p11-kit/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/security/p11-kit/patches/patch-common_compat.c
cvs rdiff -u -r0 -r1.3 pkgsrc/security/p11-kit/patches/patch-common_message.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/p11-kit/distinfo
diff -u pkgsrc/security/p11-kit/distinfo:1.25 pkgsrc/security/p11-kit/distinfo:1.26
--- pkgsrc/security/p11-kit/distinfo:1.25       Thu Nov 16 12:17:26 2023
+++ pkgsrc/security/p11-kit/distinfo    Tue Apr  2 02:13:01 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2023/11/16 12:17:26 tnn Exp $
+$NetBSD: distinfo,v 1.26 2024/04/02 02:13:01 charlotte Exp $
 
 BLAKE2s (p11-kit-0.25.3.tar.xz) = 6d1a804ddacc44f27a8019d39b042815be9cb800be6b2aecc21dda6b045163a4
 SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c
 Size (p11-kit-0.25.3.tar.xz) = 991528 bytes
-SHA1 (patch-common_compat.c) = bdcb10cebe5e7755c81f88ef033b9dfecd7a1aad
+SHA1 (patch-common_compat.c) = b20afd074ab26ec5e2011b483678ad4d5defc561
+SHA1 (patch-common_message.c) = 4169ab2cb0b923d306c0b77908e1a412fec261c8
 SHA1 (patch-meson.build) = eb1c4130b097e3d57a74c9aa5482872670f3472b

Index: pkgsrc/security/p11-kit/patches/patch-common_compat.c
diff -u pkgsrc/security/p11-kit/patches/patch-common_compat.c:1.4 pkgsrc/security/p11-kit/patches/patch-common_compat.c:1.5
--- pkgsrc/security/p11-kit/patches/patch-common_compat.c:1.4   Sun Mar 24 18:03:54 2019
+++ pkgsrc/security/p11-kit/patches/patch-common_compat.c       Tue Apr  2 02:13:01 2024
@@ -1,12 +1,23 @@
-$NetBSD: patch-common_compat.c,v 1.4 2019/03/24 18:03:54 ryoon Exp $
+$NetBSD: patch-common_compat.c,v 1.5 2024/04/02 02:13:01 charlotte Exp $
 
 - Hide getauxval() symbol because the implementation is incomplete
   and breaks for example openssl on NetBSD/evbarm
   https://github.com/p11-glue/p11-kit/issues/192
 
---- common/compat.c.orig       2018-08-10 09:54:46.000000000 +0000
-+++ common/compat.c
-@@ -791,6 +791,9 @@ mkdtemp (char *template)
+- issetugid() et al. are hidden behind __BSD_VISIBLE on DragonFly, too.
+
+--- common/compat.c.orig       2023-10-26 02:56:44.000000000 -0700
++++ common/compat.c    2024-04-01 19:04:55.358513000 -0700
+@@ -49,7 +49,7 @@
+  * This is needed to expose issetugid, getresuid, and getresgid, which are
+  * hidden with the _XOPEN_SOURCE setting above
+  */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #undef __BSD_VISIBLE
+ #define __BSD_VISIBLE 1
+ #endif
+@@ -859,6 +859,9 @@
  #ifndef HAVE_GETAUXVAL
  
  unsigned long

Added files:

Index: pkgsrc/security/p11-kit/patches/patch-common_message.c
diff -u /dev/null pkgsrc/security/p11-kit/patches/patch-common_message.c:1.3
--- /dev/null   Tue Apr  2 02:13:01 2024
+++ pkgsrc/security/p11-kit/patches/patch-common_message.c      Tue Apr  2 02:13:01 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-common_message.c,v 1.3 2024/04/02 02:13:01 charlotte Exp $
+
+On DragonFly, xlocale.h provides all the locale functionality (locale.h
+provides only some of it).
+
+--- common/message.c.orig      2024-04-01 18:58:42.168426000 -0700
++++ common/message.c   2024-04-01 18:59:19.339981000 -0700
+@@ -51,7 +51,11 @@
+ #include <assert.h>
+ #include <errno.h>
+ #ifdef HAVE_LOCALE_H
++#ifdef __DragonFly__
++#include <xlocale.h>
++#else
+ #include <locale.h>
++#endif // __DragonFly__
+ #endif
+ #include <stdarg.h>
+ #include <stdlib.h>