From a06bd3f958fc3abe443e32c76b9c78ac1fcd5849 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 17:47:39 +0000 Subject: [PATCH] bump(app-crypt/efitools): sync with upstream --- .../app-crypt/efitools/Manifest | 2 + .../app-crypt/efitools/efitools-1.7.0.ebuild | 33 ++++++++++++ .../app-crypt/efitools/efitools-1.8.1.ebuild | 52 +++++++++++++++++++ .../efitools/files/1.7.0-Make.rules.patch | 11 ++++ ...fitools-1.8.1-libressl-compatibility.patch | 11 ++++ .../app-crypt/efitools/metadata.xml | 7 +++ .../md5-cache/app-crypt/efitools-1.7.0 | 13 +++++ .../md5-cache/app-crypt/efitools-1.8.1 | 13 +++++ 8 files changed, 142 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/efitools/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.7.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.8.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/1.7.0-Make.rules.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/efitools/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.7.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.8.1 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/efitools/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/Manifest new file mode 100644 index 0000000000..5ec4d217cb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/Manifest @@ -0,0 +1,2 @@ +DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb +DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.7.0.ebuild new file mode 100644 index 0000000000..c47c9b03a9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.7.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="libressl" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-apps/util-linux" +DEPEND="${RDEPEND} + sys-apps/help2man + >=sys-boot/gnu-efi-3.0u + app-crypt/sbsigntools + virtual/pkgconfig + dev-perl/File-Slurp" + +S=${WORKDIR}/v${PV} + +src_prepare() { + epatch "${FILESDIR}/1.7.0-Make.rules.patch" + epatch_user +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.8.1.ebuild new file mode 100644 index 0000000000..94d636eec2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.8.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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/sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/1.7.0-Make.rules.patch b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/1.7.0-Make.rules.patch new file mode 100644 index 0000000000..89665ab3b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch new file mode 100644 index 0000000000..876baae16f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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); diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/efitools/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/metadata.xml new file mode 100644 index 0000000000..c1f7c0b4ef --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/efitools/metadata.xml @@ -0,0 +1,7 @@ + + + + + tamiko@gentoo.org + + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.7.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.7.0 new file mode 100644 index 0000000000..2165ccb331 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.7.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=prepare +DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man >=sys-boot/gnu-efi-3.0u app-crypt/sbsigntools virtual/pkgconfig dev-perl/File-Slurp +DESCRIPTION=Tools for manipulating UEFI secure boot platforms +EAPI=5 +HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git +IUSE=libressl +KEYWORDS=~amd64 ~arm64 ~x86 +LICENSE=GPL-2 +RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux +SLOT=0 +SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v1.7.0.tar.bz2 -> efitools-1.7.0.tar.bz2 +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=8a266fa0be491d0be16e8149531d4c12 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.8.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.8.1 new file mode 100644 index 0000000000..4698cd52fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/efitools-1.8.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=prepare +DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux app-crypt/sbsigntools dev-perl/File-Slurp static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig +DESCRIPTION=Tools for manipulating UEFI secure boot platforms +EAPI=6 +HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git +IUSE=libressl static +KEYWORDS=~amd64 ~arm64 ~x86 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux +SLOT=0 +SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.8.1.tar.gz +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=97b5fec7316f5ef98f628d62159a8214