gentoo auto-resync : 02:08:2023 - 16:50:29

3 files changed, 22 insertions, 1 deletions

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 5696e1205ced..c74e9e58319d 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,6 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-10.2-r2.initd 751 BLAKE2B 9d723089b270e856d1451a6403cdf1ee0d4730b07d1dd8970cb2969f6cd4cee61827cbbbefa45ed4393c30f9c9a62f3ea0f904d23c3f31634b3ae2cc405c70a7 SHA512 cbe20b9c66c038dc9e24ff85ee2724f95fccb357e8d8e1f4cd2371e8599421b1275a9bb67a65330979791fc436c0eaa3ed0afae99dc43546dd49557e188e3796
+AUX glusterfs-11.0-fix-crash.patch 667 BLAKE2B b8f1e0bb4f4858e558b89fe773c800e157b9dfea89753bc191079ead7a81e56fa59a4dd16f6ea2ef300af868b9094149a651e8050e6a0e6bbdde6696e033923d SHA512 9f3bdb8a7e5d63d5ecabafd4d815482c02b539e97029e3be20bc47ffe3d33967e65092bdf76c2f812fcdd72274ce1c71d0140b03209afa475ac77d20b484a87b
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
@@ -9,5 +10,5 @@ DIST glusterfs-10.4.tar.gz 8293872 BLAKE2B 01f8764cc71b7bac2ee0419f3f1069ac1c85e
 DIST glusterfs-11.0.tar.gz 8355706 BLAKE2B d0ee895b8ce5f506d9bc1f8b962a0f29b0379f086bf18cff0092938b7c2f7025afa2fccf54f58ac751a184a3b0e91a086df2d6496892f204373e070d7576a5d6 SHA512 075f0025a1892ebb28d45d0a4e8971656319582dd7bc2c8b19ea26cd08a789bb54f8bc9752839706cd0ee0ca54be74245230bc453a5d1e9e163af84f08937e69
 EBUILD glusterfs-10.2-r2.ebuild 5785 BLAKE2B ccea7cc47d33c2698836c327dfefd8b1ae6913369d33c060cb4a12960345c84ebc4341eb64b1cc17e8edf3b06c250350477fdc44c0c21b1c30529145bcedad62 SHA512 2bce6a9423bd21916afc524c18f17b1e24c13ce4d6726d30ea9eda377a329a262b5548211277962d16dc786741321d779a9f3d6cce9dae1f1c8309c17810d6e3
 EBUILD glusterfs-10.4.ebuild 5799 BLAKE2B 57288a885b112b004d9f1e5e97d4a727e11936f0946037790cfb03a91dfed03db7583ccee9eb1baa65429a79fbde27530fb1dad6f8d87dde6e62b1f08eaa6402 SHA512 3ac7c9d8f212c995e19d84afd86f946d2dccf76781e4a61a81e3271efa62e87fd42f23d18f9db04875cd1c8792e1c8418671020388974d10383b6ab82a73da0c
-EBUILD glusterfs-11.0.ebuild 6003 BLAKE2B 7513ad56e5b4f92879f849d694ec63004c756a69a12d7f383e92bad3a8ecd75d8460e50f6635e6887f8fcc1cc53c71c44dec37b204678bccaa4dd7496a3d4ab7 SHA512 1cfb50c3f99ce906fcedc8e4d0ec1e1792bd821dd170c936eb2f01fcd2c8381c4d2ef74dcf6652971f596524978d5be2017c2e9478472bcec1f1a666d03e6d36
+EBUILD glusterfs-11.0-r1.ebuild 6058 BLAKE2B 7c154ed0b9c9f70d3aace6dca42570a3511e4630c79283d0738ede8f7f3ba6747cf724d6c7f37549f3dab0e9c7a05ee9d5fdf0e1a7e9ddf53f18d103d3fce2c1 SHA512 5b4fef5911829a7995139798734123e4b0acf1fd854521d63cc0e62e7e24dc45f3c130ae659ec4a7399547694bfda3603e295d49ea7510b25fb44a2157b8fadc
 MISC metadata.xml 1575 BLAKE2B 8d83c4db883ecd85230029532fdd5cea2e51391c2659a5280d4eeb453390b8413c58aca550f365049de36914da4d0d977356ba30c29afe0ca8e58ff41d34d321 SHA512 07bd2f41605ab4f1bde167d8b3d620492c5d85ef77ea49ae53970ab579afcd70e1aae9a40e8856d88034045c7201fcccdb079efc0af0ac76f32fde3417d7ad76
diff --git a/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch b/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch
new file mode 100644
index 000000000000..6a4a1ec517ab
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch
@@ -0,0 +1,16 @@
+# https://bugs.gentoo.org/911588
+# https://github.com/gluster/glusterfs/issues/4192
+# https://github.com/gluster/glusterfs/pull/4196
+diff --git a/libglusterfs/src/glusterfs/mem-pool.h b/libglusterfs/src/glusterfs/mem-pool.h
+index 46f764f56e5..416b7ddf1e3 100644
+--- a/libglusterfs/src/glusterfs/mem-pool.h
++++ b/libglusterfs/src/glusterfs/mem-pool.h
+@@ -297,7 +297,7 @@ typedef struct per_thread_pool_list {
+      * in the implementation code so we just make it a single-element array
+      * here.
+      */
+-    per_thread_pool_t pools[];
++    per_thread_pool_t pools[1];
+ } per_thread_pool_list_t;
+ 
+ /* actual pool structure, shared between different mem_pools */
diff --git a/sys-cluster/glusterfs/glusterfs-11.0.ebuild b/sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild
index d20ce8ba2b97..df0fe73818d4 100644
--- a/sys-cluster/glusterfs/glusterfs-11.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild
@@ -24,6 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # the tests must be run as root
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-11.0-fix-crash.patch"
+)
+
 # sys-apps/util-linux is required for libuuid
 RDEPEND="
 	acct-group/gluster