aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2020-10-14 01:46:42 +0300
committerAndy Postnikov <apostnikov@gmail.com>2020-10-14 09:17:59 +0000
commite8bc8fd7f9618ec31f5007423fff5defe7bf306f (patch)
tree3c7a91251857c35ffaee1040e3d58e1047a51c0b
parent859d57cae894b560ca49a4fed932b3b60c6496ad (diff)
downloadaports-e8bc8fd7f9618ec31f5007423fff5defe7bf306f.tar.gz
aports-e8bc8fd7f9618ec31f5007423fff5defe7bf306f.tar.bz2
aports-e8bc8fd7f9618ec31f5007423fff5defe7bf306f.tar.xz
testing/php8: upgrade to 8.0.0_rc2
-rw-r--r--testing/php8/APKBUILD12
-rw-r--r--testing/php8/tokenizer-stubs.patch11
2 files changed, 5 insertions, 18 deletions
diff --git a/testing/php8/APKBUILD b/testing/php8/APKBUILD
index 4f0326bd15..49b4854049 100644
--- a/testing/php8/APKBUILD
+++ b/testing/php8/APKBUILD
@@ -25,8 +25,8 @@
pkgname=php8
_pkgreal=php
-pkgver=8.0.0_rc1
-_pkgver=${pkgver//_/}
+pkgver=8.0.0_rc2
+_pkgver=${pkgver//_rc/RC}
pkgrel=0
_apiver=20200930
_suffix=${pkgname#php}
@@ -91,7 +91,7 @@ subpackages="$pkgname-dev $pkgname-dbg $pkgname-doc
$pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm
$pkgname-pear::noarch
"
-source="https://downloads.php.net/~carusogabriel/$_pkgreal-$_pkgver.tar.xz
+source="https://downloads.php.net/~pollita/$_pkgreal-$_pkgver.tar.xz
$pkgname-fpm.initd
$pkgname-fpm.logrotate
$pkgname-module.conf
@@ -101,7 +101,6 @@ source="https://downloads.php.net/~carusogabriel/$_pkgreal-$_pkgver.tar.xz
sharedir.patch
$pkgname-fpm-version-suffix.patch
fix-tests-devserver.patch
- tokenizer-stubs.patch
"
builddir="$srcdir/$_pkgreal-$_pkgver"
@@ -607,7 +606,7 @@ _mv() {
mv "$@"
}
-sha512sums="23f74638ceef543f7c4e3bf520f6241af68f81ce8ce5aa13d82691e5eb53958eccd7d865e75efbcb2907f38090d6ef1dd7f48ac8af24c2541c1f04d71859b121 php-8.0.0rc1.tar.xz
+sha512sums="a8f228f584f8156d1d39b1f685e41f97ea79318c31ccd2b31a36217ddf03116c07feea84875d07bbb8511d61766b5452e7dbcaf98aaf96cc9542e9e192f3273d php-8.0.0RC2.tar.xz
8a9a63cddfd9bdde23db85a7be0711e14688bab35b580abd0184d370c54de80b72cbdeb369570cd23927154984f024eaad5d222d53d9e19130fb2e8758dd4540 php8-fpm.initd
cd3a96d3febde3b6657ed80ff58945641443e84e5e0fd3d9df29e640e9549bc452a3412f1999fa02ae1ee2b64c08040998fa75805f67e0252741c376e26e1c3c php8-fpm.logrotate
eaea9399bc45e1b98667ee1c034979f977ed44eaed039589be3a5ceb06bf51458326046162797bd9f760ec342e83f6e63e18bf7ccafb1cc3e7ab35c861ded590 php8-module.conf
@@ -616,5 +615,4 @@ ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4
79f919ca110530cac2f1ed1e7a86e2c396c25022f00501b520b6bd2efa8eefd962df4ad25235b8a37d8a30d67d257baaf9dfb4041891206a5b15a9c895f1797d includedir.patch
b5d7e87df4f45171a185aec1d4cf96157b3c6b9ea9625237e31b0756220a12a64c260cc20c38bfb0146f11fca25c9c25be1981a922ecb14de5cc2965d29d8fe3 sharedir.patch
f634ac591576dff87487d239578420364edb56e977535c4a5ab799d360a799179edf1e7e6a4e6b6e5b4f58e267dbf913ed77bde140ad8425e6df4093bfa69e70 php8-fpm-version-suffix.patch
-1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
-0489bb55f6294e67d032a0b7db6f9d615cd65a10d356f10e370b49551a3b5b7fb81ae8274dcb60ec4edc96d4753921343ef23638711f226f8df91865ba07f4e3 tokenizer-stubs.patch"
+1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch"
diff --git a/testing/php8/tokenizer-stubs.patch b/testing/php8/tokenizer-stubs.patch
deleted file mode 100644
index 08cbdc83ed..0000000000
--- a/testing/php8/tokenizer-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/Makefile.global
-+++ b/build/Makefile.global
-@@ -147,7 +147,7 @@
- @if test -e "$(top_srcdir)/build/gen_stub.php"; then \
- if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
- echo Parse $< to generate $@;\
-- $(PHP_EXECUTABLE) $(top_srcdir)/build/gen_stub.php $<; \
-+ $(PHP_EXECUTABLE) -dextension=$(top_srcdir)/modules/tokenizer.so $(top_srcdir)/build/gen_stub.php $<; \
- elif type php >/dev/null 2>/dev/null; then \
- if test `php -v | head -n1 | cut -d" " -f 2 | sed "s/$$/\n7.0.99/" | sort -rV | head -n1` != "7.0.99"; then \
- echo Parse $< to generate $@;\