summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2023-10-19 14:10:17 +0200
committerHans de Graaff <graaff@gentoo.org>2023-10-19 14:10:17 +0200
commit39aa4f5d435a7c0888a494b7f86772bb94b86418 (patch)
tree5de12e5aaa28084c99b5468089dd8adbbfff11c9
parentDrop 2.4 libtool patch (diff)
downloadapache-39aa4f5d435a7c0888a494b7f86772bb94b86418.tar.gz
apache-39aa4f5d435a7c0888a494b7f86772bb94b86418.tar.bz2
apache-39aa4f5d435a7c0888a494b7f86772bb94b86418.zip
Remove rustls-ffi patch
This patch was taken from upstream and has been released in apache 2.0.48. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
-rw-r--r--2.4/patches/06_rustls_ffi.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/2.4/patches/06_rustls_ffi.patch b/2.4/patches/06_rustls_ffi.patch
deleted file mode 100644
index 81869f7..0000000
--- a/2.4/patches/06_rustls_ffi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/apache/httpd/commit/0495a95f511c0bc7f34dc1b706d6d8276865743b
-https://bugs.gentoo.org/906523
-
-From 0495a95f511c0bc7f34dc1b706d6d8276865743b Mon Sep 17 00:00:00 2001
-From: Stefan Eissing <icing@apache.org>
-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.h>],[
- 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 {
-