gentoo resync : 25.03.2022

10 files changed, 38 insertions, 15 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index e8ce11087954..12758fc84761 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 624c133314e7..dd0206aef046 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -8,7 +8,7 @@ DIST aboot-1.0_pre20040408.tar.bz2 115062 BLAKE2B 49f1b45abcd4726fd036e24709d10b
 DIST aboot-2.0_pre20210801.tar.gz 173477 BLAKE2B 54c38a98b9e3e956f08b4fcca6a4f3351364d7774a915916aae8af67237982635a2686c1df0628fc28dcc2443da8ad57be822c8530e1580261c60dde73f00519 SHA512 57181897147bba65e8b216af262bf2d2e57cb76bd809d8207439dbfbe84ff550cf9a43c0f10f9925e54ca21660cfe9441c7607743ff3f7613c1e22e219708081
 DIST aboot_gentoo.diff.bz2 9527 BLAKE2B 2492b456f7411630b6ecfb19db775969b69a35c0ef31b2146fd353aac78cf4d3c9ef2162cf54ab4ac025c65607219b3a33a74d2105be196e6dda54dd2509c1f8 SHA512 868a73fee56e9bf6d986175a6a4dc321ed12fb78d74dfb8f1a3e35274577ddc9ea0820768b44836403587b3976ad8dacdcf6562a9ce5c45981c752670901155f
 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 BLAKE2B a264d7999ed7735e42ea21f8cf96b60ca1bdbfcb76dbdfcba14a849043e1f6a9109cd72bf5b91b9ab877dc3025ce6a9270ea914cf277b8f77cecff703646a7ec SHA512 99849928eede0c4b101ddc9179c0974cac6b4f18803dc98b72dcbe80cea88d3062f709beaa1b890edbed9c147be0dd516065d4cee945164b5d9f19f7a3cf249d
