gentoo resync : 12.01.2019

7 files changed, 33 insertions, 259 deletions

diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest
index c0b533a646d8..b0008742b3da 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,11 +1,5 @@
-AUX vboot-utils-42_p20150219-cgpt-static.patch 1092 BLAKE2B 48d6631e3d6d9072dad8513964b6192d066d5a593cd7bad8c26339d5136002b9870522e1bc2bf8e3a52f0da05bc72ed0f2b06bd635bbb2f2380092223edcc104 SHA512 bb01fbb11d015bc8e817e14e4326908d5338a9a3bb657004c8539b561e0be21c7f3ee9d2b43d8fcadc302ee9991effb65778d22b2a8ade92faa5234041288d4f
-AUX vboot-utils-42_p20150219-sysmacros.patch 1228 BLAKE2B 546f8b34e3e35a580a230002c462fae324851460100e619171a1ce2364a680e719e7666c4118fc1e69d50cf563cfb999b55167fe49fa2a1267d0d7d54128997f SHA512 50bb342dbe6266562d979e453f8744ad43cc859e35a2a9b6e5a420b0e395012d88bd631bc6c02b023cd58c80e0371932d8d7539a541d5adfc79b769659411fbc
-DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 BLAKE2B b05013b54a4a6a7c9bbdcaeca5b01c7cc75ff9d58e9594a47da914d49dfc0dc4b8d4a31c9f1af5b2414e911ac310f7200731ee78c8941dc3d5fceb97bc34e9bc SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f
-DIST vboot-utils-42_p20150219.tar.xz 18578108 BLAKE2B b5780f35a66ebed39b4c26b75820ac1574691d85c8bd222a3602c79aa92c1058448996bdefc501a3772b116fbf888e93139f8cce10465780d2956de877cc0377 SHA512 bf1b5579f80bfd3804d74f5fed5ca0f85ff3d66cc4efd1c5e744ab0de50309c7e5168fe9a751579e9fcc0cb7dda72fc98497b2e13437b357b0ad9bb063edd33a
-DIST vboot-utils-51_p20160427.tar.xz 18377808 BLAKE2B 7938c9fb69a0da7d4d8b62f1f9b5f911658d6a3673b198f603e20b5e2ed29d989fc92f74eb7553f0fec230fc062bb85785f6ac01ef537944ce144d87690551c2 SHA512 5b9af2815b8939ae21f4e430744902ccd811627d668eaba709354901eb70553e57050b9068b07fecdfec5bb2ece0c11f1cf0f1a01c0e5f886d1913e1478fe3d7
 DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048
-EBUILD vboot-utils-1.0_p20130222.ebuild 1527 BLAKE2B 8acc26629ac7096c4f500a1f7a065bb83d4d7919606179911d15e954eabbf63db78217d1f5e391a63b8b48858862af5bfb28930881725c2bd7812bb2f7da1417 SHA512 0617df165249896f758a7f623edf0cc80e7ed470510097a5f60b3eab46dbfa7210d4500b80bebc2d38ac4b48b1ef60fef2bbcfed113ca2526c8fa640f2853433
-EBUILD vboot-utils-42_p20150219.ebuild 2021 BLAKE2B f6c4bfe442aca86ab7358ff9efb77a808f3508efef015a7dbaead08bb26c7810da32eada15a909dfd7969ecc9d42c277a4e7bf8cefcd7f89119291d5d4f30cb8 SHA512 ebae142d837a43b011e8979597b42564ef22e990a1e84dc40f49b0263edfa5be49b770c551bd0bc167447bebb6edd2fc55c14289628aac9e8c51e9c7e9288568
-EBUILD vboot-utils-51_p20160427.ebuild 1950 BLAKE2B a37c82c9e868c2cd3e78df0bd26ecee6b55a8f397e0090303d0fc38ae632e1a030c5f0414259d010de79beb7e7a4d8083fe9281b82c09834c86ae4b483c0da33 SHA512 4bf2d1bbcebe4d9396d606c58a5adcb0593b0189e049a6429ddf6966c3419a0f4349e7b3abd76ec58496c13d5f5a09dab79acf1278aa1a88eb408bdffc22cf4f
-EBUILD vboot-utils-59_p20170413.ebuild 1959 BLAKE2B 8a61ceba02fcd0dca40dda695a70e994fd5c2b8b0ac660191a3baf6f72cd6eaae82f8598e1c6c489a2a655ff05d23f1153000bfe1baf775a2da222f5e01a7734 SHA512 111a065659df702beb8982fc65d1e8cf962156fed5e317b659d7480fa5751c9ea8fed7af9e7b81c549a3c1deb72691da570faadd59494d2cebd4521eb7976ea3
+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
 MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914
diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
deleted file mode 100644
index 3f53fc7be769..000000000000
--- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9d437e9122019568df7fa2d602f911e6a873d78b Mon Sep 17 00:00:00 2001
-From: Anatol Pomazau <anatol@google.com>
-Date: Thu, 19 Feb 2015 05:11:51 -0800
-Subject: [PATCH] Remove duplicated linker flag
-
-We already set '-static' to LDFLAGS above no need to do it again here.
-
-TEST=build with 'make' and 'make STATIC=1'. Check that 'STATIC=1' adds '-static' linker flag.
-BUG=None
-
-Change-Id: I83e23984753094af203432eb4570930085788398
-Reviewed-on: https://chromium-review.googlesource.com/251151
-Reviewed-by: Mike Frysinger <vapier@chromium.org>
-Reviewed-by: Hung-Te Lin <hungte@chromium.org>
-Reviewed-by: Anatol Pomazau <anatol@google.com>
-Commit-Queue: Anatol Pomazau <anatol@google.com>
-Tested-by: Anatol Pomazau <anatol@google.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index dfa971c..c0c5f50 100644
---- a/Makefile
-+++ b/Makefile
-@@ -960,7 +960,6 @@ ${CGPT_WRAPPER}: ${CGPT_WRAPPER_OBJS} ${UTILLIB}
- .PHONY: cgpt
- cgpt: ${CGPT} ${CGPT_WRAPPER}
- 
--${CGPT}: LDFLAGS += -static
- ${CGPT}: LDLIBS += -luuid
- 
- ${CGPT}: ${CGPT_OBJS} ${UTILLIB}
--- 
-2.3.1
-
diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch
deleted file mode 100644
index 508f54076766..000000000000
--- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://chromium-review.googlesource.com/339680
-https://bugs.gentoo.org/580554
-
-From 7fff56afefd4e63dce2366636c084d4c1f1f95d4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Tue, 19 Apr 2016 13:58:49 -0400
-Subject: [PATCH] include sys/sysmacros.h for major()
-
-The major() func is defined in the sys/sysmacros.h header, so include it
-explicitly for the prototype.  Upstream C libs are moving away from having
-sys/types.h include it all the time implicitly.
-
-BUG=None
-TEST=precq passes
-BRANCH=None
-
-Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71
----
-
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index dcfaab9..1716cdd 100644
---- a/cgpt/cgpt_wrapper.c
-+++ b/cgpt/cgpt_wrapper.c
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
-index 4fe990c..abf37ae 100644
---- a/futility/dump_kernel_config_lib.c
-+++ b/futility/dump_kernel_config_lib.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
diff --git a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild b/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
deleted file mode 100644
index 8a5b61a8c149..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils rpm toolchain-funcs
-
-KEYWORDS="~amd64 ~arm ~x86"
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git"
-EGIT_COMMIT="e6cf2c21a1cd6fc46b6adcaadc865e2f8bd4874e"
-MY_VERSION="${PV##*_p}git${EGIT_COMMIT:0:7}"
-MY_PV="${PN}-${MY_VERSION}"
-SRC_URI="http://kojipkgs.fedoraproject.org/packages/${PN}/${MY_VERSION}/3.fc19/src/${MY_PV}-3.fc19.src.rpm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/xz-utils:=
-	dev-libs/libyaml:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux:="
-
-DEPEND="app-crypt/trousers
-	${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	rpm_unpack ${A}
-	unpack ./${MY_PV}.tar.xz
-	mv ./${MY_PV}/* ./ || die
-}
-
-src_prepare() {
-	epatch *.patch
-	sed -e 's:-Werror ::g' -e 's:-nostdinc ::g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	mkdir "${S}"/build-main || die
-	tc-export CC AR CXX PKG_CONFIG
-	emake \
-		-j1 \
-		V=1 \
-		BUILD="${S}"/build-main \
-		ARCH=$(tc-arch) \
-		all
-	unset CC AR CXX PKG_CONFIG
-}
-
-src_test() {
-	# ARCH and HOST_ARCH must be identical in order
-	# to avoid calling qemu.
-	local arch=$(tc-arch)
-	[[ ${arch} == amd64 ]] && arch=x86_64
-	emake \
-		V=1 \
-		BUILD="${S}"/build-main \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		runtests
-}
-
-src_install() {
-	emake \
-		V=1 \
-		BUILD="${S}"/build-main \
-		DESTDIR="${ED}/usr/bin" \
-		install
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-	dodoc README
-}
diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
deleted file mode 100644
index 5b70868f8f2b..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-# This is the latest commit in the latest branch.
-GIT_SHA1="f44ebbe36b2c1603437edc57b534244e89bfcd9c"
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	sys-apps/util-linux:=[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
-	)"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-crypt/trousers"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cgpt-static.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580554
-	sed -i \
-		-e 's: -Werror : :g' \
-		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
-		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
-		Makefile || die
-}
-
-_emake() {
-	local arch=$(tc-arch)
-	emake \
-		V=1 \
-		QEMU_ARCH= \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		LIBDIR="$(get_libdir)" \
-		DEBUG_FLAGS= \
-		MINIMAL=$(usev minimal) \
-		STATIC=$(usev static) \
-		"$@"
-}
-
-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-59_p20170413.ebuild b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
index 15f315769e8d..12b8ef351c9f 100644
--- a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="libressl minimal static"
 
 LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	!libressl? ( <dev-libs/openssl-1.1:0=[static-libs(+)] )
 	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
 	sys-apps/util-linux:=[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
diff --git a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
index 67c54ce41195..273d3ec48ff2 100644
--- a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils toolchain-funcs
 
 # This is the latest commit in the latest branch.
-GIT_SHA1="48b1a50b086e39332d2e1e51a73434e39c40b329"
+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"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,25 +21,42 @@ 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(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
+	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} )
+	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() {