This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 5069c633290d823c2c89a8f64bfb2735b938b51a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 28 12:18:41 2023 +0100
Enable patch to apply cleanly to OpenSSL 3.0.11
---
native/srclib/openssl/openssl-msvcrt-3.0.x.patch | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
index cb2d5a4ae..7d181907e 100644
--- a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
+++ b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
@@ -2,7 +2,7 @@ diff --git a/Configurations/10-main.conf
b/Configurations/10-main.conf
index 66bc81dfb4..52345e4f33 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
-@@ -1369,7 +1369,7 @@ my %targets = (
+@@ -1379,7 +1379,7 @@ my %targets = (
# prefer [non-debug] openssl.exe to be free from Micorosoft RTL
# redistributable.
bin_cflags => add(picker(debug => "/MDd",
@@ -83,4 +83,5 @@ index d073d732da..8a96f9a151 100644
+#include "e_os.h"
#include "../testutil.h"
#include <ctype.h>
- #include <openssl/provider.h>
\ No newline at end of file
+ #include <openssl/provider.h>
+
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
