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
The following commit(s) were added to refs/heads/1.2.x by this push: new 5e4c081a2 Add patch file for OpenSSL 3.0.x (copied from main) 5e4c081a2 is described below commit 5e4c081a2f8e661fbcd5c0c6015fa431db99249d Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jun 21 19:57:15 2022 +0100 Add patch file for OpenSSL 3.0.x (copied from main) --- native/srclib/openssl/openssl-msvcrt-3.0.x.patch | 86 ++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch new file mode 100644 index 000000000..2f5634ede --- /dev/null +++ b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch @@ -0,0 +1,86 @@ +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 = ( + # prefer [non-debug] openssl.exe to be free from Micorosoft RTL + # redistributable. + bin_cflags => add(picker(debug => "/MDd", +- release => sub { $disabled{shared} ? "/MT" : () }, ++ release => "/MD", + )), + bin_lflags => add("/subsystem:console /opt:ref"), + ex_libs => add(sub { +diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c +index 059afe47b9..cbece5fcb3 100644 +--- a/apps/lib/s_socket.c ++++ b/apps/lib/s_socket.c +@@ -31,7 +31,7 @@ typedef unsigned int u_int; + + /* MSVC renamed some POSIX functions to have an underscore prefix. */ + # ifdef _MSC_VER +-# define getpid _getpid ++# define getpid GetCurrentProcessId + # endif + #endif + +diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c +index ed611d64dd..09238bfb7d 100644 +--- a/crypto/cmp/cmp_util.c ++++ b/crypto/cmp/cmp_util.c +@@ -9,6 +9,7 @@ + * https://www.openssl.org/source/license.html + */ + ++#include "e_os.h" + #include <string.h> + #include <openssl/cmp_util.h> + #include "cmp_local.h" /* just for decls of internal functions defined here */ +diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c +index 91656e6b80..e0692e5618 100644 +--- a/crypto/engine/eng_openssl.c ++++ b/crypto/engine/eng_openssl.c +@@ -18,6 +18,7 @@ + #include "internal/deprecated.h" + + #include <stdio.h> ++#include "e_os.h" + #include <openssl/crypto.h> + #include "internal/cryptlib.h" + #include "crypto/engine.h" +diff --git a/engines/e_capi.c b/engines/e_capi.c +index 6f223a6922..045d1368fd 100644 +--- a/engines/e_capi.c ++++ b/engines/e_capi.c +@@ -18,6 +18,7 @@ + # include <wincrypt.h> + + # include <stdio.h> ++# include "e_os.h" + # include <string.h> + # include <stdlib.h> + # include <malloc.h> +diff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c +index 92f3de9300..e84301946e 100644 +--- a/test/testutil/basic_output.c ++++ b/test/testutil/basic_output.c +@@ -7,6 +7,7 @@ + * https://www.openssl.org/source/license.html + */ + ++#include "e_os.h" + #include "../testutil.h" + #include "output.h" + #include "tu_local.h" +diff --git a/test/testutil/provider.c b/test/testutil/provider.c +index d073d732da..8a96f9a151 100644 +--- a/test/testutil/provider.c ++++ b/test/testutil/provider.c +@@ -7,6 +7,7 @@ + * https://www.openssl.org/source/license.html + */ + ++#include "e_os.h" + #include "../testutil.h" + #include <openssl/provider.h> + #include <string.h> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org