This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit b5f9906d605e90213ee49c74d508cbdc42c7d6f9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 22 16:41:10 2025 +0100
Patch no longer needed with updated build environment
---
native/srclib/openssl/openssl-msvcrt-3.0.x.patch | 98 ------------------------
1 file changed, 98 deletions(-)
diff --git a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
deleted file mode 100644
index c3d78ab21..000000000
--- a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index ff8af71463..6df28ea847 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -1379,7 +1379,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 7cf27cc9d4..759d15262e 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..cf51ed08fe 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/crypto/property/property_parse.c
b/crypto/property/property_parse.c
-index 19ea39a786..137c2a35b8 100644
---- a/crypto/property/property_parse.c
-+++ b/crypto/property/property_parse.c
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <openssl/err.h>
-+#include "internal/numbers.h"
- #include "internal/propertyerr.h"
- #include "internal/property.h"
- #include "crypto/ctype.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 79ae13b42a..7aeda67e0d 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 <ctype.h>
- #include <openssl/provider.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
