gentoo auto-resync : 21:10:2023 - 09:59:47

4 files changed, 32 insertions, 2 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 4ca884728020..3b8c0ba45d2a 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -3,13 +3,14 @@ AUX qtbase-6.5.2-hppa-forkfd-grow-stack.patch 1001 BLAKE2B 21fabd37d44ad496d2e11
 AUX qtbase-6.5.2-no-glx.patch 1298 BLAKE2B 83b399a1faa1bb976bc00b7d0b9721b2a2bc64f11f345d3ddb6019481c16f503a6faf1789c56fdbbb7a4d0bde5ffd9c1620dc677189d0e40008cef0ab02e732e SHA512 fcdd0ad2f0f6dadfea8ca00fbb93c18426eb4e12a8374f9f6d0c9fb2f4aa3bb9494e1c5eb0408066dbc4f9b5075c56f8b99a6336b9d66ac5558e99f38357f9ca
 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
 AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba
+AUX qtbase-6.5.3-forkfd-childstack-size.patch 1121 BLAKE2B a0fdab83b7bbf783352078cfb8111ea5dbcdc47e6435dc9bc85b3c55a4e3f05590abec396ddff466f6a823fbcb4ebcb0947c19b53d5c9f36d0227d6c05d69e2e SHA512 de5ca078206b18d1733906925d438bbe06088560ab10647840db818391f6a7b6a6bd5c112b06c1b6aa2ffbf46f4d749ece5f6f0739c672b4c3f4ce47ae5ff823
 AUX qtbase-6.5.3-xkbcommon160.patch 1038 BLAKE2B c6e499343728b78d33f52cefae44c1ef7fc67df0b5e9184920d8a4268c0fd73456ad9fedccf2380c2e22a9347f1da7c1279d3a22125e6f2b389b0cabe73f85c4 SHA512 09f795ad8342e2f7dd13f63ab98b9945e3e1b80e2917b1ef21845cc488bf823598693d53257e7b15ca3b3ee95dce2bfc60dced2e1b8f765337e4db86be73ac8e
 DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
 DIST qtbase-everywhere-src-6.5.3.tar.xz 47142456 BLAKE2B 5b4c774b7199563dc7f2aebf9b2b531d851ee49bc038212f4970eeb43a17c364710432708f82a518eee6692ab123d78b642c234d9548d5b553f689a43aa05ee6 SHA512 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9
 DIST qtbase-everywhere-src-6.6.0.tar.xz 48350308 BLAKE2B 719e265dfafb4fd95f972a317acb95e2d83f8d62175c28ab97837c635435bdcd79bdca113362dea2f04dab799d4749e23056ddb9583908ee20ab23cedeca19b7 SHA512 4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17
 EBUILD qtbase-6.5.2-r2.ebuild 9533 BLAKE2B c65ae24143e97f9704b8b6b641c556e93b69706c634e1aa7c6c0b559f6e56126d6e5f364fb15bad72d6e38a5e9afe31f6671f4c8295d33dfe3937bcd2ba16081 SHA512 02eac96f3947d73521f23db59181e74d243edbb0d9cd4069a533694a23c83733cc0d26605559e9bacadf570415b13e436d2a71ccaa17bde2092e28a43966dff6
