gentoo resync : 18.05.2019

3 files changed, 66 insertions, 0 deletions

diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 9f94ea55286f..d618940b1dd5 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,7 +1,10 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
+AUX efitools-1.9.2-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
+DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
 EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
 EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
+EBUILD efitools-1.9.2.ebuild 1346 BLAKE2B 15af826971a8805c6c106e501a3cc8272225e6a845423a5650561893edbf8ca7ccc9508133b4cdd74b017e038de661338e1b38764196395f908aa6462b31289e SHA512 c57ea1a4632e51e08c5504a82309d09c024af21807f04c9cda4676e27e6b1537848ddf604c1fd624b7cfcc4bd13bdfa083fc4b81ebc55d336f23213647cb7d05
 MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
new file mode 100644
index 000000000000..d7fc14afab88
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+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/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl static"
+
+LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	sys-apps/util-linux"
+
+DEPEND="${RDEPEND}
+	app-crypt/sbsigntools
+	dev-perl/File-Slurp
+	static? ( ${LIB_DEPEND} )
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/${P}-libressl-compatibility.patch"
+)
+
+src_prepare() {
+	if use static; then
+		append-ldflags -static
+		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+			Makefile || die
+	fi
+
+	# Respect users CFLAGS
+	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
+
+	# Respect users LDFLAGS
+	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
+	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
+
+	# Run 'default', to apply user patches
+	default
+}
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
new file mode 100644
index 000000000000..876baae16f81
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.9.2-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);