diff options
| author |   Andrej Valek <andrej.valek@siemens.com> | 2018-07-17 11:10:33 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-15 21:46:24 +0100 |
| commit | f8a826f497073533a3e4c390255ae197d65d6ef3 (patch) | |
| tree | 9ffe49cdb5449107463e4a10860c94dee723805b /meta/recipes-connectivity | |
| parent | 125789b6ee6d47ab84192230f63971c4e22418ba (diff) | |
| download | openembedded-core-contrib-f8a826f497073533a3e4c390255ae197d65d6ef3.tar.gz | |
openssl-1.1: fix c_rehash perl errors
Patch original c_rehash script with Debian patch instead
of overriding it with own version.
Error output from c_reshah without patching:
Unknown regexp modifier "/b" at ./c_rehash line 15, at end of line
Unknown regexp modifier "/W" at ./c_rehash line 28, at end of line
Unknown regexp modifier "/3" at ./c_rehash line 28, at end of line
Unknown regexp modifier "/2" at ./c_rehash line 28, at end of line
No such class installdir at ./c_rehash line 63, near "Prefix our
installdir"
(Might be a runaway multi-line // string starting on line 28)
syntax error at ./c_rehash line 63, near "Prefix our installdir"
Can't redeclare "my" in "my" at ./c_rehash line 68, near ""
Execution of ./c_rehash aborted due to compilation errors.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Marko Peter <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -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.0h.bb | 1 |
2 files changed, 30 insertions, 0 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 new file mode 100644 index 00000000000..81a9b2d0608 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch @@ -0,0 +1,29 @@ +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.0h.bb index 88ef42e255d..1a4e4348c22 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -14,6 +14,7 @@ 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 = " \ |