gentoo auto-resync : 29:11:2023 - 10:51:05

5 files changed, 30 insertions, 3 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index bf9940c29f9a..6ad04aaaa3a1 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -3,12 +3,13 @@ AUX qtbase-6.5.2-no-glx.patch 1298 BLAKE2B 83b399a1faa1bb976bc00b7d0b9721b2a2bc6
 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
 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
+AUX qtbase-6.6.1-forkfd-childstack-size.patch 861 BLAKE2B c5b1f471cf91150b6d6a643994284e95721f0739284680ba3e2d5d2332b3e0544c85f6dfb7129fccc3ed3beae24d7d3c919357d160bc9d5004426c68e8fa6321 SHA512 8c619b24cd9b7dd72ee975a66d6919718a0594eaeb0907454a9a9fd68a259db345f685aa9c87cf0c0c27b4194f621306a6f00f20dce95482bce7efe55fae00d6
 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
 DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1
 EBUILD qtbase-6.5.3-r1.ebuild 9687 BLAKE2B 815eccc4d634fb6216d3d2579bb9a7b06250a7428f2c8ed35e1dd244b512dd2d74f4b2afc552fa4d1bf0d6c936e3137827bc9c414e045c2f533a8d58d904d7d6 SHA512 ede59eb681b14fa4700f5dc719310f66bd8606e14f0d653be8ee7fe21b96332bfbe1597900c885f4a036a45b5677e8352b951fca57efc6f3d4a5c49cb226fb55
 EBUILD qtbase-6.6.0-r1.ebuild 9708 BLAKE2B 31b7311dfec4d656cf21e49868474228a563d2de80f014482ab5ad9b3f3ceedd1a1f0792cb0edbf78b365a3c0c4558c6f0f415649eec29efda04a8e077f69ac3 SHA512 3bd956295813a67a5327c594bdea9e384653d4ba31d42c957aead14782f4c59c503de4fe8d228c1a20b5081dec74528593d75f19fad34878683522f5e9f3f742
-EBUILD qtbase-6.6.1.ebuild 9604 BLAKE2B 658491332b60fb4a408981c68bdad6a24c6ed342caa4af6bd0ef51213a4c5772bd28574a004608308bed2d6bf5d0e6cdfdc356aa03eab30200c967dde2b14dad SHA512 89faac1be72daa01a202cb26d31ba4e7f56685f4d875c2e7c5f8da53e8a6e11dee4429fba669dd3c4117c0be1382fa36f17cd9fd51248fa83d6ca9a8ed7cb82e
-EBUILD qtbase-6.6.9999.ebuild 9604 BLAKE2B 658491332b60fb4a408981c68bdad6a24c6ed342caa4af6bd0ef51213a4c5772bd28574a004608308bed2d6bf5d0e6cdfdc356aa03eab30200c967dde2b14dad SHA512 89faac1be72daa01a202cb26d31ba4e7f56685f4d875c2e7c5f8da53e8a6e11dee4429fba669dd3c4117c0be1382fa36f17cd9fd51248fa83d6ca9a8ed7cb82e
-EBUILD qtbase-6.9999.ebuild 9678 BLAKE2B 6cc553fdd07c1beaac03d8df10531b09296dccf45494e5f2c32664eb09a719fbd8ed942c23c1b763f9a3ac8d89afa5fabd4cfbf2b9111189723b928e8bd66d34 SHA512 c98f13434c213562d13f8eac094ea8e080ae45041e91199ad41bbfd289ef521c777037c492b4b854af3aa13a29a1878aca9aa7dff0cc44d35c4ded69e88a24de
+EBUILD qtbase-6.6.1-r1.ebuild 9660 BLAKE2B 204bffdb1b2474d89f620ecc4318d30c78841ad919e8dcc3f3426dff3f6177edfdef5434a42ee801c3718adbfd7d1d736180b0550cd4fb58516a09919762fc9d SHA512 3332ca245c930df3223afd439450d78820a2a3991c16ff1e82e47516cac02fd4aaeee1e5b4402d9b67f0be5ea130b088bb409d809ffd8129656fd901a0db54b2
+EBUILD qtbase-6.6.9999.ebuild 9660 BLAKE2B 204bffdb1b2474d89f620ecc4318d30c78841ad919e8dcc3f3426dff3f6177edfdef5434a42ee801c3718adbfd7d1d736180b0550cd4fb58516a09919762fc9d SHA512 3332ca245c930df3223afd439450d78820a2a3991c16ff1e82e47516cac02fd4aaeee1e5b4402d9b67f0be5ea130b088bb409d809ffd8129656fd901a0db54b2
+EBUILD qtbase-6.9999.ebuild 9734 BLAKE2B fd3466371ba620b3999200a5555237bf920aec697057e2268231085443eccfa46a26edfe6eb4f278be21d34b6b734ec839626532d4fa1bdcc768db69c6bd34ba SHA512 05c3905daf36a9ac43204656ad22644537ef3a97cfdf07fc533e5ccd3057d4eb20e0ec3d15e8e4fd52be5b1ce4ac288956270f63e403db3fd0519c06f1532483
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch b/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch
new file mode 100644
index 000000000000..6b0ff1709abb
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch
@@ -0,0 +1,23 @@
+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.
+
+Former fix involved replacing 4096 by SIGSTKSZ but
+bug #918664 shown that this may be insufficient so this
+tries 32k instead.
+
+https://bugs.gentoo.org/908809
+https://bugs.gentoo.org/908816
+https://bugs.gentoo.org/913493
+https://bugs.gentoo.org/915695
+https://bugs.gentoo.org/918664
+https://codereview.qt-project.org/c/qt/qtbase/+/513140
+--- a/src/3rdparty/forkfd/forkfd_linux.c
++++ b/src/3rdparty/forkfd/forkfd_linux.c
+@@ -158,5 +158,5 @@
+ int system_vforkfd(int flags, pid_t *ppid, int (*childFn)(void *), void *token, int *system)
+ {
+-    __attribute__((aligned(64))) char childStack[SIGSTKSZ];
++    __attribute__((aligned(64))) char childStack[32768];
+     pid_t pid;
+     int pidfd;
diff --git a/dev-qt/qtbase/qtbase-6.6.1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index adbaf526bcf1..90146aaed3c8 100644
--- a/dev-qt/qtbase/qtbase-6.6.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -136,6 +136,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index adbaf526bcf1..90146aaed3c8 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -136,6 +136,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 9516155745e3..4de73e3c0c2f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -137,6 +137,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 )
 
 src_prepare() {