CVS commit: pkgsrc/databases/openldap

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Aug 27 16:11:18 UTC 2026

Modified Files:
        pkgsrc/databases/openldap: distinfo
Added Files:
        pkgsrc/databases/openldap/patches: patch-libraries_libldap_tls__o.c

Log Message:
openldap: Support pre-C23 compilers.

Fixes openldap-client build issue seen in the daily macOS reports.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 pkgsrc/databases/openldap/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/openldap/patches/patch-libraries_libldap_tls__o.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.147 pkgsrc/databases/openldap/distinfo:1.148
--- pkgsrc/databases/openldap/distinfo:1.147    Fri Aug 14 12:14:46 2026
+++ pkgsrc/databases/openldap/distinfo  Thu Aug 27 16:11:18 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.147 2026/08/14 12:14:46 adam Exp $
+$NetBSD: distinfo,v 1.148 2026/08/27 16:11:18 jperkin Exp $
 
 BLAKE2s (openldap-2.7.0.tgz) = 177e508e7d0558a7f85a71e016d482e5c3ec182e5bda0abdb2fc3d98ac3ba198
 SHA512 (openldap-2.7.0.tgz) = a266f8a9a24f18174595c699d0da51bbfde15068160740193d21fe6fdf585c45a6ff7ab9e7829dfe8bbd7bf87494b7996c1470a0d84bf79b557b377e800aa551
@@ -15,5 +15,6 @@ SHA1 (patch-libraries_libldap_cyrus.c) =
 SHA1 (patch-libraries_libldap_ldap-int.h) = 967499db16d31cbf47deff330d97efd0a360ac7f
 SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
 SHA1 (patch-libraries_libldap_thr__posix.c) = 21f0efe8f7d2f4c4fecf0a970ce5259ae28e26cb
+SHA1 (patch-libraries_libldap_tls__o.c) = 40a46eb16c8c9e201619aac4f8dc887dce840690
 SHA1 (patch-libraries_liblutil_sha1.c) = 10deca5c2f0431dd51d9137f14b5070be1264dcd
 SHA1 (patch-servers_slapd_Makefile.in) = 40043fdaecac7b591b462f7af32149a93e88eaf5

Added files:

Index: pkgsrc/databases/openldap/patches/patch-libraries_libldap_tls__o.c
diff -u /dev/null pkgsrc/databases/openldap/patches/patch-libraries_libldap_tls__o.c:1.1
--- /dev/null   Thu Aug 27 16:11:18 2026
+++ pkgsrc/databases/openldap/patches/patch-libraries_libldap_tls__o.c  Thu Aug 27 16:11:18 2026
@@ -0,0 +1,50 @@
+$NetBSD: patch-libraries_libldap_tls__o.c,v 1.1 2026/08/27 16:11:18 jperkin Exp $
+
+Support pre-C23 compilers.
+
+--- libraries/libldap/tls_o.c.orig     2026-08-27 15:54:30.824812399 +0000
++++ libraries/libldap/tls_o.c
+@@ -543,7 +543,7 @@ tlso_ctx_init( struct ldapoptions *lo, s
+ 
+                               while ((info = OSSL_STORE_load( sctx ))) {
+                                       switch (OSSL_STORE_INFO_get_type( info )) {
+-                                      case OSSL_STORE_INFO_CERT:
++                                      case OSSL_STORE_INFO_CERT: {
+                                               X509 *cert = OSSL_STORE_INFO_get0_CERT( info );
+                                               X509_STORE *store = SSL_CTX_get_cert_store( ctx );
+                                               if ( !X509_STORE_add_cert( store, cert ) ) {
+@@ -565,6 +565,7 @@ tlso_ctx_init( struct ldapoptions *lo, s
+                                                       }
+                                               }
+                                               break;
++                                      }
+                                       default:
+                                               /* ignore other types */
+                                               break;
+@@ -753,7 +754,7 @@ tlso_ctx_init( struct ldapoptions *lo, s
+                                               return -1;
+                                       }
+                                       break;
+-                              case OSSL_STORE_INFO_CERT:
++                              case OSSL_STORE_INFO_CERT: {
+                                       X509 *cert = OSSL_STORE_INFO_get0_CERT(info);
+                                       int is_ca = X509_check_ca( cert );
+                                       if ( !is_ca && !SSL_CTX_use_certificate( ctx, cert )) {
+@@ -773,7 +774,8 @@ tlso_ctx_init( struct ldapoptions *lo, s
+                                               return -1;
+                                       }
+                                       break;
+-                              case OSSL_STORE_INFO_CRL:
++                              }
++                              case OSSL_STORE_INFO_CRL: {
+                                       X509_STORE *x509_s = SSL_CTX_get_cert_store( ctx );
+                                       if ( !X509_STORE_add_crl( x509_s,
+                                                       OSSL_STORE_INFO_get0_CRL(info) )) {
+@@ -785,6 +787,7 @@ tlso_ctx_init( struct ldapoptions *lo, s
+                                               return -1;
+                                       }
+                                       break;
++                              }
+                               default:
+                                       /* ignore other types */
+                                       break;