commit f60e47ab3be19cff3f265ca1b25eba9876bcdb4d
Author: Elan Ruusamäe <[email protected]>
Date: Thu Feb 25 21:43:13 2016 +0200
up to 1.0.2g snapshot
x32 patch is probably outdated
openssl.spec | 8 +++++---
openssl_fix_for_x32.patch | 20 ++++++++++++++------
2 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index f8c76d2..39274c2 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -24,15 +24,15 @@ Name: openssl
# 1.0.2 will be LTS release
# Version 1.0.2 will be supported until 2019-12-31.
# https://www.openssl.org/about/releasestrat.html
-Version: 1.0.2f
-Release: 2
+Version: 1.0.2g
+Release: 1
License: Apache-like
Group: Libraries
%if %{without snap}
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
# Source0-md5: b3bf73f507172be9292ea2a8c28b659d
%else
-Source1:
https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable.tar.gz
+Source1:
https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
%endif
Source2: %{name}.1.pl
Source3: %{name}-ssl-certificate.sh
@@ -274,6 +274,8 @@ mv %{name}-OpenSSL_1_0_2-stable/* .
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%ifarch x32
+%endif
%patch10 -p1
sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
diff --git a/openssl_fix_for_x32.patch b/openssl_fix_for_x32.patch
index 2a9271d..5ae0b9b 100644
--- a/openssl_fix_for_x32.patch
+++ b/openssl_fix_for_x32.patch
@@ -1,15 +1,23 @@
---- openssl-1.0.2/crypto/perlasm/x86_64-xlate.pl~ 2015-02-27
20:05:00.732776724 +0000
-+++ openssl-1.0.2/crypto/perlasm/x86_64-xlate.pl 2015-02-27
20:05:23.327082845 +0000
-@@ -199,8 +199,12 @@
+
+obsolete now that this is applied?
+https://rt.openssl.org/Ticket/Display.html?id=3885
+https://github.com/openssl/openssl/commit/10c639a8a56c90bec9e332c7ca76ef552b3952ac
+
+--- openssl-1.0.2g/crypto/perlasm/x86_64-xlate.pl~ 2016-02-24
19:39:13.000000000 +0200
++++ openssl-1.0.2g/crypto/perlasm/x86_64-xlate.pl 2016-02-25
21:01:20.464795948 +0200
+@@ -198,11 +198,15 @@
if ($gas) {
# Solaris /usr/ccs/bin/as can't handle multiplications
# in $self->{value}
+ if ($self->{value} =~ /0xA040608020C0E000/) {
+ $self->{value} = "11547335547999543296";
+ } else {
- $self->{value} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
- $self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
-+ }
+ 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;
+ }
++ }
sprintf "\$%s",$self->{value};
} else {
$self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/f60e47ab3be19cff3f265ca1b25eba9876bcdb4d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
