From nobody Fri Nov 29 02:56:10 2024 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 4XzyVg0DwWz5fgLy; Fri, 29 Nov 2024 02:56:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XzyVf6sFSz4QDW; Fri, 29 Nov 2024 02:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732848971; 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=gIqpVfcpdN4VUycdauoNs5k4IMv96O9eB0FvBnLLGug=; b=Cc6h3VEjU1P33btuHQ+HyJJRGv8SGhTCsU4vuczu2mmzUT+Pb8pzKhXA0wQv1JZuy3H4db xxAuBKfMos5DKz4NP3foXURWxWjmc5lM//jRR+TDr+1Xa4AYQjDZezjvg74ZNdW3SQswrl 6ri2tVbrDboUI/QiVCSeH/EBAUt/oii057cN07qxqtL8vv6tE+ep+s3JGMUQzN5aTrEEf/ Q/POST585GPOO3fpiey8o4h3y17Xh0MuZ+efX12hEn1PqjjTNWQTvOlrg52ULuZQM1jSpp Db/iDhVPiCcjC7V2hkxaGfElPqiQtWfUGHqMrUjXN5p6lQyXrhTjYbg/S/LXyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732848971; 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=gIqpVfcpdN4VUycdauoNs5k4IMv96O9eB0FvBnLLGug=; b=b3NCCJ383cnN04BwVNrwSR1Smir7MQDlUuSy4ABPJUOIA1HSv9ac1y9SkFHOit76hnjy3H ccvSk4xa69+KAXZgK4JOiAyjhAU8aoopt0/4yx1avdm3fYf11TMlG6NYDiwBjykbxd45T9 dB/KInvHu8Q+ZogJeQfwokua6LlGX83lVW0G6Opgq7WVxGCgeFh+R//YxeshXpEhmaaOuf a/YNi1Smw0KifB23mNhDlqa+Ui4mO6fO5BQYcLrWc0ePrQ8NEtGtcJTGFqA1Gk8u6Eu6Pj 45eXU+0y/Vv53SP1VK26IKEiERzZKJwDzJOy382RCeZvu5cxDlmRxO4k7mi8Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732848971; a=rsa-sha256; cv=none; b=KrNO7RTRUeSVAlWzcC8iHl7Zbz9Pt0NRw9Ud0ZguMVcSU2ys3049qpYory+6jNJTfAGpqR 4Z7ZmoPGY4tj9a1DioTmz40xuEqwl7suaTMXlmacRsfMR2ogfm5uErZt19Yd3C1KNyAv1u 6hV8QD8X/0W4TsFxCxvNM8BpcyMS+vOWufR1Fit5IbUQC7hnUjWcV79DCScmhCgS/bxjk7 r1pZNNvTo6r1p3DwyWuSqjhpZ/FjHj+C7Voi/ijmC7bV8Jz8kGVsN1kIJDc9RVfsA5+0GA WX26zOLERqWokoXqnbJC10nkuSArH+WX1LwRUwNZsxIEEf7kVlKHwEsyZOhVZA== 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 4XzyVf6SHmz15Lm; Fri, 29 Nov 2024 02:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AT2uAXg007871; Fri, 29 Nov 2024 02:56:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AT2uAQB007868; Fri, 29 Nov 2024 02:56:10 GMT (envelope-from git) Date: Fri, 29 Nov 2024 02:56:10 GMT Message-Id: <202411290256.4AT2uAQB007868@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: b85ae9d24ea1 - main - net/openldap26-server: upgrade to 2.6.9. 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: b85ae9d24ea1ea119fba33fc235d40fef02bb2ad Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=b85ae9d24ea1ea119fba33fc235d40fef02bb2ad commit b85ae9d24ea1ea119fba33fc235d40fef02bb2ad Author: Xin LI AuthorDate: 2024-11-29 00:41:51 +0000 Commit: Xin LI CommitDate: 2024-11-29 02:56:03 +0000 net/openldap26-server: upgrade to 2.6.9. --- net/openldap26-server/Makefile | 2 +- net/openldap26-server/distinfo | 6 +++--- net/openldap26-server/files/patch-libraries_libldap_tls__o.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index b3ea474da171..3981c53e90ab 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= openldap -DISTVERSION= 2.6.8 +DISTVERSION= 2.6.9 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 5aaa7aa1a048..bcc5eec2a031 100644 --- a/net/openldap26-server/distinfo +++ b/net/openldap26-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717220468 -SHA256 (openldap-2.6.8.tgz) = 48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e -SIZE (openldap-2.6.8.tgz) = 6512544 +TIMESTAMP = 1732840058 +SHA256 (openldap-2.6.9.tgz) = 2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff +SIZE (openldap-2.6.9.tgz) = 6516669 diff --git a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c index 8ac919526e6b..5d6af668480d 100644 --- a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c +++ b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c @@ -1,6 +1,6 @@ ---- libraries/libldap/tls_o.c.orig 2024-01-29 18:52:23 UTC +--- libraries/libldap/tls_o.c.orig 2024-11-26 17:11:04 UTC +++ libraries/libldap/tls_o.c -@@ -281,7 +281,7 @@ tlso_ctx_free ( tls_ctx *ctx ) +@@ -288,7 +288,7 @@ tlso_ctx_free ( tls_ctx *ctx ) SSL_CTX_free( c ); } @@ -9,12 +9,12 @@ static char * tlso_stecpy( char *dst, const char *src, const char *end ) { -@@ -427,7 +427,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls +@@ -435,7 +435,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls if ( lo->ldo_tls_ciphersuite ) { char *oldsuites = lt->lt_ciphersuite; -#if OPENSSL_VERSION_NUMBER >= 0x10101000 +#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(OPENSSL_NO_TLS1_3) - tlso_ctx_cipher13( ctx, lt->lt_ciphersuite, &oldsuites ); - #endif - if ( oldsuites && !SSL_CTX_set_cipher_list( ctx, oldsuites ) ) + if ( tlso_ctx_cipher13( ctx, lt->lt_ciphersuite, &oldsuites )) + { + Debug1( LDAP_DEBUG_ANY,