Date: Tue, 11 Jul 2023 08:25:25 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: 77c2bbac7194 - main - net/openldap25-server: upgrade to 2.5.15 Message-ID: <202307110825.36B8PP4e044360@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=77c2bbac71945da8e6e25294196e05366c5f2d15 commit 77c2bbac71945da8e6e25294196e05366c5f2d15 Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2023-07-11 08:24:54 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2023-07-11 08:25:19 +0000 net/openldap25-server: upgrade to 2.5.15 --- net/openldap25-server/Makefile | 4 +-- net/openldap25-server/distinfo | 6 ++-- .../files/patch-servers_lloadd_libevent__support.c | 32 ++++++++++++++++++++++ .../files/patch-servers_lloadd_module__init.c | 18 ++++++++++++ 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index b1e569e44d76..b9b0511b11ea 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= openldap -DISTVERSION= 2.5.14 +DISTVERSION= 2.5.15 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ @@ -47,7 +47,7 @@ GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 0 -OPENLDAP_SHLIB_MINOR= 1.9 +OPENLDAP_SHLIB_MINOR= 1.10 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= DEBUG FETCH GSSAPI diff --git a/net/openldap25-server/distinfo b/net/openldap25-server/distinfo index 03981424e65c..1fae39c6a44c 100644 --- a/net/openldap25-server/distinfo +++ b/net/openldap25-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677647980 -SHA256 (openldap-2.5.14.tgz) = 577d0ef7b7b2334b5d537318e4369c8dc6b066ebec0cee5cc3ecd8931e1ea76d -SIZE (openldap-2.5.14.tgz) = 6458238 +TIMESTAMP = 1689061929 +SHA256 (openldap-2.5.15.tgz) = 92229022e44b160c456184b703892ece067a2567e649612d1908682890fe7b17 +SIZE (openldap-2.5.15.tgz) = 6455657 diff --git a/net/openldap25-server/files/patch-servers_lloadd_libevent__support.c b/net/openldap25-server/files/patch-servers_lloadd_libevent__support.c new file mode 100644 index 000000000000..bca9a5b7a3ff --- /dev/null +++ b/net/openldap25-server/files/patch-servers_lloadd_libevent__support.c @@ -0,0 +1,32 @@ +--- servers/lloadd/libevent_support.c.orig 2023-02-08 18:49:18 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 ) + { +@@ -160,7 +174,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/openldap25-server/files/patch-servers_lloadd_module__init.c b/net/openldap25-server/files/patch-servers_lloadd_module__init.c new file mode 100644 index 000000000000..17fb5bd179cd --- /dev/null +++ b/net/openldap25-server/files/patch-servers_lloadd_module__init.c @@ -0,0 +1,18 @@ +--- servers/lloadd/module_init.c.orig 2023-02-08 18:49:18 UTC ++++ servers/lloadd/module_init.c +@@ -145,14 +145,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 = 0; + + 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.36B8PP4e044360>