You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2016/03/06 19:46:46 UTC
svn commit: r1733827 -
/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
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.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1733827 -
/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
Posted by Mark Thomas <ma...@apache.org>.
On 07/03/2016 08:54, Rainer Jung wrote:
> Am 07.03.2016 um 08:27 schrieb Mark Thomas:
>> On 06/03/2016 18:46, rjung@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.
<snip/>
> Or was your question, why the update for the patch was needed? I got a
> reject file for the original patch.
That was my question. I didn't read the diff closely enough. I thought
you were changing what the patch did, not updating it for 1.0.2g.
I'm in the middle of building with APR 1.5.2 and OpenSSL 1.0.2g. I'll
post the results as soon as I have them.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1733827 -
/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
Posted by Rainer Jung <ra...@kippdata.de>.
Am 07.03.2016 um 08:27 schrieb Mark Thomas:
> On 06/03/2016 18:46, rjung@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.
The srclib/BUILDING file contains:
"Apply openssl-msvcrt.patch
This patch makes sure that static version of OpenSSL libraries
is linked to msvcrt.dll instead statically linking msvcrt.
Without that patch it won't be possible to create statically linked
Tomcat native .dll"
And I followed this procedure.
The patch seems to cover two areas:
- making sure to link in the MSVC runtime library dynamically
(see https://msdn.microsoft.com/de-de/library/2kzt1wy3.aspx)
I didn't check, whether the above reasoning for a need of this is
correct.
- allowing to add further dependency libs via "EXTRA_LIBS"
I will retry with the patch to check the differences. IMHO I didn't use
any EXTRA_LIBS.
Or was your question, why the update for the patch was needed? I got a
reject file for the original patch.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1733827 -
/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
Posted by Mark Thomas <ma...@apache.org>.
On 06/03/2016 18:46, rjung@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-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org