gentoo auto-resync : 22:09:2024 - 14:47:12

4 files changed, 38 insertions, 4 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3c85149ba8d0..7448480badf5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,6 +3,7 @@ AUX fix-musl-llvm.patch 1195 BLAKE2B d2f3dffcae9cf82da44d0424bda6a15430a48a8def7
 AUX php-8.1.27-gcc14-libxml.patch 1982 BLAKE2B dcb329e5bae787aa0d47f70e7d60f5a187568b10f2e3a1dd33b5fc422df7b5774e9f4093b728d3621bcdfa2d3d96da98272e80be553cce5ea61151b362347c0a SHA512 f68cb97cc3b0b8da5eb62d7217fcbe1652579771ed19aba0b52740cb056c85710a1b1bff3286dbefa72bc22885dd4b4df8c5f5b1f089c977106251d9daa2065d
 AUX php-8.1.27-implicit-decls.patch 2163 BLAKE2B 0164d973ae9b6851014bcccd0deb92add72fa92d9a7c830695841768fb1998c2b49d649503ca324d9735f893974884438b922deab5a4c6c46275057a139ee3ea SHA512 f02d9668ceea39be7b4a6a9c3026d3d0e5230e74aadab09a454a2447a93ea1a4098982d714353c64ec1beb69fe387e9b3575c60fc14e4749298ea674f81401c2
 AUX php-8.2.20-implicit-printf.patch 2226 BLAKE2B 859cd38c6687b517a372973a8d282494f43bc5739ffa00c829de4a43ad72a752195657ededc7d4705699c0bd1ab249e588a74f6be85e1937c55de00d2844213d SHA512 95e4f535066b72e1497673dd633aa33beaf49c5a967ca2ad04e837ddea546f935717b3095d61cef8310138d77a3d18372139af3f979030b25b9ec2dc38318fb0
+AUX php-8.2.23-fix-ub.patch 1141 BLAKE2B d9b3a0cf7bbcf9778dab55e5480b78d9e694f9818819ebc406fdebb6113802c1b90667bdd2db911038c5e235560b7448c65dc995b861835552aea1e59fd4d42b SHA512 0b7736967997611f7b14595186d55bd24cc81b23add26ed4a800b63e5ace087c22c9a32946d76b7a896fae988d64125ed10091bd079359c8c4a83b34fc1a372b
 AUX php-8.2.8-openssl-tests.patch 790 BLAKE2B fcfa6f361470f2baa65d2bbbde7c9629841546a560aa6f88d85b68727004e24949f9516340eba0339e575dcf06077d08540a7a6d58a0cda42d5cd26bf48d9e46 SHA512 d29b5334abee8bcbef62c88c01c9eaf887f25901763db75e754f6690e24138c9e45783943d32402f693bd7e4564d737521a8b0b8034d5401bac73ff30f453050
 AUX php-8.3.10-optional-png-testfixen.patch 39081 BLAKE2B 7b21cdc8cf557144eee2455d540b834e583f919ffec3bb37ddf446cbd57e8835145f988d4b53c6341313e6e4001a7d879ad8c933677db9818a17b026694da230 SHA512 74b1d84b2e10073d32c79a2a6c73a0a6d198ad84190be2f4ecf752a338bbb1ba8353799b2c0fb9ff7e9513bbf2f849b8359c62db92631d4919d99bf97688376e
 AUX php-8.3.9-gd-cachevars.patch 2287 BLAKE2B 7e9fe2192937dfcd000bdb0a8f0236582e95e97c6f7c1e5973a9bc48e8d0d1ae71c2fb4be3c507dae977d0fae96503b3bb02825a334581aca70d97cdd0545627 SHA512 3ec68bff7fd365307f41a04835c80f3acdd053924fde3e09e301349079db161318f68ac226ae1d99eaf14ee7527abe5226a0e3a7b601e0a804019b2ce8c099d8
@@ -12,10 +13,10 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 DIST php-8.1.29.tar.xz 11826292 BLAKE2B 471f85504531c61e534c857a854de2ce9935b263e002deee19c4508390f6b2a11f89a02f55a90d660ee8d537b22a45db057e24373fb17fd2edf45f6e458f0196 SHA512 fd4f75224f71111a4cc40b3015ae70ac57a623326a3299da9ab8bd9dfad4ea27ff345d0eb75f1407d183207e763d372d738bbd8d217d01ec1414d29a547e8ba7
 DIST php-8.2.20.tar.xz 12097568 BLAKE2B 1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b SHA512 c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
