diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-16 21:23:20 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-16 21:23:20 +0100 |
| commit | fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch) | |
| tree | 10baa743a5340b42ad538dd19d48669ccac209b1 /sys-boot | |
| parent | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff) | |
gentoo resync : 16.06.2019
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/Manifest.gz | bin | 7226 -> 7225 bytes | |||
| -rw-r--r-- | sys-boot/vboot-utils/Manifest | 3 | ||||
| -rw-r--r-- | sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch | 11 | ||||
| -rw-r--r-- | sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild (renamed from sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild) | 9 |
4 files changed, 17 insertions, 6 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz Binary files differindex 44f1e85f0aaa..ba3eba93b24b 100644 --- a/sys-boot/Manifest.gz +++ b/sys-boot/Manifest.gz 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 <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.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild index 273d3ec48ff2..34a78cf8d7f3 100644 --- a/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild +++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild @@ -31,7 +31,8 @@ LIB_DEPEND_MINIMAL=" RDEPEND="!static? ( ${LIB_DEPEND_MINIMAL//\[static-libs(+)]} !minimal? ( ${LIB_DEPEND//\[static-libs(+)]} ) - )" + ) + elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND_MINIMAL} @@ -42,6 +43,8 @@ DEPEND="${RDEPEND} S=${WORKDIR} src_prepare() { + eapply "${FILESDIR}"/${P}-libressl.patch + default sed -i \ -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ @@ -53,10 +56,6 @@ src_prepare() { -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() { |