aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2020-07-11 00:20:45 +0300
committerAndy Postnikov <apostnikov@gmail.com>2020-07-11 01:18:27 +0300
commitbe42a5f90fb7c8034ee9e7485299d5fd5f6387af (patch)
tree94596a5ef645d7eb9cc340622e5c5f8dfd35c645
parent238a04d8d7d98db1f31e81131a1ea8919fff3614 (diff)
downloadaports-be42a5f90fb7c8034ee9e7485299d5fd5f6387af.tar.gz
aports-be42a5f90fb7c8034ee9e7485299d5fd5f6387af.tar.bz2
aports-be42a5f90fb7c8034ee9e7485299d5fd5f6387af.tar.xz
community/php7: upgrade to 7.4.8
-rw-r--r--community/php7/APKBUILD18
-rw-r--r--community/php7/fix-tests-icu.patch28
2 files changed, 8 insertions, 38 deletions
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD
index a570b73e1c..40b19f3e20 100644
--- a/community/php7/APKBUILD
+++ b/community/php7/APKBUILD
@@ -25,7 +25,7 @@
pkgname=php7
_pkgreal=php
-pkgver=7.4.7
+pkgver=7.4.8
pkgrel=0
_apiver=20190902
_suffix=${pkgname#php}
@@ -100,7 +100,6 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz
sharedir.patch
php7-fpm-version-suffix.patch
fix-tests-devserver.patch
- fix-tests-icu.patch
enchant-2.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -592,14 +591,14 @@ phar() {
cd "$pkgdir"
mkdir -p "$subpkgdir"/usr/bin
- mv usr/bin/phar.phar "$subpkgdir"/usr/bin/phar.phar$_suffix
-
- rm usr/bin/phar
- ln -s phar.phar$_suffix "$subpkgdir"/usr/bin/phar$_suffix
+ rm usr/bin/phar$_suffix
+ mv usr/bin/phar$_suffix.phar "$subpkgdir"/usr/bin/phar$_suffix.phar
+ ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar$_suffix
+ ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar.phar$_suffix
if [ "$_default_php" = yes ]; then
- ln -s phar.phar$_suffix "$subpkgdir"/usr/bin/phar.phar
- ln -s phar.phar$_suffix "$subpkgdir"/usr/bin/phar
+ ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar.phar
+ ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar
fi
}
@@ -678,7 +677,7 @@ _mv() {
mv "$@"
}
-sha512sums="5b3ba690e610e0511675f06a10afe9edbcfa90b5b16956d22aab225cdf140b55e5a8a551e7b189d30404981c94c6921b8c4aed00102546cfa38784a719704b80 php-7.4.7.tar.xz
+sha512sums="cfb23eac731a0eabed83908d7c056a123cd9a73ccc091d92b8601366da4cd95ded8623156eaa0458405f23d8bb9dc244d117bd99876f916ef582e3966dc78b44 php-7.4.8.tar.xz
1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd
cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate
274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf
@@ -688,5 +687,4 @@ ebf571c5e595221b9944d7e840807ebb68c1be38bf117186e19a3bd1070310ece5918bcaa5f94167
965b52893affb666af64e00d09e0208dcd41b17ce2864cf05616c6d05a05c0121694c0b209d403b8c0c55d18e6f1528c4aba1a4fcdce7b282a13304d12cd0f9d sharedir.patch
16399fbf6a966f9beffe00f659f9551ef8e52285bca116da5bd5b15ec99a2b0bd5fa03be0faa6c893802aa44c100d634083343a9ac0cd2467812865df66dd572 php7-fpm-version-suffix.patch
3bfeea79f9acfaa7be5bab85cd3d02713abb569e54024a22bb2c747c06d97f83ac2c63dcd75c7c409426ac03f8bc2ccc01bcd66bc39a767930d32542349123f9 fix-tests-devserver.patch
-337c431a58f8c0bc5519bb89febc7e00cb0b9da91239347aaedcfa5e77f483df41d3e089cc194fd65b7476d9c3068e1a78bb5b44a116c58bcf2b4bcc6f823427 fix-tests-icu.patch
7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch"
diff --git a/community/php7/fix-tests-icu.patch b/community/php7/fix-tests-icu.patch
deleted file mode 100644
index c2159b8923..0000000000
--- a/community/php7/fix-tests-icu.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git b/ext/intl/tests/locale_filter_matches3.phpt a/ext/intl/tests/locale_filter_matches3.phpt
-index 2816ba5e12..8c39d189eb 100644
---- b/ext/intl/tests/locale_filter_matches3.phpt
-+++ a/ext/intl/tests/locale_filter_matches3.phpt
-@@ -1,8 +1,8 @@
- --TEST--
--locale_filter_matches.phpt() ICU >= 51.2
-+locale_filter_matches.phpt() ICU >= 51.2 && ICU < 67.1
- --SKIPIF--
- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
--<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '67.1') >= 0) die('skip for ICU < 67.1'); ?>
- --FILE--
- <?php
-
-diff --git b/ext/intl/tests/locale_lookup_variant2.phpt a/ext/intl/tests/locale_lookup_variant2.phpt
-index 75a5350abf..af104e1ba8 100644
---- b/ext/intl/tests/locale_lookup_variant2.phpt
-+++ a/ext/intl/tests/locale_lookup_variant2.phpt
-@@ -2,7 +2,7 @@
- locale_lookup.phpt()
- --SKIPIF--
- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
--<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '67.1') >= 0) die('skip for ICU < 67.1'); ?>
- --FILE--
- <?php
-