[packages/openssl/dev-1.1] - seems obsolete

arekm arekm at pld-linux.org
Thu Sep 13 20:01:11 CEST 2018


commit 4574962dad6fbad5d4dc34889452d60f4841e1cc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Sep 13 20:01:00 2018 +0200

    - seems obsolete

 openssl.spec              |  4 ----
 openssl_fix_for_x32.patch | 23 -----------------------
 2 files changed, 27 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 93ecf66..a0c73ab 100644
--- 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
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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/4574962dad6fbad5d4dc34889452d60f4841e1cc



More information about the pld-cvs-commit mailing list