From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- sys-boot/vboot-utils/Manifest | 3 +- .../files/vboot-utils-72_p20181229-libressl.patch | 11 +++ .../vboot-utils/vboot-utils-72_p20181229-r1.ebuild | 101 ++++++++++++++++++++ .../vboot-utils/vboot-utils-72_p20181229.ebuild | 102 --------------------- 4 files changed, 114 insertions(+), 103 deletions(-) create mode 100644 sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch create mode 100644 sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild delete mode 100644 sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild (limited to 'sys-boot/vboot-utils') diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest index b0008742b3da..636c4fbc4950 100644 --- a/sys-boot/vboot-utils/Manifest +++ b/sys-boot/vboot-utils/Manifest @@ -1,5 +1,6 @@ +AUX vboot-utils-72_p20181229-libressl.patch 426 BLAKE2B a67628074549b60e899f20a2589b64ab7dfe90f6476f44c2bb028f0f90b847173eb3e6ea975858a627a257bdaf2121865a7c83cd4d253cbc1d6ad412f0b8e84d SHA512 a78eaa53cc784845a99686025f20f7b10f5d285f4b145fa0e2371b4d242d489a21e91253e7a3b5cee12565c8412224556240acc555b0c9500d5a46b7b1356bb3 DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048 DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e -EBUILD vboot-utils-72_p20181229.ebuild 2627 BLAKE2B d60fa4e962e8fe03d17c082e5ea8f35da186eaf6a3bd2065ad561cf190330009cc39f028886c1aee5c68650e8328f3755f8c679687e8207443a90ad36e549f7f SHA512 b66494a0ab22bc9999d0eaea7736884a7948c76f38a18db58853888145e17165810dd86a8756759e97b5f12bdb43bf8962422f1bc3384040b86fdce4b0c31948 +EBUILD vboot-utils-72_p20181229-r1.ebuild 2594 BLAKE2B f586492f5f860ddb24715616d788268f7576fd24a4b24e4b13c34cb0e88f28e1c3d1e83c6b2769b7db9b7abfc6e9260155366b44420e4d8acdebf65949e865f0 SHA512 146556fae5811a92a995e58b059f4f0afefd84e979e19d5b0869aac9cfe717966fa984eb19ef1398c149b9861bb6fd1d06f755b04a34b1d211c7fbbd5db8fe6e MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914 diff --git a/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch b/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch new file mode 100644 index 000000000000..6702a9f590bc --- /dev/null +++ b/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch @@ -0,0 +1,11 @@ +--- a/host/include/openssl_compat.h 2019-01-03 17:32:20.000000000 -0500 ++++ b/host/include/openssl_compat.h 2019-02-23 13:40:27.521664838 -0500 +@@ -12,7 +12,7 @@ + + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2080000L + + static inline void RSA_get0_key(const RSA *rsa, const BIGNUM **n, + const BIGNUM **e, const BIGNUM **d) diff --git a/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild new file mode 100644 index 000000000000..34a78cf8d7f3 --- /dev/null +++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs + +# This is the latest commit in the latest branch. +GIT_SHA1="a32c930e8c46424a3bba3c296fd78b3e60f50aeb" + +DESCRIPTION="Chrome OS verified boot tools" +HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot" +# Can't use gitiles directly until b/19710536 is fixed. +#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" +IUSE="libressl minimal static" + +LIB_DEPEND=" + dev-libs/libyaml:=[static-libs(+)] + app-arch/xz-utils:=[static-libs(+)]" +LIB_DEPEND_MINIMAL=" + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + sys-apps/util-linux:=[static-libs(+)] + dev-libs/libzip:=[static-libs(+)]" +RDEPEND="!static? ( + ${LIB_DEPEND_MINIMAL//\[static-libs(+)]} + !minimal? ( ${LIB_DEPEND//\[static-libs(+)]} ) + ) + elibc_musl? ( sys-libs/fts-standalone )" +DEPEND="${RDEPEND} + static? ( + ${LIB_DEPEND_MINIMAL} + !minimal? ( ${LIB_DEPEND} ) + ) + app-crypt/trousers" + +S=${WORKDIR} + +src_prepare() { + eapply "${FILESDIR}"/${P}-libressl.patch + + default + sed -i \ + -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ + -e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \ + -e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \ + -e '/cgpt -D 358400/d' \ + Makefile || die + sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \ + -i tests/common.sh || die + sed -e "s:/mnt/host/source/src/platform/vboot_reference:${S}:" \ + -i tests/futility/expect_output/* || die +} + +_emake() { + local arch=$(tc-arch) + emake \ + V=1 \ + QEMU_ARCH= \ + ARCH=${arch} \ + HOST_ARCH=${arch} \ + LIBDIR="$(get_libdir)" \ + DEBUG_FLAGS= \ + WERROR= \ + MINIMAL=$(usev minimal) \ + STATIC=$(usev static) \ + $(usex elibc_musl HAVE_MUSL=1 "") \ + "$@" +} + +src_compile() { + tc-export CC AR CXX PKG_CONFIG + _emake TEST_BINS= all +} + +src_test() { + _emake runtests +} + +src_install() { + _emake DESTDIR="${ED}" install + + insinto /usr/share/vboot/devkeys + doins tests/devkeys/* + + insinto /usr/include/vboot + doins host/include/* \ + firmware/include/gpt.h \ + firmware/include/tlcl.h \ + firmware/include/tss_constants.h + + dolib.a build/libvboot_host.a + + dodoc README +} diff --git a/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild deleted file mode 100644 index 273d3ec48ff2..000000000000 --- a/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -# This is the latest commit in the latest branch. -GIT_SHA1="a32c930e8c46424a3bba3c296fd78b3e60f50aeb" - -DESCRIPTION="Chrome OS verified boot tools" -HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot" -# Can't use gitiles directly until b/19710536 is fixed. -#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -IUSE="libressl minimal static" - -LIB_DEPEND=" - dev-libs/libyaml:=[static-libs(+)] - app-arch/xz-utils:=[static-libs(+)]" -LIB_DEPEND_MINIMAL=" - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - sys-apps/util-linux:=[static-libs(+)] - dev-libs/libzip:=[static-libs(+)]" -RDEPEND="!static? ( - ${LIB_DEPEND_MINIMAL//\[static-libs(+)]} - !minimal? ( ${LIB_DEPEND//\[static-libs(+)]} ) - )" -DEPEND="${RDEPEND} - static? ( - ${LIB_DEPEND_MINIMAL} - !minimal? ( ${LIB_DEPEND} ) - ) - app-crypt/trousers" - -S=${WORKDIR} - -src_prepare() { - default - sed -i \ - -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ - -e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \ - -e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \ - -e '/cgpt -D 358400/d' \ - Makefile || die - sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \ - -i tests/common.sh || die - sed -e "s:/mnt/host/source/src/platform/vboot_reference:${S}:" \ - -i tests/futility/expect_output/* || die - if use libressl; then - sed -e '/OPENSSL_VERSION_NUMBER/d' \ - -i host/include/openssl_compat.h || die #674522 - fi -} - -_emake() { - local arch=$(tc-arch) - emake \ - V=1 \ - QEMU_ARCH= \ - ARCH=${arch} \ - HOST_ARCH=${arch} \ - LIBDIR="$(get_libdir)" \ - DEBUG_FLAGS= \ - WERROR= \ - MINIMAL=$(usev minimal) \ - STATIC=$(usev static) \ - $(usex elibc_musl HAVE_MUSL=1 "") \ - "$@" -} - -src_compile() { - tc-export CC AR CXX PKG_CONFIG - _emake TEST_BINS= all -} - -src_test() { - _emake runtests -} - -src_install() { - _emake DESTDIR="${ED}" install - - insinto /usr/share/vboot/devkeys - doins tests/devkeys/* - - insinto /usr/include/vboot - doins host/include/* \ - firmware/include/gpt.h \ - firmware/include/tlcl.h \ - firmware/include/tss_constants.h - - dolib.a build/libvboot_host.a - - dodoc README -} -- cgit v1.2.3