From 9b3af406747a3d565d12d948400d44fb12ab0d96 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 28 Jul 2018 13:39:19 -0700 Subject: 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. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- .../openssl/openssl-1.0.2o/debian/ca.patch | 22 ---------------------- .../recipes-connectivity/openssl/openssl_1.0.2o.bb | 1 - 2 files changed, 23 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch (limited to 'meta/recipes-connectivity/openssl') 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 @@ -Upstream-Status: Backport [debian] - -Index: openssl-0.9.8m/apps/CA.pl.in -=================================================================== ---- openssl-0.9.8m.orig/apps/CA.pl.in 2006-04-28 00:28:51.000000000 +0000 -+++ openssl-0.9.8m/apps/CA.pl.in 2010-02-27 00:36:51.000000000 +0000 -@@ -65,6 +65,7 @@ - foreach (@ARGV) { - if ( /^(-\?|-h|-help)$/ ) { - print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-signcert|-verify\n"; -+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; - exit 0; - } elsif (/^-newcert$/) { - # create a certificate -@@ -165,6 +166,7 @@ - } else { - print STDERR "Unknown arg $_\n"; - print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; -+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; - exit 1; - } - } 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 \ file://engines-install-in-libdir-ssl.patch \ file://debian1.0.2/block_diginotar.patch \ file://debian1.0.2/block_digicert_malaysia.patch \ - file://debian/ca.patch \ file://debian/c_rehash-compat.patch \ file://debian/debian-targets.patch \ file://debian/man-dir.patch \ -- cgit 1.2.3-korg