diff options
| author | Michael Orlitzky <mjo@gentoo.org> | 2024-09-21 23:18:17 -0400 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2024-09-22 08:16:32 -0400 |
| commit | a7b3389a7bef440155754522f6592f6abdf8af9c (patch) | |
| tree | 4095cfb000fb5b853dea3d3122a0b7e70fc0a469 /dev-lang/php | |
| parent | 8f7cab403b3b842db9650896f0465d411bd101e7 (diff) | |
| download | gentoo-a7b3389a7bef440155754522f6592f6abdf8af9c.tar.gz gentoo-a7b3389a7bef440155754522f6592f6abdf8af9c.tar.bz2 gentoo-a7b3389a7bef440155754522f6592f6abdf8af9c.zip | |
dev-lang/php: add 8.2.23, drop 8.2.22
Closes: https://bugs.gentoo.org/939443
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/php/files/php-8.2.23-fix-ub.patch | 32 | ||||
| -rw-r--r-- | dev-lang/php/php-8.2.23.ebuild (renamed from dev-lang/php/php-8.2.22.ebuild) | 1 |
3 files changed, 34 insertions, 1 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 8bfd4776ccb2..67e32370ebbb 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,4 +1,4 @@ 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.2.23.tar.xz 12118028 BLAKE2B a845b3280f51c15201d2606f399cd4ca98791f0584e18680de87476e665bc707b0e1c35f14f4bd5d2bb8eda43f422cc1088ceb11fc2d958dd36bd33290aa21a3 SHA512 ed1b26042ee9f059bd90140b5ce3f5f524441b22f2c5f96997e08455121acbf71072fd1f905fa1d477e9608c7827641b6e81f94e04701966e7ecd912ff99f99f DIST php-8.3.10.tar.xz 12484660 BLAKE2B a2cb60f83eea13aff7c907f322733a78f3d02bc334666a5350d795a84433252e0b27468f23eecc654fcfe882464da2699669bed247b7f4eaf40138bfb3773656 SHA512 99dc53cef802304dba455b7e1e54183e780fa21a58ec044ee5eac34d24fc9e5a1390447c18a3ef0035ef3dc531fc817016b47edab5b2e90af1233a73b59517be 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) |