- seems obsolete

diff --git a/openssl.spec b/openssl.spec
index 93ecf6680c7db71f4da0fe8a8a9c92c36be77f4e..a0c73ab66b0c33b69edcc57f7393d957f8373012 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -40,7 +40,6 @@ Patch5:               %{name}-ca-certificates.patch
 Patch7:                %{name}-find.patch
 Patch8:                pic.patch
 
-Patch10:       %{name}_fix_for_x32.patch
 Patch11:       engines-dir.patch
 URL:           http://www.openssl.org/
 BuildRequires: perl-devel >= 1:5.10.0
@@ -271,9 +270,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch7 -p1
 %patch8 -p1
 
-%ifarch x32
-%patch10 -p1
-%endif
 %patch11 -p1
 
 %build

diff --git a/openssl_fix_for_x32.patch b/openssl_fix_for_x32.patch
deleted file mode 100644 (file)
index 5ae0b9b..0000000
--- a/openssl_fix_for_x32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-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 {
-           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;