From nobody Fri Nov 29 02:56:11 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 4XzyVh2Y7Vz5fgHc; Fri, 29 Nov 2024 02:56:12 +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 4XzyVh1xFNz4Q2j; Fri, 29 Nov 2024 02:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732848972; 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=puaJjmrMf1CFjU8G7SBwtF+R5M7k9QWeBg7RLsNDtbA=; b=mZlDDyw4CVXgRHpfZO7D02h5GnwAp8DBSZ0w3E+SThMy3bnExkyIwFv34QeV7mSgNy9nuw BCbWcCzJKCfrq/V2U6jg+mcPd+7En6TosydyPux94EEDfEMssKO/AGAmQO0iexGBWwKCCk 6qLgRoFP6Hi/80BD/MjmKpuBkqiT0+eHIP0bG4J1Yb8LVy7YhUAvhXMWkyYxWToUEgkU9W sgm9s158CGjdLkjoHEow8f5rxTdsC+gNtNTFsFU1uywvx/m1hVgjlhfGi416AjbkysxbNV VcADFxkOLA/1BCH0RF1/6V5QdGLMOkmYp6clZuz73iM2hVQBPPIbbCgg2gWkfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732848972; 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=puaJjmrMf1CFjU8G7SBwtF+R5M7k9QWeBg7RLsNDtbA=; b=r1ZIY4iYoOmYTz8aMQXj22lSUlwclFDUsNyOde1ocdbjSROt3ZXjs/Dnl7vvYlW60TvdO2 M1IOW5JnvIHYnrCBsUWHDaKEbCqWzM9qwmi0SubhCIcWrrTpazoFcav1REobCmj/z905IK 3aXOu0RTPIG//6Hnbrzr5KItTe4gjo9Tm2a4HbXwnQMcFJmeAkhxy0Pgx7CX36Iiwx6lN2 C40Po1GOBPMTTM+Z2HoJQuPhposSqxN4oBk69LPVICHPnJCbm9iz6cLWciJZNAWuPi9pOf NNEZGZx548TXFP/6WQrjttxIixRD2yvpyUDe2HVgihdwIIxJwj6btIn02GJHLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732848972; a=rsa-sha256; cv=none; b=EA2ElRo1R2dc+mMdhHXMv/PJlca8/ykoJ4hUQyyewmNvI+jfVCvi5Jf2Z2o/kCF87q0pm1 w8N2C6L8PU5i+mqy7SRwSw0DgsuT3ZUR9ii/TLs/Vo0lrQDUrbXMPOA2EIWUXPI9yJXbRT UarCig3WVYwt2HZ9ZZIYg60xZL7adIxwURG3nfbBzCLPPjkTjJlWcqXvQos7M8k1uRsWOM NwTjv+j/VIbN5M7k7wSIrwiVlhyePyg+pCZKWwN/HSSMpjFZ5Y4+vWf12JyfFmYxZ/BW6Y wCtjRMM9I0khmVEzgMAwLe8CmHhd7NX7qZL5OcJkmx7sgxvhTGzAPcwmJxkmUg== 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 4XzyVh0JRFz14wX; Fri, 29 Nov 2024 02:56:12 +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 4AT2uB1R007915; Fri, 29 Nov 2024 02:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AT2uBa1007911; Fri, 29 Nov 2024 02:56:11 GMT (envelope-from git) Date: Fri, 29 Nov 2024 02:56:11 GMT Message-Id: <202411290256.4AT2uBa1007911@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: d7144e7d74cf - main - net/openldap25-server: upgrade to 2.5.19. 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: d7144e7d74cf47fc5ffc8b5e254e1470f312c989 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7144e7d74cf47fc5ffc8b5e254e1470f312c989 commit d7144e7d74cf47fc5ffc8b5e254e1470f312c989 Author: Xin LI AuthorDate: 2024-11-29 01:11:47 +0000 Commit: Xin LI CommitDate: 2024-11-29 02:56:03 +0000 net/openldap25-server: upgrade to 2.5.19. --- net/openldap25-server/Makefile | 4 ++-- net/openldap25-server/distinfo | 6 +++--- net/openldap25-server/files/patch-configure | 11 +---------- net/openldap25-server/files/patch-configure.ac | 11 ----------- net/openldap25-server/files/patch-libraries_libldap_tls__o.c | 12 ++++++------ 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index 8e536dc4b7d1..2f3fcfff2d08 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= openldap -DISTVERSION= 2.5.18 +DISTVERSION= 2.5.19 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ @@ -49,7 +49,7 @@ GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share PORTREVISION_CLIENT= 0 PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 0 -OPENLDAP_SHLIB_MINOR= 1.13 +OPENLDAP_SHLIB_MINOR= 1.14 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= DEBUG FETCH GSSAPI diff --git a/net/openldap25-server/distinfo b/net/openldap25-server/distinfo index b783ecfda7b7..235a8e47702d 100644 --- a/net/openldap25-server/distinfo +++ b/net/openldap25-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717220274 -SHA256 (openldap-2.5.18.tgz) = 2670ae43d8d99dd6b1ba182101d982350d613d09c098eb1607ea6b36e6b51d3e -SIZE (openldap-2.5.18.tgz) = 6462214 +TIMESTAMP = 1732840944 +SHA256 (openldap-2.5.19.tgz) = 56e2936c7169aa7547cfc93d5c87db46aa05e98dee6321590c3ada92e1fbb66c +SIZE (openldap-2.5.19.tgz) = 6458108 diff --git a/net/openldap25-server/files/patch-configure b/net/openldap25-server/files/patch-configure index 64e5de17eab3..a3372a8f7efc 100644 --- a/net/openldap25-server/files/patch-configure +++ b/net/openldap25-server/files/patch-configure @@ -1,14 +1,5 @@ ---- configure.orig 2024-05-21 17:19:57 UTC +--- configure.orig 2024-11-26 17:12:48 UTC +++ configure -@@ -14157,7 +14157,7 @@ fi - PERL_CPPFLAGS="$PERL_CPPFLAGS $opt" - done - PERL_LDFLAGS="" -- for opt in `$PERLBIN" -MExtUtils::Embed -e ldopts`; do -+ for opt in `$PERLBIN -MExtUtils::Embed -e ldopts`; do - case "$opt" in - "-lc" ) - continue;; @@ -16837,9 +16837,9 @@ if test $have_uuid = no ; then fi diff --git a/net/openldap25-server/files/patch-configure.ac b/net/openldap25-server/files/patch-configure.ac deleted file mode 100644 index 6bd215811596..000000000000 --- a/net/openldap25-server/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2024-05-21 17:19:57 UTC -+++ configure.ac -@@ -746,7 +746,7 @@ if test $ol_enable_perl != no ; then - PERL_CPPFLAGS="$PERL_CPPFLAGS $opt" - done - PERL_LDFLAGS="" -- for opt in `$PERLBIN" -MExtUtils::Embed -e ldopts`; do -+ for opt in `$PERLBIN -MExtUtils::Embed -e ldopts`; do - case "$opt" in - "-lc" ) - continue;; diff --git a/net/openldap25-server/files/patch-libraries_libldap_tls__o.c b/net/openldap25-server/files/patch-libraries_libldap_tls__o.c index 563d964041a8..9b4681e95901 100644 --- a/net/openldap25-server/files/patch-libraries_libldap_tls__o.c +++ b/net/openldap25-server/files/patch-libraries_libldap_tls__o.c @@ -1,6 +1,6 @@ ---- libraries/libldap/tls_o.c.orig 2024-01-29 18:53:15 UTC +--- libraries/libldap/tls_o.c.orig 2024-11-26 17:12:48 UTC +++ libraries/libldap/tls_o.c -@@ -279,7 +279,7 @@ tlso_ctx_free ( tls_ctx *ctx ) +@@ -286,7 +286,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 ) { -@@ -425,7 +425,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls +@@ -433,7 +433,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,