diff options
| author | Andrej Valek <andrej.valek@siemens.com> | 2018-08-16 14:27:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-19 16:33:41 +0100 |
| commit | 0d19caefeeca14f44c80ccb716c30b17f14255a5 (patch) | |
| tree | 0cb44bb384fe3e4b82b062abd190abe5ecb986c4 | |
| parent | ff3db93e53c4f9d56807d3755c799459944e9a87 (diff) | |
| download | openembedded-core-0d19caefeeca14f44c80ccb716c30b17f14255a5.tar.gz openembedded-core-0d19caefeeca14f44c80ccb716c30b17f14255a5.tar.bz2 openembedded-core-0d19caefeeca14f44c80ccb716c30b17f14255a5.zip | |
openssl: update 1.1.0h -> 1.1.0i
Please see this security advisory:
https://www.openssl.org/news/secadv/20180612.txt
Remove obsolete patch.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.0i.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.1.0h.bb) | 5 |
2 files changed, 2 insertions, 32 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 @@ -openssl-1.1.0h: Fix c_rehash perl errors - -[No upstream tracking] -- https://github.com/openssl/openssl/issues/5772 - -dofile.pl: Revert only quote stuff that actually needs quoting - -This wasn't a good solution, too many things depend on the quotes being -there consistently. - -Upstream-Status: Backport [https://github.com/openssl/openssl/commit/00701e5ea84861b74d9d624f21a6b3fcb12e8acd] -bug: 5772 -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/util/dofile.pl b/util/dofile.pl -index 955224df7d..b0e20681dd 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 diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb index 8b3d92203f..7929d81b45 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb @@ -14,15 +14,14 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ file://openssl-c_rehash.sh \ file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \ - file://0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch \ " SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24" -SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" +SRC_URI[md5sum] = "9495126aafd2659d357ea66a969c3fe1" +SRC_URI[sha256sum] = "ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99" inherit lib_package multilib_header ptest relative_symlinks |