CVS commit: pkgsrc/security/gnome-keyring

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 29 21:05:30 UTC 2025

Modified Files:
        pkgsrc/security/gnome-keyring: distinfo
Added Files:
        pkgsrc/security/gnome-keyring/patches:
            patch-pkcs11_gkm_gkm-attributes.c
            patch-pkcs11_xdg-store_mock-xdg-module.c

Log Message:
gnome-keyring: GCC 15 fixes


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/security/gnome-keyring/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/gnome-keyring/patches/patch-pkcs11_gkm_gkm-attributes.c \
    pkgsrc/security/gnome-keyring/patches/patch-pkcs11_xdg-store_mock-xdg-module.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/gnome-keyring/distinfo
diff -u pkgsrc/security/gnome-keyring/distinfo:1.47 pkgsrc/security/gnome-keyring/distinfo:1.48
--- pkgsrc/security/gnome-keyring/distinfo:1.47 Tue Oct 26 11:17:06 2021
+++ pkgsrc/security/gnome-keyring/distinfo      Tue Apr 29 21:05:30 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2021/10/26 11:17:06 nia Exp $
+$NetBSD: distinfo,v 1.48 2025/04/29 21:05:30 tnn Exp $
 
 BLAKE2s (gnome-keyring-3.36.0.tar.xz) = ac03c4142986776794e97e8ce24adfff6a9f50fa6fd3bd706bf20f26a70f463d
 SHA512 (gnome-keyring-3.36.0.tar.xz) = e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
@@ -7,4 +7,6 @@ SHA1 (patch-Makefile.in) = 0bb5c9ff7de52
 SHA1 (patch-egg_egg-armor.c) = 4e57b2f8d4434ad4f0e28230af0ba7e3a79d9851
 SHA1 (patch-egg_egg-unix-credentials.c) = a3d45837ec5257b6397cf839d2ac6aac890b9796
 SHA1 (patch-pam_gkr-pam-module.c) = 98d0af74ea7ba87cb1376aba4cefcaf77bfbc4f5
+SHA1 (patch-pkcs11_gkm_gkm-attributes.c) = 2683a4e1cae23c0c5a315280276f457b40c90ae2
 SHA1 (patch-pkcs11_rpc-layer_gkm-rpc-module.c) = 0ac1939645f01eb52b7a532359555b7139aaa39e
+SHA1 (patch-pkcs11_xdg-store_mock-xdg-module.c) = e9b12398b219f28fef25e0d1bbd5dd98aae1fd02

Added files:

Index: pkgsrc/security/gnome-keyring/patches/patch-pkcs11_gkm_gkm-attributes.c
diff -u /dev/null pkgsrc/security/gnome-keyring/patches/patch-pkcs11_gkm_gkm-attributes.c:1.1
--- /dev/null   Tue Apr 29 21:05:30 2025
+++ pkgsrc/security/gnome-keyring/patches/patch-pkcs11_gkm_gkm-attributes.c     Tue Apr 29 21:05:30 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-pkcs11_gkm_gkm-attributes.c,v 1.1 2025/04/29 21:05:30 tnn Exp $
+
+* Don't conflict with C23 bool.
+
+--- pkcs11/gkm/gkm-attributes.c.orig   2025-04-29 20:17:47.071737705 +0000
++++ pkcs11/gkm/gkm-attributes.c
+@@ -34,7 +34,7 @@
+ CK_RV
+ gkm_attribute_get_bool (CK_ATTRIBUTE_PTR attr, gboolean *value)
+ {
+-      CK_BBOOL* bool;
++      CK_BBOOL* xbool;
+ 
+       g_return_val_if_fail (attr, CKR_GENERAL_ERROR);
+       g_return_val_if_fail (value, CKR_GENERAL_ERROR);
+@@ -42,8 +42,8 @@ gkm_attribute_get_bool (CK_ATTRIBUTE_PTR
+       if (attr->ulValueLen != sizeof (CK_BBOOL) || attr->pValue == NULL)
+               return CKR_ATTRIBUTE_VALUE_INVALID;
+ 
+-      bool = attr->pValue;
+-      *value = *bool ? TRUE : FALSE;
++      xbool = attr->pValue;
++      *value = *xbool ? TRUE : FALSE;
+       return CKR_OK;
+ }
+ 
Index: pkgsrc/security/gnome-keyring/patches/patch-pkcs11_xdg-store_mock-xdg-module.c
diff -u /dev/null pkgsrc/security/gnome-keyring/patches/patch-pkcs11_xdg-store_mock-xdg-module.c:1.1
--- /dev/null   Tue Apr 29 21:05:30 2025
+++ pkgsrc/security/gnome-keyring/patches/patch-pkcs11_xdg-store_mock-xdg-module.c      Tue Apr 29 21:05:30 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-pkcs11_xdg-store_mock-xdg-module.c,v 1.1 2025/04/29 21:05:30 tnn Exp $
+
+* Include <sys/time.h> for gettimeofday(2)
+
+--- pkcs11/xdg-store/mock-xdg-module.c.orig    2024-08-07 11:00:54.782885957 +0000
++++ pkcs11/xdg-store/mock-xdg-module.c
+@@ -37,6 +37,7 @@
+ 
+ #include <errno.h>
+ #include <sys/times.h>
++#include <sys/time.h>
+ 
+ #include <string.h>
+