-EBUILD qtbase-6.5.3.ebuild 9501 BLAKE2B 510cfa7b99438a7e55b82df5cf854d01227bea25172b3866872b3b004b83c5e68f70b74ab6cc0498ff8ce322f41eb8c5d82f0508c6ab03706143c98c1457f38a SHA512 5fbe8330c2576a4e53d8bb8c49cf316febf205c38848627bda083c98919a411f7a5b6f6395b2e85516f58446b08a988cae72e810b37557a62974c668cf05f9b1
-EBUILD qtbase-6.6.0.ebuild 9521 BLAKE2B 3e19b757eb121adfaec09f61d1cabeb45f904caaeb2007124d7b6644d9f89d2f791805f2e6ad22069f2aa437606aaa745275e9a9151b098a960ab69ec6374cc3 SHA512 0db1cdae6f831a5e4fffe20d042c8f095bf8c4e73114abc82cac04709ff16b41591f3c6fd10c21d620f96753973fadba8003e0da7197aa33647f4bb3787e26f4
+EBUILD qtbase-6.5.3-r1.ebuild 9557 BLAKE2B b95e3110612ae83ddf7039e1384e3adb94236de161ffd0beab016665f939a8139f3d0516b141ad3448957917e744305a9898f8ce14d6322626ef5494bcece96b SHA512 75be2bed89e5c003649e6cd940053bb8422aed3ef923f2baf7100c032adcce902dc85c1d7c6a732d19a548909397e4d7e99cdf0450f4331b3a866991a1fdbe41
+EBUILD qtbase-6.6.0-r1.ebuild 9577 BLAKE2B a152db096ff39df5d01e617454837d7c3ab8ead4db8e7759cc6ac0699f91ecc5688ca89c000c92b3aaab9e2754ae2ad3574ffc6e9a093d18506803a523994b3b SHA512 d379c4ce70f23fcce794e1c932601ec2551ad00314c680e7816f9c470d0881efa58a97f524f258ee1dbb7595ac4a23d61c0da11ced2c444e8729bd59d45f29b5
 EBUILD qtbase-6.6.9999.ebuild 9473 BLAKE2B 3ab1ca6da68c736aa3387c95a9c9ed416630e93c2f772a3aa12967ed0f44083d4348cc5a7021a5bbd5e0fb3d845af854aefc1d0e555c1943713f06b8be81c3d6 SHA512 228ed791b47e57b78a798d7a9f1b3759bf83af359e5b63d74b268ae56cf902d299f0ae4739207df098da884ba2c5b023b75fca59d0227126f32293929790be64
 EBUILD qtbase-6.9999.ebuild 9547 BLAKE2B bec900b10b89a015ca55a6703feec71ce92446439bca7bd62dddb3037a08dd3349f3b7b1ad31d1f0fd07055fe61b2b28ac199a57510d04050b60028dea5b91eb SHA512 88b65ffc5ef30adb8be240be1b9da901025f6737a99a75b19706eb90b767ca29884ca5322653a50bed670e344d29f578eacbf186ec18f45cccfe3443e3d4f970
 MISC metadata.xml 1724 BLAKE2B 958a60a43b45b9d79102633d818a57e697dc8180d1ffdea15ae064b659d19d099e6edf0c0583614cea1451375fec5163b8140efa530e9295a8a33e2165da1f01 SHA512 a11523095d1d6bb8443c8198315098c2c3b2e3e17cabcfd7260e2322c8542825605cc8e71eb8144c6dfe469abb2ed834d04350e80ccd9d6ee544a15099bde8b8
diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch b/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch
new file mode 100644
index 000000000000..34cbec61895b
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch
@@ -0,0 +1,27 @@
+Avoid crash that happens for some users in qsb, qmake, and
+potentially other Qt tools when ran under sandbox leading
+to build failures for qtdeclarative and other packages.
+
+Note that this is the initial (simple) version of the patch
+to ensure no issues, a more proper fix should land upstream
+eventually.
+
+https://bugs.gentoo.org/908809
+https://bugs.gentoo.org/908816
+https://bugs.gentoo.org/913493
+https://bugs.gentoo.org/915695
+https://codereview.qt-project.org/c/qt/qtbase/+/513140
+From: Huang Rui <vowstar@users.noreply.github.com>
+Date: Fri, 20 Oct 2023 10:16:01 +0800
+Subject: [PATCH] folkfd_linux,c: set stack size to 8192
+--- a/src/3rdparty/forkfd/forkfd_linux.c
++++ b/src/3rdparty/forkfd/forkfd_linux.c
+@@ -157,7 +157,7 @@ static int system_forkfd_pidfd_set_flags(int pidfd, int flags)
+ 
+ int system_vforkfd(int flags, pid_t *ppid, int (*childFn)(void *), void *token, int *system)
+ {
+-    __attribute__((aligned(64))) char childStack[4096];
++    __attribute__((aligned(64))) char childStack[8192];
+     pid_t pid;
+     int pidfd;
+     unsigned long cloneflags = CLONE_PIDFD | CLONE_VFORK | CLONE_VM | SIGCHLD;
diff --git a/dev-qt/qtbase/qtbase-6.5.3.ebuild b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
index e58d9d0e80e4..b166e0302241 100644
--- a/dev-qt/qtbase/qtbase-6.5.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
+	"${FILESDIR}"/${PN}-6.5.3-forkfd-childstack-size.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6.0.ebuild b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
index d41f291526d3..044f46b80925 100644
--- a/dev-qt/qtbase/qtbase-6.6.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
+	"${FILESDIR}"/${PN}-6.5.3-forkfd-childstack-size.patch
 )
 
 src_prepare() {