From 08db5cbcb9939636d934423474bf1d2154bd189d Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 3 Apr 2018 13:03:32 +0200 Subject: [PATCH] fix regression of c_rehash (#1562953) --- openssl-1.1.0-missing-quotes.patch | 15 +++++++++++++++ openssl.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 openssl-1.1.0-missing-quotes.patch diff --git a/openssl-1.1.0-missing-quotes.patch b/openssl-1.1.0-missing-quotes.patch new file mode 100644 index 0000000..3fb8784 --- /dev/null +++ b/openssl-1.1.0-missing-quotes.patch @@ -0,0 +1,15 @@ +diff -up openssl-1.1.0h/util/dofile.pl.missing-quotes openssl-1.1.0h/util/dofile.pl +--- openssl-1.1.0h/util/dofile.pl.missing-quotes 2018-03-27 15:50:41.000000000 +0200 ++++ openssl-1.1.0h/util/dofile.pl 2018-04-03 11:59:36.742091742 +0200 +@@ -99,9 +99,9 @@ package main; + # This adds quotes (") around the given string, and escapes any $, @, \, + # " and ' by prepending a \ to them. + sub quotify1 { +- my $s = my $orig = shift @_; ++ my $s = shift @_; + $s =~ s/([\$\@\\"'])/\\$1/g; +- $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s; ++ '"'.$s.'"'; + } + + # quotify_l LIST diff --git a/openssl.spec b/openssl.spec index caf397f..786c7a7 100644 --- a/openssl.spec +++ b/openssl.spec @@ -22,7 +22,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.0h -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. @@ -61,6 +61,7 @@ Patch44: openssl-1.1.0-bio-fd-preserve-nl.patch Patch45: openssl-1.1.0-weak-ciphers.patch Patch46: openssl-1.1.0-silent-rnd-write.patch # Backported fixes including security fixes +Patch70: openssl-1.1.0-missing-quotes.patch License: OpenSSL Group: System Environment/Libraries @@ -165,6 +166,8 @@ cp %{SOURCE13} test/ %patch45 -p1 -b .weak-ciphers %patch46 -p1 -b .silent-rnd-write +%patch70 -p1 -b .missing-quotes + %build # Figure out which flags we want to use. # default @@ -432,6 +435,9 @@ export LD_LIBRARY_PATH %postun libs -p /sbin/ldconfig %changelog +* Tue Apr 3 2018 Tomáš Mráz 1.1.0h-3 +- fix regression of c_rehash (#1562953) + * Thu Mar 29 2018 Tomáš Mráz 1.1.0h-2 - fix FIPS symbol versions