<!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>[146450] 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/146450">146450</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-03-07 14:35:10 -0800 (Mon, 07 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssl: Backport upstream fix for #50771
Drops the revert and alternative fix from akamai in favor of what upstream
pulled into their 1.0.2 branch. No revbump because openssl either builds
correctly, or not at all.</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="#trunkdportsdevelopensslfiles6e42e3ff9cde43830555549fdafa2a8b37b9485bpatch">trunk/dports/devel/openssl/files/6e42e3ff9cde43830555549fdafa2a8b37b9485b.patch</a></li>
</ul>
<h3>Removed 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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelopensslPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/openssl/Portfile (146449 => 146450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/Portfile 2016-03-07 21:17:17 UTC (rev 146449)
+++ trunk/dports/devel/openssl/Portfile 2016-03-07 22:35:10 UTC (rev 146450)
</span><span class="lines">@@ -38,8 +38,7 @@
</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>- 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
</del><ins>+ 6e42e3ff9cde43830555549fdafa2a8b37b9485b.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="delfile"><h4>Deleted: trunk/dports/devel/openssl/files/0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch (146449 => 146450)</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 2016-03-07 21:17:17 UTC (rev 146449)
+++ trunk/dports/devel/openssl/files/0001-Revert-perlasm-x86_64-xlate.pl-pass-pure-constants-v.patch 2016-03-07 22:35:10 UTC (rev 146450)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkdportsdevelopensslfiles0002RT3885OpenSSLfailstocrosscompileon32bit64bpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/openssl/files/0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch (146449 => 146450)</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 2016-03-07 21:17:17 UTC (rev 146449)
+++ trunk/dports/devel/openssl/files/0002-RT3885-OpenSSL-fails-to-cross-compile-on-32-bit-64-b.patch 2016-03-07 22:35:10 UTC (rev 146450)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkdportsdevelopensslfiles6e42e3ff9cde43830555549fdafa2a8b37b9485bpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/openssl/files/6e42e3ff9cde43830555549fdafa2a8b37b9485b.patch (0 => 146450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/files/6e42e3ff9cde43830555549fdafa2a8b37b9485b.patch (rev 0)
+++ trunk/dports/devel/openssl/files/6e42e3ff9cde43830555549fdafa2a8b37b9485b.patch 2016-03-07 22:35:10 UTC (rev 146450)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Upstream-Status: Backport [https://github.com/openssl/openssl/commit/6e42e3ff9cde43830555549fdafa2a8b37b9485b.patch, https://mta.openssl.org/pipermail/openssl-dev/2016-March/005758.html]
+From 6e42e3ff9cde43830555549fdafa2a8b37b9485b Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Fri, 4 Mar 2016 11:32:26 +0100
+Subject: [PATCH] perlasm/x86_64-xlate.pl: handle binary constants early.
+
+Not all assemblers of "gas" flavour handle binary constants, e.g.
+seasoned MacOS Xcode doesn't, so give them a hand.
+
+Reviewed-by: Rich Salz <rsalz@openssl.org>
+Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
+---
+ crypto/perlasm/x86_64-xlate.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index 0a023fb..80ab17f 100755
+--- ./crypto/perlasm/x86_64-xlate.pl
++++ ./crypto/perlasm/x86_64-xlate.pl
+@@ -195,6 +195,7 @@
+ sub out {
+ my $self = shift;
+
++ $self->{value} =~ s/\b(0b[0-1]+)/oct($1)/eig;
+ if ($gas) {
+ # Solaris /usr/ccs/bin/as can't handle multiplications
+ # in $self->{value}
+@@ -205,7 +206,6 @@
+ }
+ sprintf "\$%s",$self->{value};
+ } else {
+- $self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;
+ $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
+ sprintf "%s",$self->{value};
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>