-DIST php-8.2.22.tar.xz 12099476 BLAKE2B 8c6c664f0d48ce839971e5316b6c6619434babdf26013709589b2c5e91a63d79eddc3d716762ff1714620e7e5e35cf24f06eb270931dc6f15603e233c34728af SHA512 b72df5bf8bde09571a965f512b970e2403f1c9b26fbf9efc4d1aeb5940def10e4088e5c7dbb06087b2f5206d711e34849b0726af6a81b0c3b6d9bcbd14f5172d
-DIST php-8.3.10.tar.xz 12484660 BLAKE2B a2cb60f83eea13aff7c907f322733a78f3d02bc334666a5350d795a84433252e0b27468f23eecc654fcfe882464da2699669bed247b7f4eaf40138bfb3773656 SHA512 99dc53cef802304dba455b7e1e54183e780fa21a58ec044ee5eac34d24fc9e5a1390447c18a3ef0035ef3dc531fc817016b47edab5b2e90af1233a73b59517be
+DIST php-8.2.23.tar.xz 12118028 BLAKE2B a845b3280f51c15201d2606f399cd4ca98791f0584e18680de87476e665bc707b0e1c35f14f4bd5d2bb8eda43f422cc1088ceb11fc2d958dd36bd33290aa21a3 SHA512 ed1b26042ee9f059bd90140b5ce3f5f524441b22f2c5f96997e08455121acbf71072fd1f905fa1d477e9608c7827641b6e81f94e04701966e7ecd912ff99f99f
+DIST php-8.3.11.tar.xz 12481420 BLAKE2B a6cc0ec033aef240f11aa4e06133503cf554f18cfb54655b08c4a4d3c845f45e39e94b4069b862bddba09c0f501aeacc6e1afc8f94a5a58e3c6fa49df3488681 SHA512 69df9347643c33a41be4f98aebf13f29f8a22eb7120ae5192a1b2d7a9f487889efe98f273e18f7219b4c7ddff72eb42df05c76baeb36b2f63f32a9276c872a58
 EBUILD php-8.1.29.ebuild 22541 BLAKE2B 056c280b51a91b694ad0998acb10a2fe32ee2a8b66cef5f0f4e2ef91a191272e911d088f2e58f8714af70cdadc35af480c5e7ba273c07fd615785f3141157cf2 SHA512 554734d09b14721d8113dae5dc8b28b284c11f8d11498bcbf741fb431ccdb9ae83da10b7885c87aa508fd6b0e5444762238f5d565638a76e50a27845ccfcb6cc
 EBUILD php-8.2.20.ebuild 26556 BLAKE2B 2c0d09bad6c8d64bb1784dcf45c1464f9089665b578b4f5418614adb0cbcde484aa1546f8b519585439b636b592d63970728c85bf46013e2227ed53eddce2e89 SHA512 11225f8f7747da9d51c3e54d1a80cb13bcdad814b4066677d3a8455d7fda2229a2136e1263d7bbd1c2bd91a5a51db2176e69bc790711000b0368c02664d45e3b
