gentoo resync : 15.01.2020

5 files changed, 129 insertions, 89 deletions

diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest
index 636c4fbc4950..3af229588091 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,6 +1,7 @@
 AUX vboot-utils-72_p20181229-libressl.patch 426 BLAKE2B a67628074549b60e899f20a2589b64ab7dfe90f6476f44c2bb028f0f90b847173eb3e6ea975858a627a257bdaf2121865a7c83cd4d253cbc1d6ad412f0b8e84d SHA512 a78eaa53cc784845a99686025f20f7b10f5d285f4b145fa0e2371b4d242d489a21e91253e7a3b5cee12565c8412224556240acc555b0c9500d5a46b7b1356bb3
-DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048
+AUX vboot-utils-80-musl-fts.patch 428 BLAKE2B b36b902b045906324e0553f6acba4a760d11289d1d68b38bcfd6c4c6531493f0c778fb2539cb5f19604f8705ceee3dcc2b30caab87f2114ee485345d9b0d7d79 SHA512 59a11a87d9cd4596df749c8dfd188f90818c09a432805cfbb47d02cd13228561af345a336bfd502d205a94ca432cff539ba1ea684542e86f13d6dfdea3db0d41
 DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe
-EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e
+DIST vboot-utils-80_p20200108.tar.xz 18448212 BLAKE2B f7e375133fb6dc90def1e22c42c7511a3b649c34d067a447f44fb99c1ec37a73d034837c2212e5d6ad368a4f4b011c8cb9eb479e81db4a52b1160cda99382a77 SHA512 077d137d8fe89f35b6f7ec6408b2e9fc7a28765b0987646c1964e6e0c039e359711ab79958c45ee555a0fe810997217225d072a7f1011b1c73c4aefb4e57fcc1
 EBUILD vboot-utils-72_p20181229-r1.ebuild 2594 BLAKE2B f586492f5f860ddb24715616d788268f7576fd24a4b24e4b13c34cb0e88f28e1c3d1e83c6b2769b7db9b7abfc6e9260155366b44420e4d8acdebf65949e865f0 SHA512 146556fae5811a92a995e58b059f4f0afefd84e979e19d5b0869aac9cfe717966fa984eb19ef1398c149b9861bb6fd1d06f755b04a34b1d211c7fbbd5db8fe6e
-MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914
+EBUILD vboot-utils-80_p20200108.ebuild 2800 BLAKE2B 24e32895f0a84865643a062fd873f535b27ca7ea89d55f7c4cbc3b09730f0eba3127ceddffa89830e0deb638505cfc7c28e59529af8b3ae71be0986b57ffe0d1 SHA512 59ddc28a5c5ba959dcc2a7a0207efadedcadb1ff01db596a67705b66abc0998fe4922a1b94ebebcd178aafc2ba88437ce8a50ed9c810f41bb8a4c3b44c7388e5
+MISC metadata.xml 552 BLAKE2B 972282f45e6ca80d35ee7a4dae2a146140011b712af1ef60cdb35688edb95a44cdf330a5073b0963331955465e5c57be65e43973bd437db94935985a630c3a30 SHA512 d53e7b64d40848c539e95d7a888018ddea177eeeae3d3a3da95ecd6a33c79630215a49159c6b4095475a84ed475c01a7f8d759ad392ee154468ac8deb9cddb54
diff --git a/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch b/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch
new file mode 100644
index 000000000000..bd291f9138e1
--- /dev/null
+++ b/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -231,4 +231,7 @@
+ ifndef HAVE_MUSL
+   CFLAGS += -DHAVE_EXECINFO_H
++# Musl doesn't have fts.h so enable linking to the standalone lib.
++else
++  MUSL_LIBS := -lfts
+ endif
+ 
+@@ -1043,5 +1046,5 @@
+ 
+ # FUTIL_LIBS is shared by FUTIL_BIN and TEST_FUTIL_BINS.
+-FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS}
++FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${MUSL_LIBS}
+ 
+ ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS}
diff --git a/sys-boot/vboot-utils/metadata.xml b/sys-boot/vboot-utils/metadata.xml
index 7cf6be5c254f..c4bb35a0e1b7 100644
--- a/sys-boot/vboot-utils/metadata.xml
+++ b/sys-boot/vboot-utils/metadata.xml
@@ -9,4 +9,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
-	</pkgmetadata>
+	<use>
+		<flag name="libzip">Use dev-libs/libzip.</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
deleted file mode 100644
index 12b8ef351c9f..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
+++ /dev/null
@@ -1,85 +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="748af73c67abf473d45bbacd708ce79bfc264ff5"
-
-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-1.1: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() {
-	default
-	sed -i \
-		-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= \
-		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-80_p20200108.ebuild b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
new file mode 100644
index 000000000000..41a810546177
--- /dev/null
+++ b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Can't use gitiles directly until b/19710536 is fixed.
+# This is the name of the latest release branch.
+#RELEASE="release-R80-12739.B"
+# This is the latest commit in the release-R80-12739.B branch.
+#GIT_SHA1="236bd46bfb59f0262dcb1771a108ebb5e90df578"
+
+DESCRIPTION="Chrome OS verified boot tools"
+HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ https://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/refs/heads/${RELEASE}.tar.gz -> ${P}.tar.gz"
+#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 +libzip minimal static"
+
+LIB_DEPEND="
+	dev-libs/libyaml:=[static-libs(+)]
+	app-arch/xz-utils:=[static-libs(+)]"
+LIB_DEPEND_MINIMAL="
+	elibc_musl? ( sys-libs/fts-standalone:=[static-libs(+)] )
+	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	libzip? ( dev-libs/libzip:=[static-libs(+)] )
+	sys-apps/util-linux:=[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"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}
+
+PATCHES=(
+	# Bug #687820
+	"${FILESDIR}"/${PN}-80-musl-fts.patch
+)
+
+src_prepare() {
+	default
+
+	# Bug #687008
+	if ! use libzip; then
+		sed -e 's|^\(LIBZIP_VERSION :=\).*|\1|' -i Makefile || die
+	fi
+
+	sed -i \
+		-e 's:${DESTDIR}/\(bin\|include\|${LIBDIR}\|share\):${DESTDIR}/usr/\1:g' \
+		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
+		-e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \
+		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
+}
+
+_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 FUZZ_TEST_BINS= TEST_BINS= all
+}
+
+src_test() {
+	_emake runtests
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install install_dev
+
+	insinto /usr/share/vboot/devkeys
+	doins tests/devkeys/*
+
+	dodoc README
+}