-EBUILD aboot-1.0_pre20040408-r3.ebuild 2643 BLAKE2B 42cc709c24a16cc6a1edde9833894159a8f16b3ccd0328148b03dba0fe04e3f42ea66616c999e974fd82c13a0df587ff8fbad8e0ad5d0460e67abd20f7742b90 SHA512 4a86c1b908e70c83ef306c756bab15fe7a36cfb2677b178334deaea6f46cc391b5a743a5b2ab4d5cddaf7675ca7a75645a50ab5f11e4cf3327776848e4df5d89
-EBUILD aboot-2.0_pre20210801.ebuild 2016 BLAKE2B 6b5bc455c34c8775982dd397f03d6d02684938f7db12464b2db6f3e092bf9f1973f2f8210d5e48bb7241446f4af8dee672f130e9f2473b7bf71a08b7456807d8 SHA512 6a3b7ceb8ec510c55ca49607c136e339439dc81d1bd9133722abf2b42c3e77a3e2b8b2905d5fec93f5896757d6a053204ad3fe901c7fa98902e389a3d91fcef7
-EBUILD aboot-9999.ebuild 1920 BLAKE2B 6eb855d8fc7a8c533017f0a10809cbbd435962a250d562620765eeb988a00fe1a6de7c72143cbaa1a309f3d53fdf431400754a1b2150b144539ad70cb0a55a7e SHA512 86084d7852f4269ebf98abe446e53127f1221aee4f6f53a89af519ea0e9bd50bb8ebce259ec69bfee2780b733fd2c136b18b15fd4036fa67b240a2dc9cae3d00
+EBUILD aboot-1.0_pre20040408-r3.ebuild 2649 BLAKE2B 5bd3349ee67f9f3f6b5254386cc20da80bdebe08e6815e03c614231cdce59442677248c82674351be86838d9e39664d063f55b29231f72bc75a6812d6f069f6a SHA512 ce7545633ba5322d5f0f272973837bda883326f60cb9384922f419ef3061e70075aa0b7e737b9386ae42612bb1c2dc488ed73f20b0afa300012e3cf8228d0581
+EBUILD aboot-2.0_pre20210801.ebuild 2022 BLAKE2B 0a60c519407661b734146b9e4204714d9ad68d9675b0c1de15eac9e8eef6b5db219c98d9abc1b7127739b127835618e3ac74c300751fc3735a1183debd580bf1 SHA512 841d1ed7e6f98020632443da011f1ace98dec2fb71f02a27f1c7ed320f3fb37d34b481cd946675855e5fb820b1d3aa25e62635c2e3200cecf708a1bc319c57cb
+EBUILD aboot-9999.ebuild 1926 BLAKE2B 788056e318b044ac1b5f16bf864908f0faa8eaf3e9060ba5bb46f942f48bb313c95fd290c1b76c2775d97a79cfafbb3041cad3fa22fd8ad97863ad6ec7de6bde SHA512 4c9414846549d9405099d37fb697a48a2d29042f12fa06d42cb621675ad807a045ebb6c81f5591b3b660262d5d4beeb7a5248d806d0212bbe5d9e69a3bd2ee34
 MISC metadata.xml 339 BLAKE2B 35e599ad19c953888aa30d498be33e8d5788e8d34da3133d7170d42b5b815127c325dffc40ea38bb383b6d0d6894866b05c2386c97b9a1b248addf8a7be03259 SHA512 d33e65b6f82d8f46c3b9be8b554d3ea5ee1043e3057a3cafc6cf44f2e1b01adf10ce5b34f726d704bf152ee642b68053bce89dad2dcc0bf5434f9b54a037650a
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
index 94524795ae06..80ae29b8a244 100644
--- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
+++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,7 +48,7 @@ src_prepare() {
 
 src_compile() {
 	# too many problems with parallel building
-	emake -j1 AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD)
+	emake -j1 AR="$(tc-getAR)" CC="$(tc-getCC)" LD="$(tc-getLD)"
 }
 
 src_install() {
diff --git a/sys-boot/aboot/aboot-2.0_pre20210801.ebuild b/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
index 925430679b65..0cb5a272325e 100644
--- a/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
+++ b/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SLOT="0"
 BDEPEND="app-text/docbook-sgml-utils"
 
 src_compile() {
-	emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) \
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		all netabootwrap
 
 	einfo "Building man pages"
diff --git a/sys-boot/aboot/aboot-9999.ebuild b/sys-boot/aboot/aboot-9999.ebuild
index 2e29e829936e..494ceb2d395e 100644
--- a/sys-boot/aboot/aboot-9999.ebuild
+++ b/sys-boot/aboot/aboot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SLOT="0"
 BDEPEND="app-text/docbook-sgml-utils"
 
 src_compile() {
-	emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) \
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		all netabootwrap
 
 	einfo "Building man pages"
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 911b98821ec8..7274fdb9fb36 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -3,7 +3,7 @@ AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.14.tar.gz 125207 BLAKE2B fcbc7e59552d83828c07acb055429c1155b738dd12e22c9fc81759b9f84382e3ea793e957421d420c93fa5818d5ad8f12b5317cfe6d5d45d95fc15b272c6fe8c SHA512 9d22ea2826a69a9bb661a4c17aaa78d648f0684b96c2dc0f164d2086f48fc85207e40c69227dd76d153dd171574dd62f6e5e90dd415209de372b4d7d8ab40f57
 DIST palo-2.15.tar.gz 126696 BLAKE2B 38e9defd248fc3e1f9bd921097e0888695a6a815a4221f4b030f225712f206b722232d05f5070b7a76763c50f8a623bb1a3f41c5c84a3999318f3a098d665b14 SHA512 bb46308988399028808d801317421da5a072a504e1c932513a80ee993653f45bd6cbb862c1b85c369506bca3c5d213bf8344ba263fae7ef13d8f73d9d3a6d412
-EBUILD palo-2.14.ebuild 859 BLAKE2B 1b868286e7cfd0992874eddf1633aeae2649e9c8f60b31b9bd61fec0902f2bf0a057a62d4bde54a084728468d8e1625b6d81837042f093ccac2a3d309ed9fbdb SHA512 9e7d6afbc1403011cf8a235dff5397b8eb2f32a310308616174e7092c360f158272e6c196237da47d68b7916d77d044c637ecabeb2fdb7bd65c64333edf2b9df
+EBUILD palo-2.14.ebuild 865 BLAKE2B 25e6b3400005ea1900125949c659edd81809e855ad99a9de3b9edc06b85510ab0708989ba0224bc87972f67a862cfd001c7cf36d95acc29e1ed1ef70c897a819 SHA512 6e11b170876df9714aefba51bac1560876ba0bcc571295d97f59ad27228ffc29323e4e6af0db66c16cd6e8325de63da2e855b4473947a9cb7b3d850bcdc975ac
 EBUILD palo-2.15.ebuild 978 BLAKE2B 223154ffc3378131900fe819663f94720c15e9064302601cbc2bfe278ff36c1a8073e60c272c978ed553ee6cb6b46e6b2820ea5f9de825501f6b15d5fa0328c1 SHA512 cc4378486d184710e52e88e59adcf14902f029089c10ce7f718293eebf6ca68638ea5e478e77d7b145f2bdd738848564c9933b1facd5b40436d19b27f3f68f6e
 EBUILD palo-9999.ebuild 978 BLAKE2B 223154ffc3378131900fe819663f94720c15e9064302601cbc2bfe278ff36c1a8073e60c272c978ed553ee6cb6b46e6b2820ea5f9de825501f6b15d5fa0328c1 SHA512 cc4378486d184710e52e88e59adcf14902f029089c10ce7f718293eebf6ca68638ea5e478e77d7b145f2bdd738848564c9933b1facd5b40436d19b27f3f68f6e
 MISC metadata.xml 256 BLAKE2B 86720639750e95cde1d1b34e7f02625e2d2d4385d22da069148aef8fc91f845dafc168064aac300413fdf74f8ac0381ba0fc353af36aa2919cb93360ee20bb88 SHA512 ebd15404f5a5443197bc12bea96924ad05b7eeb808582193c9caf857c2908bf5abf2886d192dd113303e006305ee966a35297d79beec063e7d0bb23612cc598f
diff --git a/sys-boot/palo/palo-2.14.ebuild b/sys-boot/palo/palo-2.14.ebuild
index 0a94f5679bf1..01f18fe777a1 100644
--- a/sys-boot/palo/palo-2.14.ebuild
+++ b/sys-boot/palo/palo-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ PATCHES=(
 src_compile() {
 	local target
 	for target in '-C palo' '-C ipl' 'iplboot'; do
-		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
+		emake AR="$(tc-getAR)" CC="$(tc-getCC)" LD="$(tc-getLD)" ${target}
 	done
 }
 
diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index 48a96ef77363..12c3424d86a3 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,6 +1,7 @@
 AUX tboot-1.10.3-disable-Werror.patch 522 BLAKE2B e25832b544ffc81d83d963061c35432f454590b02f3c9d10ceff60f977b9b022e39193a41ded7f96c71681f7219204809dd4156bcf7ad37ea8738155b6c0469e SHA512 a219e4f1dd637fb93cd05e827ab7d1a9bbcc99b87a3f6e9e8b902d0ab08f150ad87d8804f0d506c5ac721be4d1a85a14466e036c09643601a705be0fb07e4ed4
 AUX tboot-1.10.3-disable-strip.patch 343 BLAKE2B 65d5e7f4e97504ace2d42123701de8f6e27e3ffc196b69a0afc8057ed8fe75c8274c427d858cb316d5712505381a5a109ddc5301eedc0f93c34d3ed0551deaff SHA512 f86f595d8883d433327eb906ee5fbe0c277180c7a993ae47e26c23ea8b406e59cbad28509ca399286ba306949b0d5de5dc9420242706c7affcba12d86e3f183b
 AUX tboot-1.10.3-dont-call-toolchain-directly.patch 1884 BLAKE2B 80a029eb34f3088ccb772b5e9b092b60f35516659c74d149c0ff6bc6afb7578d35e3063beadaf0dd61407f84f78f20d782c3b64c33ab566751a2317fee14aeb9 SHA512 02dd09eb4b4a65802206c066f32959ab8150933dbc37458e888dcec4cf40b25681e3f0463cd8df62149f7764956d04259c05be36aeed8d9a243d758d3a2225a2
-DIST tboot-1.10.4.tar.gz 908050 BLAKE2B 8c793e2ec29cc3c3aa8199ac5058e9b3521eb0a72609c8b5ae21e0843571ae765be74bb48184178e2641ff8eec05680f81e45b12b80fd7d2727c82f9c8702411 SHA512 6fe93cabd5fc10cba7797048cad2cce4c490e0112c5c877f3367d78873cb55ba3d84eb703f2fcdba807eb21f1bef6a838d315b32d6418fb88b2589ff66e99491
-EBUILD tboot-1.10.4.ebuild 1892 BLAKE2B 5de7709ef3ff7f21ecfd75cf45fc2e971493e0b2e49f3684cf451afcef5ec1e7fc317bd124e72dfc894f12f862c2ae69b689018b5e58d438c745be1d7dfc72cb SHA512 dd0024300995105f901b7132176bb23125dbf78c6ac3f03464a5abcc69677096f3fe5bcf9eb5794d89a0dfa8f0f2de3a3ddb1e14ab9246132da4e009bf954289
+AUX tboot-1.10.5-fix-pconf-element.patch 775 BLAKE2B adba01bd5a9b6ff315ab50b3b42c2862ce09a19207a37ddf0c93ba5b8819f14fa0e3f1a3d8a65029bdb4d70bf1ea9b546b9038c158922cbcc3ea166e1f7b5213 SHA512 3a11bd1603a9487659c7059ada60e91aed9fb38f382298f2473c88aff66abcf2cced90980487be988ca150be1b2b87c40ef0190b7ec5862dc00af6077c652f52
+DIST tboot-1.10.5.tar.gz 907657 BLAKE2B f9e33c512fac304eba6cbf87b497c48ff52c5efdb47103f247e04c95f8e44230671c58811d7d58753cd9c49c53d9ad77a0c5c7fb7fcce5c94d48f8fcaa9ad1f7 SHA512 01a039e5612b6cca6f7558e93673ba50edfcfbf3f65e390ac64f4aa6ae0859a314676b20d722dcd41a7a3c940473fe7982e823c800a75bd26a5e8f956528f223
+EBUILD tboot-1.10.5.ebuild 1946 BLAKE2B df14244fcc092b5eaed7bd0d73454510ea80415f70fb9c693c66f0fb76e4d2672f97ceb6b484b45740cba20aea2fe6e876bc9ce064693871b08c36c1d5f0d91b SHA512 6922599ab48e14138e18ad492512e34a1cef3233b1e509f9ade7f7df2472cb3774dd64d0ae31e0f5aee8ff4336cdde2846d8d2c21c78f00ba3e2c5321a3fece0
 MISC metadata.xml 508 BLAKE2B c28a3b0e46c57c91011bbee5ff6769ace24ab4e7b3355536b8e8c3bdb33b0be4ee1fedd60f00e2bfe8957570f763e8e85f3a1786f7a470bc5b4c855e57f7b8a2 SHA512 e45960df2560d82cb914db1f661d739b5d6747b7fb433152fef849d36d6bb4cc812def3cbafa4b362056c4d96e37980e65f8bc163b2021d5827ffd6ee9afca4d
diff --git a/sys-boot/tboot/files/tboot-1.10.5-fix-pconf-element.patch b/sys-boot/tboot/files/tboot-1.10.5-fix-pconf-element.patch
new file mode 100644
index 000000000000..a3b5138c5de0
--- /dev/null
+++ b/sys-boot/tboot/files/tboot-1.10.5-fix-pconf-element.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Christopher Byrne <salah.coronya@gmail.com>
+# Date 1645847383 21600
+#      Fri Feb 25 21:49:43 2022 -0600
+# Node ID bbf8373779e4653be2e2cfbaf14e1abb1ae42af4
+# Parent  5941842afb661f0e78085cb1317781d362583a38
+lcptools-v2/pconf_legacy.c: Add missing BE size_of_pcrs to hash buffer
+
+Signed-of-by: Christopher Byrne <salah.coronya@gmail.com>
+
+diff --git a/lcptools-v2/pconf_legacy.c b/lcptools-v2/pconf_legacy.c
+--- a/lcptools-v2/pconf_legacy.c
++++ b/lcptools-v2/pconf_legacy.c
+@@ -241,6 +241,7 @@
+         ERROR("Error: failed to allocate buffer for composite digest.\n");
+         return false;
+     }
++    buff->size_of_pcrs = htonl(no_of_pcrs * SHA1_DIGEST_SIZE);
+     memcpy_s(
+         &buff->pcr_selection,
+         sizeof buff->pcr_selection,
diff --git a/sys-boot/tboot/tboot-1.10.4.ebuild b/sys-boot/tboot/tboot-1.10.5.ebuild
index 4cedba3fabfc..c36283eeb34a 100644
--- a/sys-boot/tboot/tboot-1.10.4.ebuild
+++ b/sys-boot/tboot/tboot-1.10.5.ebuild
@@ -26,7 +26,8 @@ RDEPEND="${DEPEND}
 DOCS=( README.md COPYING CHANGELOG )
 PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch"
 	  "${FILESDIR}/${PN}-1.10.3-disable-strip.patch"
-	  "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" )
+	  "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch"
+	  "${FILESDIR}/${PN}-1.10.5-fix-pconf-element.patch" )
 
 pkg_setup() {
 	if tc-is-clang; then