[tomcat-native] 01/03: Remove OpenSSL 1.0.2 patch file as that version is no longer supported

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit c49be394cc945c0c1c4656d68eb5c69846791e7e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 16:21:13 2020 +0100

    Remove OpenSSL 1.0.2 patch file as that version is no longer supported
---
 native/srclib/openssl/openssl-msvcrt.patch | 41 ------------------------------
 1 file changed, 41 deletions(-)

diff --git a/native/srclib/openssl/openssl-msvcrt.patch 
b/native/srclib/openssl/openssl-msvcrt.patch
deleted file mode 100644
index d494e89..0000000
--- a/native/srclib/openssl/openssl-msvcrt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- crypto/o_time.c
-+++ crypto/o_time.c
-@@ -109,10 +109,6 @@
-     if (gmtime_r(timer, result) == NULL)
-         return NULL;
-     ts = result;
--#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
--    if (gmtime_s(result, timer))
--        return NULL;
--    ts = result;
- #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
-     ts = gmtime(timer);
-     if (ts == NULL)
---- util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -45,7 +45,7 @@
-     # considered safe to ignore.
-     # 
-     $base_cflags= " $mf_cflag";
--    my $f = $shlib || $fips ?' /MD':' /MT';
-+    my $f = ' /MD';
-     $opt_cflags=$f.' /Ox';
-     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-     $lflags="/nologo /subsystem:console /opt:ref";
-@@ -130,7 +130,7 @@
- else  # Win32
-     {
-     $base_cflags= " $mf_cflag";
--    my $f = $shlib || $fips ?' /MD':' /MT';
-+    my $f = ' /MD';
-     $ff = "/fixed";
-     $opt_cflags=$f.' /Ox /O2 /Ob2';
-     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -194,6 +194,7 @@
-       {
-       $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
-       $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` 
=~ /14\.00\.4[0-9]{4}\./);
-+      $ex_libs.=' $(EXTRA_LIBS)';
-       # WIN32 UNICODE build gets linked with unicows.lib for
-       # backward compatibility with Win9x.
-       $ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ 
/\-DUNICODE/);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org