Date: Tue, 11 Jul 2023 08:25:26 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: ee18505b11d1 - main - net/openldap26-server: upgrade to 2.6.5. Message-ID: <202307110825.36B8PQL8044384@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=ee18505b11d1b8ce2a55e1521f536c1eb58f0dab commit ee18505b11d1b8ce2a55e1521f536c1eb58f0dab Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2023-07-11 08:25:04 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2023-07-11 08:25:19 +0000 net/openldap26-server: upgrade to 2.6.5. --- net/openldap26-server/Makefile | 2 +- net/openldap26-server/distinfo | 6 ++-- net/openldap26-server/files/patch-ITS7978-libressl | 11 -------- .../files/patch-servers_lloadd_libevent__support.c | 32 ++++++++++++++++++++++ .../files/patch-servers_lloadd_module__init.c | 18 ++++++++++++ 5 files changed, 54 insertions(+), 15 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 35b4f603ec2c..8667e9f66bb8 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= openldap -DISTVERSION= 2.6.4 +DISTVERSION= 2.6.5 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo index f64dae7a71cc..aff3014405cf 100644 --- a/net/openldap26-server/distinfo +++ b/net/openldap26-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677647395 -SHA256 (openldap-2.6.4.tgz) = d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991 -SIZE (openldap-2.6.4.tgz) = 6478424 +TIMESTAMP = 1689060081 +SHA256 (openldap-2.6.5.tgz) = 2e27a8d4f4c2af8fe840b573271c20aa163e24987f9765214644290f5beb38d9 +SIZE (openldap-2.6.5.tgz) = 6475005 diff --git a/net/openldap26-server/files/patch-ITS7978-libressl b/net/openldap26-server/files/patch-ITS7978-libressl deleted file mode 100644 index d71be90027fe..000000000000 --- a/net/openldap26-server/files/patch-ITS7978-libressl +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2022-05-04 14:55:23 UTC -+++ configure.ac -@@ -1220,7 +1220,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = - [#endif]])], - , [AC_MSG_FAILURE([OpenSSL 1.1.1 or newer required])]) - -- AC_CHECK_LIB(ssl, SSL_export_keying_material_early, -+ AC_CHECK_LIB(ssl, SSL_write_early_data, - [have_openssl=yes], [have_openssl=no], - [-lcrypto]) - diff --git a/net/openldap26-server/files/patch-servers_lloadd_libevent__support.c b/net/openldap26-server/files/patch-servers_lloadd_libevent__support.c new file mode 100644 index 000000000000..bfa2da3912e8 --- /dev/null +++ b/net/openldap26-server/files/patch-servers_lloadd_libevent__support.c @@ -0,0 +1,32 @@ +--- 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 new file mode 100644 index 000000000000..1a1256f9610a --- /dev/null +++ b/net/openldap26-server/files/patch-servers_lloadd_module__init.c @@ -0,0 +1,18 @@ +--- 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?202307110825.36B8PQL8044384>