aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2023-11-08 01:18:24 +0100
committerAndy Postnikov <apostnikov@gmail.com>2023-11-22 09:15:06 +0000
commit0a0a07b6c181636f6e208e9e1fe9827bb1d04a4f (patch)
treeafbfcda862b9a7c6dccd3b3e68ef9e5721ff8678
parent342c39090ddc0c1d6e1d2316afb4cca2c5904121 (diff)
community/php81: upgrade to 8.1.26
-rw-r--r--community/php81/APKBUILD16
-rw-r--r--community/php81/fix-icu74.patch13
-rw-r--r--community/php81/fix-pcre.patch101
-rw-r--r--community/php81/fix-sqlite-3-44.patch25
4 files changed, 150 insertions, 5 deletions
diff --git a/community/php81/APKBUILD b/community/php81/APKBUILD
index f820e35ee9b..d4b4fec9909 100644
--- a/community/php81/APKBUILD
+++ b/community/php81/APKBUILD
@@ -26,8 +26,8 @@
pkgname=php81
_pkgreal=php
-pkgver=8.1.25
-pkgrel=1
+pkgver=8.1.26
+pkgrel=0
_apiver=20210902
_suffix=${pkgname#php}
# Is this package the default (latest) PHP version?
@@ -38,7 +38,6 @@ provider_priority=50
pkgdesc="The PHP$_suffix language runtime engine"
url="https://www.php.net/"
arch="all"
-options="!check" # disable temporarily
license="PHP-3.01 BSD-3-Clause LGPL-2.0-or-later MIT Zend-2.0"
depends="$pkgname-common"
depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre2-dev re2c"
@@ -113,6 +112,9 @@ source="$_pkgreal-$pkgver.tar.xz::https://php.net/distributions/$_pkgreal-$pkgve
fix-tests-devserver.patch
fix-lfs64.patch
fix-s390x-test.patch
+ fix-pcre.patch
+ fix-sqlite-3-44.patch
+ fix-icu74.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -347,6 +349,7 @@ _build() {
--with-xsl=shared \
--with-zip=shared \
--with-zlib \
+ --enable-zend-test \
"$@"
rm -f modules/* # clean-up possible previous build
make
@@ -568,7 +571,7 @@ _extension() {
pkgdesc="PHP$_suffix extension: ${extdesc:-$extname}"
provides="php-$extname"
- : ${extdepends:=$(_resolve_extension_deps "$extname")}
+ : "${extdepends:=$(_resolve_extension_deps "$extname")}"
depends="$depends $extdepends"
local load_order=$(_extension_load_order "$extname")
@@ -629,7 +632,7 @@ _extensions_by_load_order() {
}
sha512sums="
-c03f97d87f9e09121e00772d40cf21497870a8613106595c177b1bb8d1f6f2318b0d760959b2b3ecce2a5653788b2df232e32f34c43d0779240a86dc21feffde php-8.1.25.tar.xz
+5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417 php-8.1.26.tar.xz
7dc9f55b12998355a6a6b5cf277285058e66928215f8d0109448d06fb696a74c674f83d18a81bf03f4f0bee06e77979e9a4ee5c81c7fdebff91447f8e697cc69 php81-fpm.initd
98bb27864f1ece80fef18cb286885c8c18de8f9d1076507b6a24df07e33aa400623b90401375e7ebe55d9ff802069d281642ec7d3a58ef8727121aabe7643241 php81-fpm.logrotate
2e3b22b4adbc81c6120757095c89e56642f3e8bf7724af2926f2667759ef082cdcff416334aad87f704a61fcb5b2c11830f17759ac771a3dd4e47d9bc5c7cf72 php81-module.conf
@@ -645,4 +648,7 @@ f43ab399c3b4a2b9a3a329acd32d9cbc690cad697dd0a0e87f3d654028b88af7dd1cd80cbf970c6f
1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
73ad23e675c336b7607ff99fc3a3ffdb381779411c5503ef5a353ad43607070d889e441800abc54080d6be42032e94c3884d05d3bfbc46e5dda93b5e10fc40f7 fix-lfs64.patch
10c8da2e2ff24903c012b4df4f1fd7ed739429d0630260c398ed255cb45589ee170c29af09f5f57202a5fe37d4e82669196c813a5b916b7f2be2d46e9bfd1d85 fix-s390x-test.patch
+dc407a4542e15bba6ab2596efbbaf4eb407e851541ac0e672d64fef6ec1ac6f6c445352b67d76391bfc63ee4311f9cd4d0bd08081f897d122ca67d018033128c fix-pcre.patch
+c3dd16cdfb1a282d51299930d7c4c229ff43a7290a9296c4a3fa97416025eabcfa59618d7041cd2466a5fefffdef255402a2208508ea29f1b6f21df7db79c86f fix-sqlite-3-44.patch
+16d283ac2373442f2fbbca4968df92e0114454c7645a797f1f04af27e546293f3312d45aef049357057facd4fb62339ebfe7f59e65d4278910c4195d873955d1 fix-icu74.patch
"
diff --git a/community/php81/fix-icu74.patch b/community/php81/fix-icu74.patch
new file mode 100644
index 00000000000..077aa0b9735
--- /dev/null
+++ b/community/php81/fix-icu74.patch
@@ -0,0 +1,13 @@
+https://github.com/php/php-src/issues/12635
+
+diff --git a/ext/intl/tests/bug69398.phpt b/ext/intl/tests/bug69398.phpt
+index 02c4b7daef..d7633d54bb 100644
+--- a/ext/intl/tests/bug69398.phpt
++++ b/ext/intl/tests/bug69398.phpt
+@@ -13,5 +13,5 @@
+ echo IntlDateFormatter::formatObject ($date, array(IntlDateFormatter::SHORT, IntlDateFormatter::NONE), 'ko_KR'), "\n";
+ ?>
+ --EXPECT--
+-04/04/2015
++4/4/15
+ 15. 4. 4.
diff --git a/community/php81/fix-pcre.patch b/community/php81/fix-pcre.patch
new file mode 100644
index 00000000000..4f9bbbfc0ff
--- /dev/null
+++ b/community/php81/fix-pcre.patch
@@ -0,0 +1,101 @@
+Patch-Source: https://github.com/php/php-src/commit/78fba9cb80c5ec2f9e375ef7ad09c6396c123ef2
+
+diff --git a/ext/pcre/tests/gh11374.phpt b/ext/pcre/tests/gh11374.phpt
+index 07f8f4bccfd0a..29f6485cc0440 100644
+--- a/ext/pcre/tests/gh11374.phpt
++++ b/ext/pcre/tests/gh11374.phpt
+@@ -1,5 +1,11 @@
+ --TEST--
+ GH-11374 (PCRE regular expression without JIT enabled gives different result)
++--EXTENSIONS--
++zend_test
++--SKIPIF--
++<?php
++if (!zend_test_is_pcre_bundled() && (PCRE_VERSION_MAJOR == 10 && PCRE_VERSION_MINOR <= 42)) die("skip old pcre version");
++?>
+ --FILE--
+ <?php
+
+diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
+index c1c65450ea907..2f3ff6d9009e6 100644
+--- a/ext/zend_test/test.c
++++ b/ext/zend_test/test.c
+@@ -364,6 +364,16 @@ static ZEND_FUNCTION(zend_test_crash)
+ php_printf("%s", invalid);
+ }
+
++static ZEND_FUNCTION(zend_test_is_pcre_bundled)
++{
++ ZEND_PARSE_PARAMETERS_NONE();
++#if HAVE_BUNDLED_PCRE
++ RETURN_TRUE;
++#else
++ RETURN_FALSE;
++#endif
++}
++
+ static zend_object *zend_test_class_new(zend_class_entry *class_type)
+ {
+ zend_object *obj = zend_objects_new(class_type);
+diff --git a/ext/zend_test/test.stub.php b/ext/zend_test/test.stub.php
+index 364792a5665e8..07d7fa7e19927 100644
+--- a/ext/zend_test/test.stub.php
++++ b/ext/zend_test/test.stub.php
+@@ -125,6 +125,8 @@ function zend_test_crash(?string $message = null): void {}
+ #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
+ function zend_test_override_libxml_global_state(): void {}
+ #endif
++
++ function zend_test_is_pcre_bundled(): bool {}
+ }
+
+ namespace ZendTestNS {
+diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h
+index a8b84cbdeea62..6e3f645e3d143 100644
+--- a/ext/zend_test/test_arginfo.h
++++ b/ext/zend_test/test_arginfo.h
+@@ -1,5 +1,5 @@
+ /* This is a generated file, edit the .stub.php file instead.
+- * Stub hash: 7effabe18579113dbfc4c61231d93c8c262d959a */
++ * Stub hash: ae75eda2b4b40224858d680c3fcf3d7cd2056bb6 */
+
+ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
+ ZEND_END_ARG_INFO()
+@@ -91,9 +91,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_override_libxml_global
+ ZEND_END_ARG_INFO()
+ #endif
+
+-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ZendTestNS2_ZendSubNS_namespaced_func, 0, 0, _IS_BOOL, 0)
++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_is_pcre_bundled, 0, 0, _IS_BOOL, 0)
+ ZEND_END_ARG_INFO()
+
++#define arginfo_ZendTestNS2_ZendSubNS_namespaced_func arginfo_zend_test_is_pcre_bundled
++
+ #define arginfo_class__ZendTestClass_is_object arginfo_zend_get_map_ptr_last
+
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_class__ZendTestClass___toString, 0, 0, 0)
+@@ -112,7 +114,7 @@ ZEND_END_ARG_INFO()
+ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class__ZendTestChildClass_returnsThrowable, 0, 0, Exception, 0)
+ ZEND_END_ARG_INFO()
+
+-#define arginfo_class__ZendTestTrait_testMethod arginfo_ZendTestNS2_ZendSubNS_namespaced_func
++#define arginfo_class__ZendTestTrait_testMethod arginfo_zend_test_is_pcre_bundled
+
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZendTestParameterAttribute___construct, 0, 0, 1)
+ ZEND_ARG_TYPE_INFO(0, parameter, IS_STRING, 0)
+@@ -156,6 +158,7 @@ static ZEND_FUNCTION(zend_test_crash);
+ #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
+ static ZEND_FUNCTION(zend_test_override_libxml_global_state);
+ #endif
++static ZEND_FUNCTION(zend_test_is_pcre_bundled);
+ static ZEND_FUNCTION(namespaced_func);
+ static ZEND_METHOD(_ZendTestClass, is_object);
+ static ZEND_METHOD(_ZendTestClass, __toString);
+@@ -199,6 +202,7 @@ static const zend_function_entry ext_functions[] = {
+ #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
+ ZEND_FE(zend_test_override_libxml_global_state, arginfo_zend_test_override_libxml_global_state)
+ #endif
++ ZEND_FE(zend_test_is_pcre_bundled, arginfo_zend_test_is_pcre_bundled)
+ ZEND_NS_FE("ZendTestNS2\\ZendSubNS", namespaced_func, arginfo_ZendTestNS2_ZendSubNS_namespaced_func)
+ ZEND_FE_END
+ };
diff --git a/community/php81/fix-sqlite-3-44.patch b/community/php81/fix-sqlite-3-44.patch
new file mode 100644
index 00000000000..e5a6e945b1a
--- /dev/null
+++ b/community/php81/fix-sqlite-3-44.patch
@@ -0,0 +1,25 @@
+Patch-Source: https://github.com/php/php-src/commit/2a4775d6a73e9f6d4fc8e7df6f052aa18790a8e9
+
+diff --git a/ext/sqlite3/tests/sqlite3_defensive.phpt b/ext/sqlite3/tests/sqlite3_defensive.phpt
+index 033e661d8a393..056f716170c4c 100644
+--- a/ext/sqlite3/tests/sqlite3_defensive.phpt
++++ b/ext/sqlite3/tests/sqlite3_defensive.phpt
+@@ -20,7 +20,6 @@ var_dump($db->exec('CREATE TABLE test (a, b);'));
+
+ // This does not generate an error!
+ var_dump($db->exec('PRAGMA writable_schema = ON;'));
+-var_dump($db->querySingle('PRAGMA writable_schema;'));
+
+ // Should be 1
+ var_dump($db->querySingle('SELECT COUNT(*) FROM sqlite_master;'));
+@@ -35,8 +34,7 @@ var_dump($db->querySingle('SELECT COUNT(*) FROM sqlite_master;'));
+ bool(true)
+ bool(true)
+ int(1)
+-int(1)
+
+ Warning: SQLite3::querySingle(): Unable to prepare statement: 1, table sqlite_master may not be modified in %s on line %d
+ bool(false)
+-int(1)
+\ No newline at end of file
++int(1)