diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-07-28 13:39:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:35 +0100 |
commit | 7efdc276a9593cf97683a2de4da4ae814a56e887 (patch) | |
tree | a0db51ad13b540e90b3dd4658a855a63a2f79ab6 /meta | |
parent | 9f7923c7e0a8044239c5fd5b818aacbd4696b68a (diff) | |
download | poky-7efdc276a9593cf97683a2de4da4ae814a56e887.tar.gz |
openssl_1.0: drop obsolete ca.patch
This patch adds a second line to the -help output of the CA.pl script
(which lists almost the same command line options as the line above
it but in a slightly different order). Although it's tagged as a
Debian backport, there's no patch like it in recent Debian patch sets
for openssl 1.0.2.
(From OE-Core rev: 9b3af406747a3d565d12d948400d44fb12ab0d96)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch | 22 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 1 |
2 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch deleted file mode 100644 index fb745e4394..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-0.9.8m/apps/CA.pl.in | ||
4 | =================================================================== | ||
5 | --- openssl-0.9.8m.orig/apps/CA.pl.in 2006-04-28 00:28:51.000000000 +0000 | ||
6 | +++ openssl-0.9.8m/apps/CA.pl.in 2010-02-27 00:36:51.000000000 +0000 | ||
7 | @@ -65,6 +65,7 @@ | ||
8 | foreach (@ARGV) { | ||
9 | if ( /^(-\?|-h|-help)$/ ) { | ||
10 | print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-signcert|-verify\n"; | ||
11 | + print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; | ||
12 | exit 0; | ||
13 | } elsif (/^-newcert$/) { | ||
14 | # create a certificate | ||
15 | @@ -165,6 +166,7 @@ | ||
16 | } else { | ||
17 | print STDERR "Unknown arg $_\n"; | ||
18 | print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; | ||
19 | + print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; | ||
20 | exit 1; | ||
21 | } | ||
22 | } | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb index 9e5e7ec0f9..ee1c1f7faf 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | |||
@@ -23,7 +23,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
23 | file://engines-install-in-libdir-ssl.patch \ | 23 | file://engines-install-in-libdir-ssl.patch \ |
24 | file://debian1.0.2/block_diginotar.patch \ | 24 | file://debian1.0.2/block_diginotar.patch \ |
25 | file://debian1.0.2/block_digicert_malaysia.patch \ | 25 | file://debian1.0.2/block_digicert_malaysia.patch \ |
26 | file://debian/ca.patch \ | ||
27 | file://debian/c_rehash-compat.patch \ | 26 | file://debian/c_rehash-compat.patch \ |
28 | file://debian/debian-targets.patch \ | 27 | file://debian/debian-targets.patch \ |
29 | file://debian/man-dir.patch \ | 28 | file://debian/man-dir.patch \ |