From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 811FC15806E for ; Fri, 26 May 2023 09:35:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD352E086D; Fri, 26 May 2023 09:35:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D98FE086D for ; Fri, 26 May 2023 09:35:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA42034092D for ; Fri, 26 May 2023 09:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 411A5A6C for ; Fri, 26 May 2023 09:35:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685093716.3fba530b2684f515d1da5f8e0baa1116a3e29f5a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/, www-servers/apache/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/apache/apache-2.4.57.ebuild www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch X-VCS-Directories: www-servers/apache/files/ www-servers/apache/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3fba530b2684f515d1da5f8e0baa1116a3e29f5a X-VCS-Branch: master Date: Fri, 26 May 2023 09:35:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 47e9a729-40a2-43c1-899b-f98eeb40671c X-Archives-Hash: e762dba9f5bac20875cfea2e8d4cb005 commit: 3fba530b2684f515d1da5f8e0baa1116a3e29f5a Author: Sam James gentoo org> AuthorDate: Fri May 26 09:06:58 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 26 09:35:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fba530b www-servers/apache: fix build w/ rustls-ffi-0.10.0 Closes: https://bugs.gentoo.org/906523 Signed-off-by: Sam James gentoo.org> www-servers/apache/apache-2.4.57.ebuild | 3 +- .../files/apache-2.4.57-rustls-ffi-0.10.0.patch | 51 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/www-servers/apache/apache-2.4.57.ebuild b/www-servers/apache/apache-2.4.57.ebuild index be1f9d9f9ca6..6b8092bd3916 100644 --- a/www-servers/apache/apache-2.4.57.ebuild +++ b/www-servers/apache/apache-2.4.57.ebuild @@ -149,10 +149,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv PATCHES=( "${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868 "${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836 + "${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523 ) pkg_setup() { - # dependend critical modules which are not allowed in global scope due + # dependent critical modules which are not allowed in global scope due # to USE flag conditionals (bug #499260) use ssl && MODULE_CRITICAL+=" socache_shmcb" use doc && MODULE_CRITICAL+=" alias negotiation setenvif" diff --git a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch b/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch new file mode 100644 index 000000000000..81869f7bbf00 --- /dev/null +++ b/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch @@ -0,0 +1,51 @@ +https://github.com/apache/httpd/commit/0495a95f511c0bc7f34dc1b706d6d8276865743b +https://bugs.gentoo.org/906523 + +From 0495a95f511c0bc7f34dc1b706d6d8276865743b Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Tue, 2 May 2023 09:21:07 +0000 +Subject: [PATCH] Backport of r1909558 from trunk: + + *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. + Checking in configure for proper version installed. Code + fixes for changed clienthello member name. + + + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909561 13f79535-47bb-0310-9956-ffa450edef68 +--- /dev/null ++++ b/changes-entries/tls-rustls-update.txt +@@ -0,0 +1,4 @@ ++ *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. ++ Checking in configure for proper version installed. Code ++ fixes for changed clienthello member name. ++ [Stefan Eissing] +\ No newline at end of file +--- a/modules/tls/config2.m4 ++++ b/modules/tls/config2.m4 +@@ -109,9 +109,10 @@ AC_DEFUN([APACHE_CHECK_RUSTLS],[ + fi + fi + +- AC_MSG_CHECKING([for rustls version >= 0.8.2]) ++ AC_MSG_CHECKING([for rustls version >= 0.9.2]) + AC_TRY_COMPILE([#include ],[ + rustls_version(); ++rustls_acceptor_new(); + ], + [AC_MSG_RESULT(OK) + ac_cv_rustls=yes], +--- a/modules/tls/tls_core.c ++++ b/modules/tls/tls_core.c +@@ -507,8 +507,8 @@ static const rustls_certified_key *extract_client_hello_values( + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "extract client hello values"); + if (!cc) goto cleanup; + cc->client_hello_seen = 1; +- if (hello->sni_name.len > 0) { +- cc->sni_hostname = apr_pstrndup(c->pool, hello->sni_name.data, hello->sni_name.len); ++ if (hello->server_name.len > 0) { ++ cc->sni_hostname = apr_pstrndup(c->pool, hello->server_name.data, hello->server_name.len); + ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "sni detected: %s", cc->sni_hostname); + } + else { +