[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

[Aaron Bauman]

commit:     b34e70a62caf31299d173736f3297bb7e505dd5e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 17:29:24 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 17:29:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34e70a6

app-crypt/efitools: add compatibility patch for LibreSSL

This patch fixes building with LibreSSL due to a conditional function
for API.

Closes: https://bugs.gentoo.org/653716
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-crypt/efitools/efitools-1.8.1.ebuild                      |  2 ++
 .../files/efitools-1.8.1-libressl-compatibility.patch         | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 073dcca2de8..f18e8b8ea27 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	sys-boot/gnu-efi
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
+
 src_prepare() {
 	# Respect users CFLAGS
 	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die

diff --git a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
new file mode 100644
index 00000000000..876baae16f8
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
@@ -0,0 +1,11 @@
+--- 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);

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

[Matthias Maier]

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);

[gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/, app-crypt/efitools/files/

[Mike Gilbert]

commit:     ef467475348515b2583558594d101b25c254526e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 19:06:22 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 19:06:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef467475

app-crypt/efitools: fix makefile deps

Patch by Felix Janda.

Closes: https://bugs.gentoo.org/593656
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35

 app-crypt/efitools/efitools-1.7.0.ebuild        |  7 +++++++
 app-crypt/efitools/files/1.7.0-Make.rules.patch | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild b/app-crypt/efitools/efitools-1.7.0.ebuild
index 0baf83e20fc..63c9fbec051 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="5"
 
+inherit eutils
+
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
 SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2 -> ${P}.tar.bz2"
@@ -24,3 +26,8 @@ DEPEND="${RDEPEND}
 	dev-perl/File-Slurp"
 
 S=${WORKDIR}/v${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.7.0-Make.rules.patch"
+	epatch_user
+}

diff --git a/app-crypt/efitools/files/1.7.0-Make.rules.patch b/app-crypt/efitools/files/1.7.0-Make.rules.patch
new file mode 100644
index 00000000000..89665ab3b69
--- /dev/null
+++ b/app-crypt/efitools/files/1.7.0-Make.rules.patch
@@ -0,0 +1,11 @@
+--- a/Make.rules
++++ b/Make.rules
+@@ -71,7 +71,7 @@
+ %.hash: %.efi hash-to-efi-sig-list
+ 	./hash-to-efi-sig-list $< $@
+ 
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ 	./cert-to-efi-sig-list $< $@
+ 
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list