diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-08-06 22:29:38 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-08-06 22:49:29 +0200 |
| commit | 459a34ce5ff8921066f8593832c82e30393caddf (patch) | |
| tree | d7d342283effe2dc95acf31dfee548518584bfa7 | |
| parent | 354a477f0ffcae9b9edae606f71d3f58f5ea0312 (diff) | |
| download | nixlib-459a34ce5ff8921066f8593832c82e30393caddf.tar nixlib-459a34ce5ff8921066f8593832c82e30393caddf.tar.gz nixlib-459a34ce5ff8921066f8593832c82e30393caddf.tar.bz2 nixlib-459a34ce5ff8921066f8593832c82e30393caddf.tar.lz nixlib-459a34ce5ff8921066f8593832c82e30393caddf.tar.xz nixlib-459a34ce5ff8921066f8593832c82e30393caddf.tar.zst nixlib-459a34ce5ff8921066f8593832c82e30393caddf.zip | |
openssl_1_1_0: add patch to fix c_rehash quoting
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/revert-relaxed-quoting.patch | 37 |
2 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4df0e08e6a72..35538b99060e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -126,6 +126,9 @@ in { openssl_1_1_0 = common { version = "1.1.0h"; sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"; + patches = [ + ./revert-relaxed-quoting.patch + ]; }; } diff --git a/pkgs/development/libraries/openssl/revert-relaxed-quoting.patch b/pkgs/development/libraries/openssl/revert-relaxed-quoting.patch new file mode 100644 index 000000000000..ebe7c0ef26ce --- /dev/null +++ b/pkgs/development/libraries/openssl/revert-relaxed-quoting.patch @@ -0,0 +1,37 @@ +From 7ee2a43069913fb7c444c656048996ea92cc465e Mon Sep 17 00:00:00 2001 +From: Richard Levitte <levitte@openssl.org> +Date: Wed, 28 Mar 2018 14:46:27 +0200 +Subject: [PATCH] Revert "util/dofile.pl: only quote stuff that actually needs + quoting" + +This wasn't a good solution, too many things depend on the quotes being +there consistently. + +This reverts commit 49cd47eaababc8c57871b929080fc1357e2ad7b8. + +Fixes #5772 + +Reviewed-by: Rich Salz <rsalz@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/5773) + +(cherry picked from commit 00701e5ea84861b74d9d624f21a6b3fcb12e8acd) +--- + util/dofile.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/dofile.pl b/util/dofile.pl +index fc72989b0fd..a932941cd5a 100644 +--- a/util/dofile.pl ++++ b/util/dofile.pl +@@ -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 |