summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2018-08-16 14:27:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-29 15:23:51 +0100
commitdc09a230d7bd59f1bb9c4af599466ab81c49dddc (patch)
tree9510e8137a111d2f18264a1939cba5326d58d42f /meta/recipes-connectivity/openssl/openssl
parent205a56fcfafb3bd3b94712e03640f42c707a00da (diff)
downloadpoky-dc09a230d7bd59f1bb9c4af599466ab81c49dddc.tar.gz
openssl: update 1.1.0h -> 1.1.0i
Please see this security advisory: https://www.openssl.org/news/secadv/20180612.txt Remove obsolete patch. (From OE-Core rev: 0d19caefeeca14f44c80ccb716c30b17f14255a5) (From OE-Core rev: 784059db22d763ca9f579a10a34fd90c68542e82) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch b/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch
deleted file mode 100644
index 81a9b2d060..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1openssl-1.1.0h: Fix c_rehash perl errors
2
3[No upstream tracking] -- https://github.com/openssl/openssl/issues/5772
4
5dofile.pl: Revert only quote stuff that actually needs quoting
6
7This wasn't a good solution, too many things depend on the quotes being
8there consistently.
9
10Upstream-Status: Backport [https://github.com/openssl/openssl/commit/00701e5ea84861b74d9d624f21a6b3fcb12e8acd]
11bug: 5772
12Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
13
14diff --git a/util/dofile.pl b/util/dofile.pl
15index 955224df7d..b0e20681dd 100644
16--- a/util/dofile.pl
17+++ b/util/dofile.pl
18@@ -99,9 +99,9 @@ package main;
19 # This adds quotes (") around the given string, and escapes any $, @, \,
20 # " and ' by prepending a \ to them.
21 sub quotify1 {
22- my $s = my $orig = shift @_;
23+ my $s = shift @_;
24 $s =~ s/([\$\@\\"'])/\\$1/g;
25- $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s;
26+ '"'.$s.'"';
27 }
28
29 # quotify_l LIST