On 06/03/2016 18:46, rj...@apache.org wrote: > Author: rjung > Date: Sun Mar 6 18:46:46 2016 > New Revision: 1733827 > > URL: http://svn.apache.org/viewvc?rev=1733827&view=rev > Log: > Update OpenSSL patch for OpenSSL 1.0.2g.
Why was this necessary? I built 1.2.5 with 1.0.2g on Windows without this patch. Mark > > Modified: > tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch > > Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch?rev=1733827&r1=1733826&r2=1733827&view=diff > ============================================================================== > --- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch (original) > +++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch Sun Mar 6 > 18:46:46 2016 > @@ -1,24 +1,24 @@ > --- util/pl/VC-32.pl > +++ util/pl/VC-32.pl > -@@ -43,7 +43,7 @@ > +@@ -45,7 +45,7 @@ > # considered safe to ignore. > # > $base_cflags= " $mf_cflag"; > - my $f = $shlib || $fips ?' /MD':' /MT'; > + my $f = ' /MD'; > - $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib > $opt_cflags=$f.' /Ox'; > $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; > -@@ -124,7 +124,7 @@ > + $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'; > - $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib > + $ff = "/fixed"; > $opt_cflags=$f.' /Ox /O2 /Ob2'; > $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; > -@@ -175,6 +175,7 @@ > +@@ -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}\./); > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
