gentoo auto-resync : 19:08:2022 - 02:35:40

4 files changed, 21 insertions, 1 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d89ecae8f7f1..906173f48bbb 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 06dcab5f1cbd..21f888a0b467 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,6 +11,7 @@ AUX virtualbox-6.1.34-python3.10.patch 686 BLAKE2B 708c4b70c50024dbbd200bdd2af51
 AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef75175f5c3ba45ff9514c1f1ece8f6f54c1d8fe907ca3a10e411bc6b4474cddb39224d54b4bf4cd7b57522b2ca499ce85061c8 SHA512 a22f46e82f163676a5c07b8010160444cc621f9d12ec1226a304ebdf0800f8f24174dec2fb5e8999ba51f574cd2d290af1c7b94b54ca8c2cd6abdad9025e7fea
 AUX virtualbox-6.1.34-r3-python3.10.patch 4187 BLAKE2B ccacd5649bccd0ed7810a411b55c19565387b0fa4dc32c7c416c8f080ff45fd4cb6fd6cc16f88b7198350a166ae1948b247b7546731842c7e69578c2aaf1b04b SHA512 eb8b38375bf7464656e09635f341a03aae6648bede0d95f93b0d9a579421165568dd2be667cca05e7a3eca8695f8ae4ee91e3f7f4ce5f0c28c2e828e29581902
 AUX virtualbox-6.1.34-vboxr0.patch 1565 BLAKE2B ec47a42b7574def3ac3ca482db14cca96af855652b0ff11e4ef49cbc7ea2bec4e134b57e18df85b07d8a8f3efcd1d0fa69380cf32bf544781c6e14437f124a11 SHA512 3feb258993509e2bd3c13130fb227883960e6e3b3e14d146d04cb222c7323689902fcf581ff207ef70a985eaced02e303a6d93e55261db499f5c54eb3e007f57
+AUX virtualbox-6.1.36-fcf-protection.patch 374 BLAKE2B 6c7410ce1fa78aa7476c9b9a6f519c80957b3c7d55569f2ac02d3642d29574b9f8ed4b1c043cf14a899ff3cc67d7f7442bdd1ce27079b987783c36f38b39b49a SHA512 eb1f5d4ef64ea3306ae0489b3c7019a98e6f00c8a62ec8414c78bc8c14ab654ddae57c579557511e4144bf367ad3a2ea58dc5d9ba1a2c796f30fbbec0be7f414
 AUX virtualbox-6.1.36-python3.10.patch 855 BLAKE2B b6df3e3bf9d9c8d6cfc21a1a21373de02b98dc7178542bf7fe43499eaf77c98b95bcf51795e5c878e5433aec6557552407fd063d63a957450a3682cf0f423b77 SHA512 8e16ab0655909fd0301a4ff3fe70cd69787ad9d92d253888f6a05b8dc2172727e176ac3899b2efc4f50038b4f07b82df2252bceb05e2dc7b5a420302d0826e12
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
@@ -23,6 +24,6 @@ EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5
 EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
 EBUILD virtualbox-6.1.34-r3.ebuild 14573 BLAKE2B 110221a46466f9f053b231424840c73a00b665ced4d597fa7807500d65e18b189a8b8336e827d3caf40af251c60ad8b379578a978b7f5cb3c3d81c0cb8ae4da4 SHA512 3bbfd336e3b6306b04137314df32767dead2ba4f1821f1213ea32e5b00ce80e5e4d83df5b2647d846d5f91f9ee1efd2678dd4bd1767adfc7edba2cee856ba0c5
 EBUILD virtualbox-6.1.34-r6.ebuild 17645 BLAKE2B 5c76995ef49c60af3dcba9442aa84e8033244d7bd8235327513347457273015faec675ab317139871fabf6b6eeb0956edfac899edd8647c8d06c0e328ae49594 SHA512 341406607d99696423881f88c885087e170130645d7151ef5b622c63c010d7da52bdaf4cf9945158b8f78bb3662ad078bbeaaa4683b760c2a11aec7311b30bfb
-EBUILD virtualbox-6.1.36-r1.ebuild 17967 BLAKE2B 878eb24b9264f8469516052b9ae88b3f065bd00cffb8c4caa12c1c68bff30e2e7ca9c0a1eda4fd426f86dcda5e0cab28793af7407c61257f24bf858e76b58bfb SHA512 7eb00be1de554c789d2f4b5ae41d05e39bc571de83127392fea077a612f239272acbc3246749019da558cfd37703d0ec5e14a554e2e3ef273263bbc947d8a4ca
+EBUILD virtualbox-6.1.36-r1.ebuild 18027 BLAKE2B de8e5abac4857365383f2190f63d09f026bc631df70f3023c14165c961e498d6f908b8af57ce780f5967c2f1515232fffe2ba1754ef495348eeb46b05618afff SHA512 7316888f34eb3dada895214b193d6b98d22d1426cce967077846381a0384fa7b74b783407403642ca9f618ae01e03e29b59607c4e768b683aea285b403c0a239
 EBUILD virtualbox-6.1.36.ebuild 17819 BLAKE2B 839fd78c73e4e483036fa98010b9013ee3ba4aaada77301f213df40266db9df8b34ad69ba3ddbfe75a6b858c022da269ca30037afb94cb275898bf0974012639 SHA512 3cb3e5ec9b0e1f6a744079cb18401f73b51e62f1c82b88615c66d34ae56735713feb20afa6f64a8b2386c580c4bdcb45da2fc0637ccb18ad82ca81fb2e532022
 MISC metadata.xml 931 BLAKE2B bda8433410b0bf400bee4795ce53cd85554463417beec3d7f60fe5fe090317b2d75671a2c091718d4d57c5cc8c2961e0e93fbf9f6d70c652f812317ce4fc1b20 SHA512 0d7e309078a5b5c5cf891da6e8581fce8563e9014e822e9c99d6c7c62a88173b2536fe2554ea22f93965dfccd505543fe2022e6c064acc8d836ced0150fe491f
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch b/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch
new file mode 100644
index 000000000000..14b11f734c71
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch
@@ -0,0 +1,16 @@
+Bug https://bugs.gentoo.org/865361
+
+gcc does not support -fcf-protection for i386 (needs i686+),
+so disable it when building iPxeBaseBin.
+
+--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
++++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
+@@ -176,6 +177,8 @@
+ 
+  iPxeBaseBin_TEMPLATE = iPxe
+ 
++ iPxeBaseBin_CFLAGS = -fcf-protection=none
++
+  iPxeBaseBin_INCS = \
+ 	src \
+ 	src/include \
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
index c0b33deec69b..e964abdd6906 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
@@ -172,6 +172,9 @@ PATCHES=(
 	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
 	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
 
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-${MY_PV}/patches
 )