Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 11:16:20 -0400 (Thu, 06 Jun 2013)
New Revision: 3083
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
Use:
https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/native/srcl...
need to rollback r3082 (wrong version).
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 14:18:19 UTC (rev 3082)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 15:16:20 UTC (rev 3083)
@@ -1,20 +1,28 @@
---- util/pl/VC-32.pl 2013-06-04 07:50:54.201533400 -0400
-+++ util/pl/VC-32.pl 2013-06-04 07:52:50.994670900 -0400
-@@ -49,7 +49,7 @@
- $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN
-DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+--- util/pl/VC-32.pl
++++ util/pl/VC-32.pl
+@@ -43,7 +43,7 @@
+ # considered safe to ignore.
+ #
+ $base_cflags= " $mf_cflag";
- my $f = $shlib || $fips ?' /MD':' /MT';
-+ my $f = $shlib || $fips ?' /MD':' /MD';
++ 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';
-@@ -114,7 +114,7 @@
- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+@@ -124,7 +124,7 @@
+ else # Win32
+ {
+ $base_cflags= " $mf_cflag";
- my $f = $shlib || $fips ?' /MD':' /MT';
-+ my $f = $shlib || $fips ?' /MD':' /MD';
++ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+@@ -175,6 +175,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/);