diff options
Diffstat (limited to 'sys-boot/vboot-utils')
4 files changed, 7 insertions, 23 deletions
diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest index 3f40e5437ea6..11b1d985ee6f 100644 --- a/sys-boot/vboot-utils/Manifest +++ b/sys-boot/vboot-utils/Manifest @@ -1,7 +1,6 @@ -AUX vboot-utils-72_p20181229-libressl.patch 426 BLAKE2B a67628074549b60e899f20a2589b64ab7dfe90f6476f44c2bb028f0f90b847173eb3e6ea975858a627a257bdaf2121865a7c83cd4d253cbc1d6ad412f0b8e84d SHA512 a78eaa53cc784845a99686025f20f7b10f5d285f4b145fa0e2371b4d242d489a21e91253e7a3b5cee12565c8412224556240acc555b0c9500d5a46b7b1356bb3 AUX vboot-utils-80-musl-fts.patch 428 BLAKE2B b36b902b045906324e0553f6acba4a760d11289d1d68b38bcfd6c4c6531493f0c778fb2539cb5f19604f8705ceee3dcc2b30caab87f2114ee485345d9b0d7d79 SHA512 59a11a87d9cd4596df749c8dfd188f90818c09a432805cfbb47d02cd13228561af345a336bfd502d205a94ca432cff539ba1ea684542e86f13d6dfdea3db0d41 DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe DIST vboot-utils-80_p20200108.tar.xz 18448212 BLAKE2B f7e375133fb6dc90def1e22c42c7511a3b649c34d067a447f44fb99c1ec37a73d034837c2212e5d6ad368a4f4b011c8cb9eb479e81db4a52b1160cda99382a77 SHA512 077d137d8fe89f35b6f7ec6408b2e9fc7a28765b0987646c1964e6e0c039e359711ab79958c45ee555a0fe810997217225d072a7f1011b1c73c4aefb4e57fcc1 -EBUILD vboot-utils-72_p20181229-r1.ebuild 2606 BLAKE2B 7f840a9ce9f354da4bc34f01713ae401707cd205bbe17cb7a045aeb242c11740237d4fcaf365525e086d69077e172b9468decaa26495168e0bd78e5bff937e6d SHA512 4c698c324407690508999cb800ffafae7c0ada47d28e94962b2812919d1081b0b72db42cae988a3ec91b32ecd61bb81b506299acd6f593da6f44f3f049fca4a5 -EBUILD vboot-utils-80_p20200108.ebuild 2800 BLAKE2B 24e32895f0a84865643a062fd873f535b27ca7ea89d55f7c4cbc3b09730f0eba3127ceddffa89830e0deb638505cfc7c28e59529af8b3ae71be0986b57ffe0d1 SHA512 59ddc28a5c5ba959dcc2a7a0207efadedcadb1ff01db596a67705b66abc0998fe4922a1b94ebebcd178aafc2ba88437ce8a50ed9c810f41bb8a4c3b44c7388e5 +EBUILD vboot-utils-72_p20181229-r1.ebuild 2487 BLAKE2B 998b95bc1c9748edc8748ebdb13e4c8eaaeb32713badbb83377d9e94a9ed8a1df5fb15361ba3d556ee4a8a8a8733e0dee31a648337487fa9ba2071c84ac8f66f SHA512 bb6c17b66f730b0100a75d3e5f6dfae1e9dd921166c018a78445374a1e707ccfe7839edd36c520eba4ef1e9c1cd8cfddd8d5895bb79a076b67ee7547f3952b92 +EBUILD vboot-utils-80_p20200108.ebuild 2724 BLAKE2B c13d1c12ecff0933c90699c84ed9009eb9a001276485fb0c7dbcfa568ff9b61769901ce1aa19fa9b5bf199d27dbe21f2d05468b00a45d6401e1c6d7b9c035ef0 SHA512 13c82d20d5ccff35d5b779aa300d5f0a55b344057a0ee989b106fc476e7992b7ce8fc532e7e6c6abf5a590975e64448bdffb2da1d979fa058767fc6aa7fbcd95 MISC metadata.xml 552 BLAKE2B 972282f45e6ca80d35ee7a4dae2a146140011b712af1ef60cdb35688edb95a44cdf330a5073b0963331955465e5c57be65e43973bd437db94935985a630c3a30 SHA512 d53e7b64d40848c539e95d7a888018ddea177eeeae3d3a3da95ecd6a33c79630215a49159c6b4095475a84ed475c01a7f8d759ad392ee154468ac8deb9cddb54 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 deleted file mode 100644 index 6702a9f590bc..000000000000 --- a/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 <openssl/rsa.h> - --#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 index 94e91a94c2f4..caef3af6399f 100644 --- a/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild +++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild @@ -18,14 +18,13 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -IUSE="libressl minimal static" +IUSE="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(+)] ) + dev-libs/openssl:0=[static-libs(+)] sys-apps/util-linux:=[static-libs(+)] dev-libs/libzip:=[static-libs(+)]" RDEPEND="!static? ( @@ -44,8 +43,6 @@ DEPEND="${RDEPEND} S=${WORKDIR} src_prepare() { - eapply "${FILESDIR}"/${P}-libressl.patch - default sed -i \ -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ diff --git a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild index 41a810546177..67f272d57fa0 100644 --- a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild +++ b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,15 +22,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -IUSE="libressl +libzip minimal static" +IUSE="+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(+)] ) + dev-libs/openssl:0=[static-libs(+)] libzip? ( dev-libs/libzip:=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)]" RDEPEND="!static? ( |