From nobody Tue Jul 11 08:25:25 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R0YpY6cVmz4h43V; Tue, 11 Jul 2023 08:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0YpY5Fjtz3F3v; Tue, 11 Jul 2023 08:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689063925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lyOx1dAnmP7H3tQRECP+3Qz7KPLU7H8H72erD4kV4CY=; b=WGYwu/ljr6SR40g3XfM+Zlxf3eJr6m5It5gITwywxJgYfb794QsZApYMq172S4C17Qp1JB GbJC8jItkMAOrRWckFO+ec5Mtbd5DRsyHCz3Ofyg8E4rrejqC7n6drP8wgZ8govJgWACnb wXJKmUIN57epf0hvmi/f4W5NHIYK6e0Vbej+YKM/eiwldwMPKLM12NleR2apFXYDM1JNc2 M1+BLeFJ23Q6A2FvyVLVAXLoqBVLl9hCdHma3YOGF4g2QjS6PQ22bjX5zyZefYS5pomFoC njjy3/TUl3SqMbrI5kKm5Cu5xJQ7Gla52DSQwJ3g+GwxKqTHlv9xAc9hTbCHjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689063925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lyOx1dAnmP7H3tQRECP+3Qz7KPLU7H8H72erD4kV4CY=; b=mFrtakn89v2cihDU9hJTnKTDkSPO+zOZb+PZSsDAhsSCjPs4bq76CgI6q3jBhLSMdqcyQC SslHvzricOOCl7ghPG7Mzdc0GaW6g8kEleWUJyF7jQLJWr0nk2/tL1CPyU6/TKxY6IrEhO 0JmkN1HX9tUoEl7OfHht0c5i1Jre833mhUzqcF77SYKto+xLPfJCksd3GC8/gHic1BkpPN mA/izvcDvQNlI3tbrJpTIpPfLv582Abus4PvgAccm0WwrHV0VPC0w+ykmGxU2y68lGUifM TrT5HFlhybeZAvakOBwB1TdTxyd8/HESEUQwfh8Mm/os+c9fI6/hQueqkGAOoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689063925; a=rsa-sha256; cv=none; b=Io+4gNj20YE9vlq8OA2ryJFhxy9X+INefr3+Zj20uFFFKJO1N9JxRJjXFhlqsXzAoKjxlK tpr6HbWeigtE4kdvhJuXANqDOXi9zUpFByBhvr6Zd2xC6COhccEnfYK2TvtnA/W4cVltig CF/0zQYHlY0CRDQj0SfLGgjQv8IR36mmIiGJVebckNCnRLxf19yRr3l0h/rVKoMZCsSKmX qGV2OgGkXG3SrNXrXaYYPN6QFeu5X5ARNdLr9xehGT8QypLUV38/+mEijtE83DpHfcqMUM 328W2kuuMpgN5s0Rpix0qycFmwnJaQvsB6lMJmbYQycwDlYIrp/6wL1+zpfgfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0YpY4JSRzK28; Tue, 11 Jul 2023 08:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B8PPJI044361; Tue, 11 Jul 2023 08:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B8PP4e044360; Tue, 11 Jul 2023 08:25:25 GMT (envelope-from git) Date: Tue, 11 Jul 2023 08:25:25 GMT Message-Id: <202307110825.36B8PP4e044360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 77c2bbac7194 - main - net/openldap25-server: upgrade to 2.5.15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77c2bbac71945da8e6e25294196e05366c5f2d15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=77c2bbac71945da8e6e25294196e05366c5f2d15 commit 77c2bbac71945da8e6e25294196e05366c5f2d15 Author: Xin LI AuthorDate: 2023-07-11 08:24:54 +0000 Commit: Xin LI 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;