commit: 234396453b10f86863b051573f12d184c737a8a2
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 14:57:42 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 15:02:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23439645
app-crypt/efitools: [QA] drop duplicate patches
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-crypt/efitools/efitools-1.9.2.ebuild | 2 +-
.../files/efitools-1.9.2-libressl-compatibility.patch | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild
b/app-crypt/efitools/efitools-1.9.2.ebuild
index aaff36b5c9d..542f32ac091 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -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
index 876baae16f8..00000000000
--- a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
+++ /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);
