Date: Tue, 30 Jan 2024 06:31:39 GMT From: Xin LI <delphij@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6ad6c5cec63a - main - net/openldap26-server: upgrade to 2.6.7 Message-ID: <202401300631.40U6VdPj013969@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ad6c5cec63aabe4910ccfab9d231d469584d76f commit 6ad6c5cec63aabe4910ccfab9d231d469584d76f Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2024-01-30 06:31:20 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2024-01-30 06:31:20 +0000 net/openldap26-server: upgrade to 2.6.7 --- net/openldap26-server/Makefile | 6 ++-- net/openldap26-server/distinfo | 6 ++-- net/openldap26-server/files/patch-configure.ac | 7 +++-- .../patch-contrib_slapd-modules_smbk5pwd_Makefile | 8 +++--- .../files/patch-libraries__libldap__Makefile.in | 4 +-- .../files/patch-libraries_libldap_tls__o.c | 10 +++---- .../files/patch-servers_lloadd_libevent__support.c | 32 ---------------------- .../files/patch-servers_lloadd_module__init.c | 18 ------------ 8 files changed, 21 insertions(+), 70 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 244a01449968..a11473918662 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= openldap -DISTVERSION= 2.6.6 +DISTVERSION= 2.6.7 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ @@ -46,8 +46,8 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server ${PORTNAME}-server GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -PORTREVISION_CLIENT= 1 -PORTREVISION_SERVER= 2 +PORTREVISION_CLIENT= 0 +PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 0.200 diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo index a59c8802e11f..65bdb7b45657 100644 --- a/net/openldap26-server/distinfo +++ b/net/openldap26-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691645624 -SHA256 (openldap-2.6.6.tgz) = 082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0 -SIZE (openldap-2.6.6.tgz) = 6475109 +TIMESTAMP = 1706593904 +SHA256 (openldap-2.6.7.tgz) = cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930 +SIZE (openldap-2.6.7.tgz) = 6484944 diff --git a/net/openldap26-server/files/patch-configure.ac b/net/openldap26-server/files/patch-configure.ac index 034007b89d70..a1c993ad850e 100644 --- a/net/openldap26-server/files/patch-configure.ac +++ b/net/openldap26-server/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac 2023-07-31 14:09:15.000000000 -0400 -+++ configure.ac 2024-01-16 15:17:17.855596000 -0500 -@@ -1225,11 +1225,11 @@ +--- configure.ac.orig 2024-01-29 18:52:23 UTC ++++ configure.ac +@@ -1225,12 +1225,12 @@ if test $ol_with_tls = openssl || test $ol_with_tls = if test $ac_cv_header_openssl_ssl_h = yes ; then AC_PREPROC_IFELSE([AC_LANG_SOURCE( [[#include <openssl/opensslv.h>] @@ -14,3 +14,4 @@ + AC_CHECK_LIB(ssl, SSL_CTX_new, [have_openssl=yes], [have_openssl=no], [-lcrypto]) + diff --git a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile index 1f2d56dc866e..0d1ccc97f6d1 100644 --- a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile +++ b/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile @@ -1,6 +1,6 @@ ---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2021-06-03 18:40:31 UTC +--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2024-01-29 18:52:23 UTC +++ contrib/slapd-modules/smbk5pwd/Makefile -@@ -21,8 +21,8 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r +@@ -21,8 +21,8 @@ SSL_LIB = -lcrypto SSL_INC = SSL_LIB = -lcrypto @@ -9,5 +9,5 @@ +HEIMDAL_INC = -I/usr/include +HEIMDAL_LIB = -L/usr/lib -lkrb5 -lkadm5srv - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc + PLAT = UNIX + NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd diff --git a/net/openldap26-server/files/patch-libraries__libldap__Makefile.in b/net/openldap26-server/files/patch-libraries__libldap__Makefile.in index 551b567191b2..a018476f7c66 100644 --- a/net/openldap26-server/files/patch-libraries__libldap__Makefile.in +++ b/net/openldap26-server/files/patch-libraries__libldap__Makefile.in @@ -1,6 +1,6 @@ ---- libraries/libldap/Makefile.in.orig 2021-07-27 17:44:47 UTC +--- libraries/libldap/Makefile.in.orig 2024-01-29 18:52:23 UTC +++ libraries/libldap/Makefile.in -@@ -86,13 +86,6 @@ install-local: $(CFFILES) FORCE +@@ -84,13 +84,6 @@ install-local: $(CFFILES) FORCE $(LTFINISH) $(DESTDIR)$(libdir) -$(MKDIR) $(DESTDIR)$(sysconfdir) @for i in $(CFFILES); do \ diff --git a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c index 6566cbb201a0..8ac919526e6b 100644 --- a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c +++ b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c @@ -1,4 +1,4 @@ ---- libraries/libldap/tls_o.c.orig 2022-05-04 14:55:23 UTC +--- libraries/libldap/tls_o.c.orig 2024-01-29 18:52:23 UTC +++ libraries/libldap/tls_o.c @@ -281,7 +281,7 @@ tlso_ctx_free ( tls_ctx *ctx ) SSL_CTX_free( c ); @@ -9,12 +9,12 @@ static char * tlso_stecpy( char *dst, const char *src, const char *end ) { -@@ -417,7 +417,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls - } +@@ -427,7 +427,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls if ( lo->ldo_tls_ciphersuite ) { + char *oldsuites = lt->lt_ciphersuite; -#if OPENSSL_VERSION_NUMBER >= 0x10101000 +#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(OPENSSL_NO_TLS1_3) - tlso_ctx_cipher13( ctx, lt->lt_ciphersuite ); + tlso_ctx_cipher13( ctx, lt->lt_ciphersuite, &oldsuites ); #endif - if ( !SSL_CTX_set_cipher_list( ctx, lt->lt_ciphersuite ) ) + if ( oldsuites && !SSL_CTX_set_cipher_list( ctx, oldsuites ) ) diff --git a/net/openldap26-server/files/patch-servers_lloadd_libevent__support.c b/net/openldap26-server/files/patch-servers_lloadd_libevent__support.c deleted file mode 100644 index bfa2da3912e8..000000000000 --- a/net/openldap26-server/files/patch-servers_lloadd_libevent__support.c +++ /dev/null @@ -1,32 +0,0 @@ ---- servers/lloadd/libevent_support.c.orig 2023-02-08 18:53:35 UTC -+++ servers/lloadd/libevent_support.c -@@ -131,6 +131,20 @@ lload_libevent_cond_timedwait( - return ldap_pvt_thread_cond_wait( cond, mutex ); - } - -+/* -+ * libevent2 expects the thread id has a type of unsigned long. -+ */ -+static unsigned long -+lload_libevent_thread_self(void) -+{ -+ unsigned long retval; -+ static_assert(sizeof(ldap_pvt_thread_t) <= sizeof(unsigned long), -+ "ldap_pvt_thread_t has to be smaller or equal to unsigned long"); -+ -+ retval = (unsigned long)ldap_pvt_thread_self(); -+ return (retval); -+} -+ - int - lload_libevent_init( void ) - { -@@ -152,7 +166,7 @@ lload_libevent_init( void ) - - evthread_set_lock_callbacks( &cbs ); - evthread_set_condition_callbacks( &cond_cbs ); -- evthread_set_id_callback( ldap_pvt_thread_self ); -+ evthread_set_id_callback( lload_libevent_thread_self ); - return 0; - } - diff --git a/net/openldap26-server/files/patch-servers_lloadd_module__init.c b/net/openldap26-server/files/patch-servers_lloadd_module__init.c deleted file mode 100644 index 1a1256f9610a..000000000000 --- a/net/openldap26-server/files/patch-servers_lloadd_module__init.c +++ /dev/null @@ -1,18 +0,0 @@ ---- servers/lloadd/module_init.c.orig 2023-02-08 18:53:35 UTC -+++ servers/lloadd/module_init.c -@@ -151,14 +151,13 @@ lload_back_initialize( BackendInfo *bi ) - { - bi->bi_flags = SLAP_BFLAG_STANDALONE; - bi->bi_open = lload_back_open; -- bi->bi_config = config_generic_wrapper; - bi->bi_pause = lload_pause_cb; - bi->bi_unpause = lload_unpause_cb; - bi->bi_close = lload_back_close; - bi->bi_destroy = lload_back_destroy; - - bi->bi_db_init = 0; -- bi->bi_db_config = 0; -+ bi->bi_db_config = config_generic_wrapper; - bi->bi_db_open = 0; - bi->bi_db_close = 0; - bi->bi_db_destroy = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401300631.40U6VdPj013969>