kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/openldap25-server: upgrade to 2.5.15

Browse source
This commit is contained in:
Xin LI 2023-07-11 01:24:54 -07:00
parent 3808599ffb
commit 77c2bbac71
4 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/openldap25-server/Makefile
View file

@ -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

6
net/openldap25-server/distinfo
View file

@ -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

32
net/openldap25-server/files/patch-servers_lloadd_libevent__support.c Normal file
View file

@ -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;
}

18
net/openldap25-server/files/patch-servers_lloadd_module__init.c Normal file
View file

@ -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;