From nobody Wed Apr 20 09:20:16 2022 X-Original-To: dev-commits-ports-all@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 A03C911E5BE6; Wed, 20 Apr 2022 09:20:16 +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 4KjwB845jYz3rmk; Wed, 20 Apr 2022 09:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650446416; 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=//jrr8Zm5zu4K+GWV+aFP7rDM0NFGE+yfFH2MT8eH5A=; b=xsGXFIX0trstvHE+8lnvUn1wkqg/xv1EjGNC1gbARv5WXTkpvWD7/eqxzxaYihrDyMvd+u ZoW/pQc8rBTtk5FPF+AtzTkGMCop5Ry+FOVatbXebQfI1O6+jhsIlpbVXoKHte/DiwMlLH +xjJIxAM7hoF+FQhR6Y6uZ2NLrGGwazI439VcWSPxXsgBkyETEJkHrtThMS/Zgv2yyTEqX S0ZfXPDQla/U8KQ4jFkZKrNjC98LXeTiJiAq9dCqgSSbFxvL1BMp/s4Z0pypinPLX5B9fh QJqmQ9IKjWIuVbDoBlRT0dIjQ3iN1Tcc1TA966iidZds8054Tm21DEK+DPmuWw== 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 68D5F11246; Wed, 20 Apr 2022 09:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23K9KGPQ099412; Wed, 20 Apr 2022 09:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23K9KGah099403; Wed, 20 Apr 2022 09:20:16 GMT (envelope-from git) Date: Wed, 20 Apr 2022 09:20:16 GMT Message-Id: <202204200920.23K9KGah099403@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: dadecc16117c - main - www/tomcat-native: update to 1.2.32 release List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dadecc16117c75b151c6c9e65969aa94b731b644 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650446416; 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=//jrr8Zm5zu4K+GWV+aFP7rDM0NFGE+yfFH2MT8eH5A=; b=ur3nwgaKkQ57Uf1AcpRGim/USmmO86kYAuHwmCqRai2ugPekUXK1MXNUtqvjrWVx4KxtI/ pOU6GYamwyhyR8v9WU6DibE72vmMlLqa0s68ZB/D3jQhy4ESrkjskCsZuiSBIjpFxWPCpZ ewXlQhWm1GR/G7rb9EUweBDJmtZaM4XO5412l4TlsDfppYe/JGXaGKu2PupmZEWktktGKo l6waYzQQKj29uFktbVBTmV6EgcBuy6p1FZor6ADU8jfcir+VYXbhk0ijJwE2hmUkd8yMCW +ji8JDKhsu2NpGsg4NbpizJKwn3O526T6rNiLVtZ2mQJrCB2tfNRxxrzykPrnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650446416; a=rsa-sha256; cv=none; b=cre+y802duJMltuzRhdWnwn8oLuthvX1UpNOc3lIMg9p0ZqGt4ROWRqtoIrjJ5aJ7SuFqq rGkLKfcHSgIcpkYifO9ARxv+znL/nGjYGlUaaC+pJ4YEB4rqhAHcjNhHeFegEafyA/YPp6 6/jFil6/PMiLQIV3r99UVtgk71NjEgyRMTkkFBz/0ccAWPBHFbqJtY5zyC7shhtH6b5VmR anT/6I0M6WKXdUWU0mS+WKQ3hwo3ILpd4DfUQlXI+o48A1wQpz4U6Qq9VPryg6P2LYtkIg Ip5ZYvkdcMLMsLjRip1gE5JY4EjspKxl7Ob5GSS+K3vTCHzBkaus6dar9OZHQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=dadecc16117c75b151c6c9e65969aa94b731b644 commit dadecc16117c75b151c6c9e65969aa94b731b644 Author: Alex Dupre AuthorDate: 2022-04-20 09:18:45 +0000 Commit: Alex Dupre CommitDate: 2022-04-20 09:20:06 +0000 www/tomcat-native: update to 1.2.32 release PR: 263254 Submitted by: Michael Osipov --- www/tomcat-native/Makefile | 3 +- www/tomcat-native/distinfo | 6 +-- .../files/patch-include_ssl__private.h | 11 ------ www/tomcat-native/files/patch-src_ssl.c | 46 ---------------------- 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile index ffb404e0362c..562c18b78be0 100644 --- a/www/tomcat-native/Makefile +++ b/www/tomcat-native/Makefile @@ -1,8 +1,7 @@ # Created by: Alex Dupre PORTNAME= tomcat-native -PORTVERSION= 1.2.24 -PORTREVISION= 1 +PORTVERSION= 1.2.32 CATEGORIES= www java MASTER_SITES= https://archive.apache.org/dist/tomcat/tomcat-connectors/native/${PORTVERSION}/source/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/www/tomcat-native/distinfo b/www/tomcat-native/distinfo index edf066136e31..e5a9b5826ed7 100644 --- a/www/tomcat-native/distinfo +++ b/www/tomcat-native/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588667024 -SHA256 (tomcat-native-1.2.24-src.tar.gz) = 037f52f9a345e766a7dde8361c55b3b69045928f9a8068a406612b603819e76c -SIZE (tomcat-native-1.2.24-src.tar.gz) = 419572 +TIMESTAMP = 1650442475 +SHA256 (tomcat-native-1.2.32-src.tar.gz) = 805ca999267f07afe701a8a434d517dc0b7f4317c366560f43c0fbca593578bd +SIZE (tomcat-native-1.2.32-src.tar.gz) = 429747 diff --git a/www/tomcat-native/files/patch-include_ssl__private.h b/www/tomcat-native/files/patch-include_ssl__private.h deleted file mode 100644 index da019e097d03..000000000000 --- a/www/tomcat-native/files/patch-include_ssl__private.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ssl_private.h.orig 2020-04-24 19:24:44 UTC -+++ include/ssl_private.h -@@ -241,7 +241,7 @@ - #define TLS_server_method SSLv23_server_method - #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ - --#if OPENSSL_VERSION_NUMBER >= 0x10101000L -+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) - #define HAVE_KEYLOG_CALLBACK - #endif - diff --git a/www/tomcat-native/files/patch-src_ssl.c b/www/tomcat-native/files/patch-src_ssl.c deleted file mode 100644 index 13c1e036beb5..000000000000 --- a/www/tomcat-native/files/patch-src_ssl.c +++ /dev/null @@ -1,46 +0,0 @@ ---- src/ssl.c.orig 2020-04-24 19:24:44 UTC -+++ src/ssl.c -@@ -367,11 +367,6 @@ static apr_status_t ssl_init_cleanup(void *data) - #endif - free_dh_params(); - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -- /* Openssl v1.1+ handles all termination automatically. Do -- * nothing in this case. -- */ --#else - /* - * Try to kill the internals of the SSL library. - */ -@@ -394,7 +389,6 @@ static apr_status_t ssl_init_cleanup(void *data) - #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - ERR_remove_thread_state(NULL); - #endif --#endif - - #ifdef HAVE_KEYLOG_CALLBACK - if (key_log_file) { -@@ -764,14 +758,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, - TCN_FREE_CSTRING(engine); - return (jint)APR_SUCCESS; - } --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -- /* Openssl v1.1+ handles all initialisation automatically, apart -- * from hints as to how we want to use the library. -- * -- * We tell openssl we want to include engine support. -- */ -- OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); --#else -+ - /* We must register the library in full, to ensure our configuration - * code can successfully test the SSL environment. - */ -@@ -785,6 +772,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, - #endif - OPENSSL_load_builtin_modules(); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #if ! (defined(WIN32) || defined(WIN64)) - err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit, - tcn_global_pool);