-EBUILD php-8.2.22.ebuild 26563 BLAKE2B 9573dd8acdd123a3c2d3862146549793f5f628ae587695406adf7a2d07999be349cf97996c706d57e872f33d6031234387be423e4cfd340223e64f052465d0e5 SHA512 0aeb9e58c80b4ad028b6a71cc2919ae110a97edfa373663a546c28aa0cbf0b1e03e4630f3bbb81c33300dc739df7766005b5764a13339e4d983c2ae5b69d0d1e
-EBUILD php-8.3.10.ebuild 24486 BLAKE2B 0e63185c386ce1460600749c957574b6bd248eea9fba91be8c00e0cd68aeced8b0f4d71cc1885ea9ad8d53e05949f0ee4bc61954ec133661023d5a07f3500377 SHA512 c00abe8822c0dd1055bf78be040c57955459a83ecab1cbee07fee53f1ecb81976a074b7b48c46d66d8fdb73ddb120febd66158109b28114dae67677fa51879b0
+EBUILD php-8.2.23.ebuild 26602 BLAKE2B d739c854e909e16865647d0fc1723961645e1a2e64aff766b642a3ff7f504e5de0f7590baf17f03e92b320e7074895f16d9a13b1f4812b3e928c5490ac590e7a SHA512 0a27625db1b31640df9d19f8dc6d1ae446518929378f168647b8f4859efab10ef01c9c45c694acdcd70c348f9d12fa08eff59b27e7fd30bac37036df4d5fbdfe
+EBUILD php-8.3.11.ebuild 24486 BLAKE2B 0e63185c386ce1460600749c957574b6bd248eea9fba91be8c00e0cd68aeced8b0f4d71cc1885ea9ad8d53e05949f0ee4bc61954ec133661023d5a07f3500377 SHA512 c00abe8822c0dd1055bf78be040c57955459a83ecab1cbee07fee53f1ecb81976a074b7b48c46d66d8fdb73ddb120febd66158109b28114dae67677fa51879b0
 MISC metadata.xml 4249 BLAKE2B 11f9270fbc0cae280ec3ec62c9e6acfc643f4c7952822537664e8bcdbdfed64805b0e83fcbfb83111123745fadf64b276b51e1e27c9b5eb38ef8ffc30965d12b SHA512 39c59d31de21a66ca55a4816bebd901c8f2b28b7d1340605845c535cc979bca4d8641280bf45782d5d3eb94820e054e7f52491a23a4d1cf692774e11becc55c1
diff --git a/dev-lang/php/files/php-8.2.23-fix-ub.patch b/dev-lang/php/files/php-8.2.23-fix-ub.patch
new file mode 100644
index 000000000000..ee26743e5691
--- /dev/null
+++ b/dev-lang/php/files/php-8.2.23-fix-ub.patch
@@ -0,0 +1,32 @@
+From 47f80ffc77f2b728b0973ae671251859b2a8ab53 Mon Sep 17 00:00:00 2001
+From: Ilija Tovilo <ilija.tovilo@me.com>
+Date: Sun, 5 Mar 2023 12:55:59 +0100
+Subject: [PATCH] Remove unnecessary type punnign from mysqli_api.c
+
+value is a long. On big-endian architectures mysql_stmt_attr_get() will write to
+the most significant byte. Type punning was used to move that byte to the least
+significant one, which is UB. We can avoid this by simply casting to my_bool
+(alias of bool). Previously, a comparison against 0 should've been done.
+---
+ ext/mysqli/mysqli_api.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
+index 48078c57df091..68b55e1d78d35 100644
+--- a/ext/mysqli/mysqli_api.c
++++ b/ext/mysqli/mysqli_api.c
+@@ -1799,11 +1799,11 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
+ 			"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, "
+ 			"MYSQLI_STMT_ATTR_PREFETCH_ROWS, or STMT_ATTR_CURSOR_TYPE");
+ 		RETURN_THROWS();
+-    }
+-
++	}
+ 
+ 	if (attr == STMT_ATTR_UPDATE_MAX_LENGTH)
+-		value = *((my_bool *)&value);
++		value = (my_bool)value;
++
+ 	RETURN_LONG((unsigned long)value);
+ }
+ /* }}} */
diff --git a/dev-lang/php/php-8.2.22.ebuild b/dev-lang/php/php-8.2.23.ebuild
index 6922fdd70111..aff77b01e315 100644
--- a/dev-lang/php/php-8.2.22.ebuild
+++ b/dev-lang/php/php-8.2.23.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
 	"${FILESDIR}/php-capstone-optional.patch"
 	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
 	"${FILESDIR}/php-8.2.20-implicit-printf.patch"
+	"${FILESDIR}/php-8.2.23-fix-ub.patch"
 )
 
 # ARM/Windows functions (bug 923335)
diff --git a/dev-lang/php/php-8.3.10.ebuild b/dev-lang/php/php-8.3.11.ebuild
index 1522492a8f40..1522492a8f40 100644
--- a/dev-lang/php/php-8.3.10.ebuild
+++ b/dev-lang/php/php-8.3.11.ebuild