From nobody Tue Jul 11 08:25:26 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 4R0Ypb2n3wz4h4Bc; Tue, 11 Jul 2023 08:25:27 +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 4R0YpZ6wZmz3FF3; Tue, 11 Jul 2023 08:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689063927; 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=GfiBFcfO3h9tG1hb2JYzWqHErQSUBw/PTrUOL/01o1I=; b=ywjU3uPTedmIjZcFAw3bTbX3uaekvskBL+m80W9wi8vK9MoHetsWkT4cswi/Rw9r21tEuX BYeurj0NcRlMybN/14Y68yEAXMfOvw/J37b0xZyZlXzvoH8tgKGov5LRs/ZFwQH2OSUOLU 0OvclMyKi7p8FxcrlcM3kSEqEuBL9mekaOkoygrWWt6AENBmaDeDy3q/lybnvgm0lt/7KY z7FLu2671xRa1hqyYwWrdRU3Bl+ZOCTsKeQTVvlPg28ZmComIEA0qQNMlwUn7ZC4wO5ZYZ FjuKTOHyq5SJmdg1aOzk3TJpufE6DpRjLLUuYi7fYR014GEjYYhHhTsXvIT1+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689063927; 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=GfiBFcfO3h9tG1hb2JYzWqHErQSUBw/PTrUOL/01o1I=; b=WeKrbDjx8XYNI4P44rFmZHu6tXSUwbF1ZevNd4gXsDwzIoU2iphuKXXrqg7Fbg7VnwWp0L mw5VMrZiOPZuZLp3NrhWCwY66/6nOMxqr+k5+pEkFNhCC8JaPhEQBAt6aQaG8Lm8uJmLNE 2I8Do7rvlTqL/dZ6gMY87QiVJfYFbPI8mTRVTSHStZ4fBwinOSQzUqR4ZSLQT0ACZ45aHc ODzMTwCBZe9Nbw9uGauNyZTEzGk0MzK6URgtfiq2KsUUKqYNsS10kDnBNZwNKY3bj6dojz O0vOFtw21lbaVRdNuTwMCdN+MryHhvEfAsn1nZfdhH39SY2HUD56A7pRPP1Xdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689063927; a=rsa-sha256; cv=none; b=sg4PUg4dUZHc3TwTlTExEtAwZgCuTBexz7v44wAFN+0xJ9yEAuUFou20O/jNiJMggzaywu PP+XIU1skVJNavQtuL3mN46Ng9PMw20LWPPjRPIIvt0AbZsA3bmd9bAMYSSnm/ghbtzVXq UBpxHnzmFZYbI9yLFS9w2sTz4QZdCr09L60yX3F5W+jJwi7mR0OkIlhuRpNjGAV9l2BgQj 43lQT1FmNdMfP7ixg5ILz+vg35jDVt7BTSluFn3qj4MYGmlAdV1ik2UOA+32KDvO2+bkMr KU/QiLa7+j22Xx/5O1ijtr3E5nTda/3GT9fn+oucBOMnyXzyUgt/q/d/d9SK5g== 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 4R0YpZ5FZMzKCt; Tue, 11 Jul 2023 08:25:26 +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 36B8PQ7T044385; Tue, 11 Jul 2023 08:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B8PQL8044384; Tue, 11 Jul 2023 08:25:26 GMT (envelope-from git) Date: Tue, 11 Jul 2023 08:25:26 GMT Message-Id: <202307110825.36B8PQL8044384@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: ee18505b11d1 - main - net/openldap26-server: upgrade to 2.6.5. 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: ee18505b11d1b8ce2a55e1521f536c1eb58f0dab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee18505b11d1b8ce2a55e1521f536c1eb58f0dab commit ee18505b11d1b8ce2a55e1521f536c1eb58f0dab Author: Xin LI AuthorDate: 2023-07-11 08:25:04 +0000 Commit: Xin LI 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;