<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146395] trunk/dports/devel/openssl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146395">146395</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-03-06 13:23:52 -0800 (Sun, 06 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssl: Fix on 10.6, drop old patches, #50771
Reverts openssl's upstream commit
https://github.com/openssl/openssl/commit/fd7dc20
and applies an alternative suggested in a pull request at
https://github.com/openssl/openssl/pull/597
that would merge
https://github.com/akamai/openssl/commit/c4af68c
Both of these are (as far as I can see) supposed to fix the issue we solved
using x86_64-asm-on-i386.patch, so let's drop that instead, now that upstream
has a fix.
Upstream discussion for this is at
- https://mta.openssl.org/pipermail/openssl-dev/2016-March/005605.html
for the build failure on 10.6 and the possible fix of applying akamai's
c4af68c,
- https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
and
https://rt.openssl.org/Ticket/Display.html?id=3885&user=guest&pass=guest
for the original problem
Additionally, this change drops fix-Apple-clang-version-detection.patch, which
was submitted upstream at https://github.com/openssl/openssl/issues/494, but
finally fixed in a different way in
https://github.com/openssl/openssl/commit/e780ed033659cb1269a49c8952517559cbd76558
Closes: #50771</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslPortfile">trunk/dports/devel/openssl/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslfiles0001Revertperlasmx86_64xlateplpasspureconstantsvpatch">trunk/dports/devel/openssl/files/0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch</a></li>
<li><a href="#trunkdportsdevelopensslfiles0002RT3885OpenSSLfailstocrosscompileon32bit64bpatch">trunk/dports/devel/openssl/files/0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslfilesfixAppleclangversiondetectionpatch">trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch</a></li>
<li><a href="#trunkdportsdevelopensslfilesx86_64asmoni386patch">trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelopensslPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/openssl/Portfile (146394 => 146395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/Portfile 2016-03-06 21:10:48 UTC (rev 146394)
+++ trunk/dports/devel/openssl/Portfile 2016-03-06 21:23:52 UTC (rev 146395)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> patchfiles install-headers-HFS+.patch \
</span><span class="cx"> parallel-building.patch \
</span><span class="cx"> remove-duplicate-bn_print-doc.patch \
</span><del>- x86_64-asm-on-i386.patch \
- fix-Apple-clang-version-detection.patch
</del><ins>+ 0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch \
+ 0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch
</ins><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx"> configure.perl /usr/bin/perl
</span></span></pre></div>
<a id="trunkdportsdevelopensslfiles0001Revertperlasmx86_64xlateplpasspureconstantsvpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/openssl/files/0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch (0 => 146395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/files/0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch (rev 0)
+++ trunk/dports/devel/openssl/files/0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch 2016-03-06 21:23:52 UTC (rev 146395)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+From 6f79f210c690c31bce632570bf703a2360af6827 Mon Sep 17 00:00:00 2001
+From: Clemens Lang <neverpanic@gmail.com>
+Date: Sun, 6 Mar 2016 21:28:56 +0100
+Subject: [PATCH 1/2] Revert "perlasm/x86_64-xlate.pl: pass pure constants
+ verbatim."
+
+This reverts commit fd7dc201d3b9d43972de6a0e659f7ef6421c99cc.
+
+This commit causes build failures on OS X 10.6. For more details, see
+ https://mta.openssl.org/pipermail/openssl-dev/2016-March/005605.html
+
+Upstream-Status: Submitted [https://mta.openssl.org/pipermail/openssl-dev/2016-March/005605.html]
+---
+ crypto/perlasm/x86_64-xlate.pl | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index 0a023fb..29f94b5 100755
+--- ./crypto/perlasm/x86_64-xlate.pl
++++ ./crypto/perlasm/x86_64-xlate.pl
+@@ -198,11 +198,8 @@ my %globals;
+ if ($gas) {
+ # Solaris /usr/ccs/bin/as can't handle multiplications
+ # in $self->{value}
+- my $value = $self->{value};
+- $value =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
+- if ($value =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg) {
+- $self->{value} = $value;
+- }
++ $self->{value} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
++ $self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+ sprintf "\$%s",$self->{value};
+ } else {
+ $self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;
+--
+2.7.2
+
</ins></span></pre></div>
<a id="trunkdportsdevelopensslfiles0002RT3885OpenSSLfailstocrosscompileon32bit64bpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/openssl/files/0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch (0 => 146395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/files/0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch (rev 0)
+++ trunk/dports/devel/openssl/files/0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch 2016-03-06 21:23:52 UTC (rev 146395)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+From 11fc645255918aab77950ab35bd6c0476a1d40c4 Mon Sep 17 00:00:00 2001
+From: Todd Short <tshort@akamai.com>
+Date: Tue, 19 May 2015 14:46:40 -0400
+Subject: [PATCH 2/2] RT3885 OpenSSL fails to cross-compile on 32-bit->64-bit
+
+Older 32-bit versions of perl cannot handle 64-bit numbers, so when
+the x86_64-xlate.pl script encounters a 64-bit number, the oct()
+function munges it into a double-precision rather than a 64-bit
+integer. In this case, we know it's either a hex number or an octal
+number. So, if 64-bit hex, just pass through as hex string, otherwise
+allow oct() to handle it. There are some cases where immediate constants
+are multiplied together. The script assumes decimal numbers during mul,
+div, mod operations, so by handling only 64-bit numbers in this manner,
+the impact of this patch is minimized.
+
+This is a problem in ghash-x86_64.pl (ghash-x86_64.s), and the solution
+has an impact all 64-bit platforms. Ran the unit tests to make sure it's
+OK.
+
+Upstream-Status: Submitted [https://mta.openssl.org/pipermail/openssl-dev/2016-March/005605.html]
+---
+ crypto/perlasm/x86_64-xlate.pl | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index 29f94b5..d9d6454 100755
+--- ./crypto/perlasm/x86_64-xlate.pl
++++ ./crypto/perlasm/x86_64-xlate.pl
+@@ -192,13 +192,19 @@ my %globals;
+ }
+ $ret;
+ }
++ sub myoct {
++ my $v = shift;
++ return $v if ($v =~ /^0x[0-9a-f]{9,16}/i); # if 64-bit hex leave as-is
++ use integer;
++ return oct($v);
++ }
+ sub out {
+ my $self = shift;
+
+ if ($gas) {
+ # Solaris /usr/ccs/bin/as can't handle multiplications
+ # in $self->{value}
+- $self->{value} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
++ $self->{value} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/myoct($1)/egi;
+ $self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+ sprintf "\$%s",$self->{value};
+ } else {
+--
+2.7.2
+
</ins></span></pre></div>
<a id="trunkdportsdevelopensslfilesfixAppleclangversiondetectionpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch (146394 => 146395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch 2016-03-06 21:10:48 UTC (rev 146394)
+++ trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch 2016-03-06 21:23:52 UTC (rev 146395)
</span><span class="lines">@@ -1,234 +0,0 @@
</span><del>-Fix OpenSSL compiler version gates for older Apple clang versions
-
-OpenSSL modified the detection code for AVX and the addx instruction to support
-clang from Xcode 7. The new regexes now match and extract the "Apple" version
-numbering scheme, which is then interpreted as LLVM version number and yields
-incorrect results.
-
-Fix this by introducing separate checks for Apple's compiler versions. This is
-necessary because Apple has now dropped the "based on LLVM" string in newer
-compiler versions. Of course the best alternative would be to switch to tests
-that actually check whether the feature is present, rather than looking at the
-compiler versions, though.
-
-Signed-off-by: Clemens Lang <cal@macports.org>
-Upstream-Status: Submitted [https://github.com/openssl/openssl/issues/494]
---- ./crypto/aes/asm/aesni-mb-x86_64.pl.orig 2015-12-03 14:42:07.000000000 +0100
-+++ ./crypto/aes/asm/aesni-mb-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -63,7 +63,14 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ # see http://trac.macports.org/wiki/XcodeVersionInfo
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/aes/asm/aesni-sha1-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/aes/asm/aesni-sha1-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -94,7 +94,9 @@
- $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
- `ml64 2>&1` =~ /Version ([0-9]+)\./ &&
- $1>=10);
--$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
-+# Apple clang 2.1 and 3.0 correspond to LLVM 3.0, see http://trac.macports.org/wiki/XcodeVersionInfo
-+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/ && $2>=2.1);
-+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
-
- $shaext=1; ### set to zero if compiling for 1.0.1
-
---- ./crypto/aes/asm/aesni-sha256-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/aes/asm/aesni-sha256-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -59,7 +59,14 @@
- $avx = ($1>=10) + ($1>=12);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ # see http://trac.macports.org/wiki/XcodeVersionInfo
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/bn/asm/rsaz-x86_64.pl.orig 2015-12-03 14:42:07.000000000 +0100
-+++ ./crypto/bn/asm/rsaz-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -113,7 +113,12 @@
- $addx = ($1>=12);
- }
-
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
-+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
-+ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
-+}
-+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
- my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
- $addx = ($ver>=3.03);
- }
---- ./crypto/bn/asm/x86_64-mont.pl.orig 2015-12-03 14:42:07.000000000 +0100
-+++ ./crypto/bn/asm/x86_64-mont.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -68,7 +68,12 @@
- $addx = ($1>=12);
- }
-
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
-+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
-+ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
-+}
-+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
- my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
- $addx = ($ver>=3.03);
- }
---- ./crypto/bn/asm/x86_64-mont5.pl.orig 2015-12-03 15:41:12.000000000 +0100
-+++ ./crypto/bn/asm/x86_64-mont5.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -53,7 +53,12 @@
- $addx = ($1>=12);
- }
-
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
-+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
-+ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
-+}
-+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
- my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
- $addx = ($ver>=3.03);
- }
---- ./crypto/ec/asm/ecp_nistz256-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/ec/asm/ecp_nistz256-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -81,7 +81,16 @@
- $addx = ($1>=12);
- }
-
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9])\.([0-9]+)/) {
-+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($ver>=2.01) + ($ver>=3.01);
-+ # Apple LLVM version 5.0 corresponds to LLVM 3.3
-+ $addx = ($ver>=5.00);
-+}
-+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
- my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
- $avx = ($ver>=3.0) + ($ver>=3.01);
- $addx = ($ver>=3.03);
---- ./crypto/modes/asm/aesni-gcm-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/modes/asm/aesni-gcm-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -56,7 +56,13 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/modes/asm/ghash-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/modes/asm/ghash-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -105,7 +105,13 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/sha/asm/sha1-mb-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/sha/asm/sha1-mb-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -58,7 +58,13 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/sha/asm/sha1-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/sha/asm/sha1-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -107,7 +107,13 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([2-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/sha/asm/sha256-mb-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/sha/asm/sha256-mb-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -59,7 +59,13 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
---- ./crypto/sha/asm/sha512-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
-+++ ./crypto/sha/asm/sha512-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
-@@ -124,7 +124,13 @@
- $avx = ($1>=10) + ($1>=11);
- }
-
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
-+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
-+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
-+ $avx = ($2>=2.1) + ($2>=3.1);
-+}
-+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
- $avx = ($2>=3.0) + ($2>3.0);
- }
-
</del></span></pre></div>
<a id="trunkdportsdevelopensslfilesx86_64asmoni386patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch (146394 => 146395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch 2016-03-06 21:10:48 UTC (rev 146394)
+++ trunk/dports/devel/openssl/files/x86_64-asm-on-i386.patch 2016-03-06 21:23:52 UTC (rev 146395)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
-
-From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 21 Mar 2015 06:01:25 -0400
-Subject: [PATCH] crypto: use bigint in x86-64 perl
-
-When building on x32 systems where the default type is 32bit, make sure
-we can transparently represent 64bit integers. Otherwise we end up with
-build errors like:
-/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
-Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
-...
-ghash-x86_64.s: Assembler messages:
-ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
-
-We don't enable this globally as there are some cases where we'd get
-32bit values interpreted as unsigned when we need them as signed.
-
-Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh>
-URL: https://bugs.gentoo.org/542618
----
- crypto/perlasm/x86_64-xlate.pl | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
-index aae8288..0bf9774 100755
---- crypto/perlasm/x86_64-xlate.pl
-+++ crypto/perlasm/x86_64-xlate.pl
-@@ -195,6 +195,10 @@ my %globals;
- sub out {
- my $self = shift;
-
-+ # When building on x32 ABIs, the expanded hex value might be too
-+ # big to fit into 32bits. Enable transparent 64bit support here
-+ # so we can safely print it out.
-+ use bigint;
- if ($gas) {
- # Solaris /usr/ccs/bin/as can't handle multiplications
- # in $self->{value}
---
-2.3.3
</del></span></pre>
</div>
</div>
</body>
</html>