app-crypt/efitools: [QA] drop duplicate patches
authorMatthias Maier <tamiko@gentoo.org>
Mon, 5 Aug 2019 14:57:42 +0000 (09:57 -0500)
committerMatthias Maier <tamiko@gentoo.org>
Mon, 5 Aug 2019 15:02:42 +0000 (10:02 -0500)
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
app-crypt/efitools/efitools-1.9.2.ebuild
app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch [deleted file]

index aaff36b5c9db18ce04bff3b211f7f45d27c9b836..542f32ac0915b3ec75a062ec5b4e6f8c9d67f6f0 100644 (file)
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
        "${FILESDIR}/1.7.0-Make.rules.patch"
-       "${FILESDIR}/${P}-libressl-compatibility.patch"
+       "${FILESDIR}/${PN}-1.8.1-libressl-compatibility.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
deleted file mode 100644 (file)
index 876baae..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cert-to-efi-hash-list.c  2018-04-21 20:59:24.814748503 +0200
-+++ b/cert-to-efi-hash-list.c  2018-04-21 20:59:51.868581307 +0200
-@@ -135,7 +135,7 @@
-         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
-       unsigned char *cert_buf = NULL;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
- #else
-       int cert_len = i2d_re_X509_tbs(cert, &cert_buf);