CVS commit: pkgsrc/databases/openldap

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul  9 09:18:01 UTC 2025

Modified Files:
        pkgsrc/databases/openldap: distinfo
        pkgsrc/databases/openldap/patches:
            patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c
            patch-libraries_libldap_thr__posix.c

Log Message:
openldap: Correct includes for thr_yield().

While here fix a patch to be mkpatches compatible.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 pkgsrc/databases/openldap/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c \
    pkgsrc/databases/openldap/patches/patch-libraries_libldap_thr__posix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/openldap/distinfo
diff -u pkgsrc/databases/openldap/distinfo:1.142 pkgsrc/databases/openldap/distinfo:1.143
--- pkgsrc/databases/openldap/distinfo:1.142    Mon May 26 08:04:54 2025
+++ pkgsrc/databases/openldap/distinfo  Wed Jul  9 09:18:01 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.142 2025/05/26 08:04:54 adam Exp $
+$NetBSD: distinfo,v 1.143 2025/07/09 09:18:01 jperkin Exp $
 
 BLAKE2s (openldap-2.6.10.tgz) = 72b7aa27eeeb1a0fa4ea130ba98532f51a7192bee8c1d54a1aacbef14cf676e2
 SHA512 (openldap-2.6.10.tgz) = 18129ad9a385457941e3203de5f130fe2571701abf24592c5beffb01361aae3182c196b2cd48ffeecb792b9b0e5f82c8d92445a7ec63819084757bdedba63b20
@@ -9,12 +9,12 @@ SHA1 (patch-contrib_slapd-modules_nops_M
 SHA1 (patch-contrib_slapd-modules_nops_nops.c) = 72c28de4b09cbac7e793828dfcf04820643dcbec
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
 SHA1 (patch-contrib_slapd-modules_smbk5pwd_Makefile) = 3070f42f863ee44856fb1aeff03e3385e714bac0
-SHA1 (patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c) = 88584e038eab7cd29f4a05c4a6e9884b13d3ee25
+SHA1 (patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c) = 3c8c269483678fee34c73d52164c3342f042be24
 SHA1 (patch-libraries_libldap_cyrus.c) = 1e47cdf4b1f1cc4eef36cf40a6beec1bed167f85
 SHA1 (patch-libraries_libldap_init.c) = 884d102d7c02cf85b36635b2ac5d6925ec17420f
 SHA1 (patch-libraries_libldap_ldap-int.h) = 967499db16d31cbf47deff330d97efd0a360ac7f
 SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
-SHA1 (patch-libraries_libldap_thr__posix.c) = d9e6ff44bd3885ab4a83fd5e9915e74aaace237e
+SHA1 (patch-libraries_libldap_thr__posix.c) = 21f0efe8f7d2f4c4fecf0a970ce5259ae28e26cb
 SHA1 (patch-libraries_liblutil_sha1.c) = 10deca5c2f0431dd51d9137f14b5070be1264dcd
 SHA1 (patch-servers_slapd_Makefile.in) = 40043fdaecac7b591b462f7af32149a93e88eaf5
 SHA1 (patch-servers_slapd_back-sql_delete.c) = 437336aed5ef7e1b8b0e53c9d9019a43eb226472

Index: pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c
diff -u pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c:1.1 pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c:1.2
--- pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c:1.1       Thu Jan 19 15:08:26 2023
+++ pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c   Wed Jul  9 09:18:01 2025
@@ -1,14 +1,13 @@
-$NetBSD: patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c,v 1.1 2023/01/19 15:08:26 manu Exp $
+$NetBSD: patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c,v 1.2 2025/07/09 09:18:01 jperkin Exp $
 
 Detect hdb_generate_key_set_password() signature change in Heimdal 7.1
 
 Details can be found here:
 https://github.com/heimdal/heimdal/issues/246
 
---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig     2023-01-19 09:14:54.607644432 +0100
-+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c  2023-01-19 09:18:41.602844881 +0100
-@@ -396,10 +396,15 @@
-                               "dn=\"%s\" missing krb5KeyVersionNumber\n",
+--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig     2025-05-22 17:56:21.000000000 +0000
++++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+@@ -398,8 +398,13 @@ static int smbk5pwd_exop_passwd(
                                op->o_log_prefix, e->e_name.bv_val );
                }
  
@@ -22,4 +21,3 @@ https://github.com/heimdal/heimdal/issue
                ent.keys.len = nkeys;
                hdb_seal_keys(context, db, &ent);
                krb5_free_principal( context, ent.principal );
- 
Index: pkgsrc/databases/openldap/patches/patch-libraries_libldap_thr__posix.c
diff -u pkgsrc/databases/openldap/patches/patch-libraries_libldap_thr__posix.c:1.1 pkgsrc/databases/openldap/patches/patch-libraries_libldap_thr__posix.c:1.2
--- pkgsrc/databases/openldap/patches/patch-libraries_libldap_thr__posix.c:1.1  Mon Aug 23 09:58:58 2021
+++ pkgsrc/databases/openldap/patches/patch-libraries_libldap_thr__posix.c      Wed Jul  9 09:18:01 2025
@@ -1,8 +1,9 @@
-$NetBSD: patch-libraries_libldap_thr__posix.c,v 1.1 2021/08/23 09:58:58 adam Exp $
+$NetBSD: patch-libraries_libldap_thr__posix.c,v 1.2 2025/07/09 09:18:01 jperkin Exp $
 
 Fix for systems lacking pthread_attr_setstacksize().
+Correct includes for thr_yield().
 
---- libraries/libldap/thr_posix.c.orig 2021-07-27 17:44:47.000000000 +0000
+--- libraries/libldap/thr_posix.c.orig 2025-05-22 17:56:21.000000000 +0000
 +++ libraries/libldap/thr_posix.c
 @@ -25,6 +25,7 @@
  #endif
@@ -12,7 +13,17 @@ Fix for systems lacking pthread_attr_set
  
  #ifdef REPLACE_BROKEN_YIELD
  #ifndef HAVE_NANOSLEEP
-@@ -161,11 +162,13 @@ ldap_pvt_thread_create( ldap_pvt_thread_
+@@ -38,6 +39,9 @@
+ #define LDAP_THREAD_RDWR_IMPLEMENTATION
+ #include "ldap_thr_debug.h"    /* May rename the symbols defined below */
+ #include <signal.h>                    /* For pthread_kill() */
++#ifdef HAVE_THR_YIELD
++#include <thread.h>
++#endif
+ 
+ extern int ldap_int_stackguard;
+ 
+@@ -161,11 +165,13 @@ ldap_pvt_thread_create( ldap_pvt_thread_
  #endif
  
  #ifdef LDAP_PVT_THREAD_SET_STACK_SIZE