Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
845a25f535 | ||
|
05e47d95e0 | ||
|
b1190fad2a | ||
|
1282153fcd | ||
|
c052a4be10 | ||
|
3f19b4040a | ||
|
f9f74911b3 | ||
|
7f6434c752 | ||
|
da6b538f5c | ||
|
12dede90a4 | ||
|
9ee90b3f27 | ||
|
51a28a3433 | ||
|
f8c7161728 | ||
|
212188c256 | ||
|
2a1aff30e5 | ||
|
7c699259c9 | ||
|
2defb09321 | ||
|
900b1f1b7d | ||
|
056f0641c9 | ||
|
a942ae55ae | ||
|
cc9933263e | ||
|
e695597501 |
31
.gitignore
vendored
31
.gitignore
vendored
@ -1,27 +1,14 @@
|
|||||||
clog
|
clog
|
||||||
|
TODO
|
||||||
*.md
|
*.md
|
||||||
php-5.6.*.xz
|
php-5.6.*.xz
|
||||||
php-7.0.*.xz
|
php-7.0.*.xz
|
||||||
php-7.1.*.xz
|
php-7.1.*.xz
|
||||||
/php-7.2.0RC3.tar.xz
|
php-7.3.*.xz
|
||||||
/php-7.2.0RC4.tar.xz
|
php-7.3.*.xz.asc
|
||||||
/php-7.2.0RC5.tar.xz
|
php-7.4.*.xz
|
||||||
/php-7.2.0RC6.tar.xz
|
php-7.4.*.xz.asc
|
||||||
/php-7.2.0.tar.xz
|
/php-7.2.21.tar.xz
|
||||||
/php-7.2.1RC1.tar.xz
|
/php-7.2.22.tar.xz
|
||||||
/php-7.2.1.tar.xz
|
/php-7.2.23.tar.xz
|
||||||
/php-7.2.2RC1.tar.xz
|
/php-7.2.24.tar.xz
|
||||||
/php-7.2.2.tar.xz
|
|
||||||
/php-7.2.3RC1.tar.xz
|
|
||||||
/php-7.2.3.tar.xz
|
|
||||||
/php-7.2.4RC1.tar.xz
|
|
||||||
/php-7.2.4.tar.xz
|
|
||||||
/php-7.2.5RC1.tar.xz
|
|
||||||
/php-7.2.5.tar.xz
|
|
||||||
/php-7.2.6RC1.tar.xz
|
|
||||||
/php-7.2.6.tar.xz
|
|
||||||
/php-7.2.7RC1.tar.xz
|
|
||||||
/php-7.2.7.tar.xz
|
|
||||||
/php-7.2.8RC1.tar.xz
|
|
||||||
/php-7.2.8.tar.xz
|
|
||||||
/php-7.2.9.tar.xz
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
--- php-5.4.0RC5/scripts/phpize.in.orig 2012-01-18 17:13:54.018022983 +0100
|
diff -up php-7.2.12RC1/scripts/phpize.in.headers php-7.2.12RC1/scripts/phpize.in
|
||||||
+++ php-5.4.0RC5/scripts/phpize.in 2012-01-18 17:14:40.614024941 +0100
|
--- php-7.2.12RC1/scripts/phpize.in.headers 2018-10-23 11:47:43.000000000 +0200
|
||||||
@@ -162,6 +162,15 @@
|
+++ php-7.2.12RC1/scripts/phpize.in 2018-10-23 11:49:51.651818777 +0200
|
||||||
|
@@ -162,6 +162,15 @@ phpize_autotools()
|
||||||
$PHP_AUTOHEADER || exit 1
|
$PHP_AUTOHEADER || exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -16,7 +17,7 @@
|
|||||||
# Main script
|
# Main script
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@@ -180,12 +189,15 @@
|
@@ -180,12 +189,15 @@ case "$1" in
|
||||||
|
|
||||||
# Version
|
# Version
|
||||||
--version|-v)
|
--version|-v)
|
@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather
|
|||||||
than embedding a copy. Discussed upstream but was not desired.
|
than embedding a copy. Discussed upstream but was not desired.
|
||||||
|
|
||||||
History:
|
History:
|
||||||
|
r17: adapt for autotool change in 7.2.16RC1
|
||||||
r16: adapt for timelib 2017.06 (in 7.2.3RC1)
|
r16: adapt for timelib 2017.06 (in 7.2.3RC1)
|
||||||
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
|
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
|
||||||
r14: improve check for valid tz file
|
r14: improve check for valid tz file
|
||||||
@ -27,9 +28,32 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
|
|||||||
r2: add filesystem trawl to set up name alias index
|
r2: add filesystem trawl to set up name alias index
|
||||||
r1: initial revision
|
r1: initial revision
|
||||||
|
|
||||||
diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/lib/parse_tz.c
|
diff -up php-7.2.16RC1/ext/date/config0.m4.systzdata php-7.2.16RC1/ext/date/config0.m4
|
||||||
--- php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata 2018-02-13 20:18:34.000000000 +0100
|
--- php-7.2.16RC1/ext/date/config0.m4.systzdata 2019-02-19 11:22:22.223741585 +0100
|
||||||
+++ php-7.2.3RC1/ext/date/lib/parse_tz.c 2018-02-14 06:14:23.484804852 +0100
|
+++ php-7.2.16RC1/ext/date/config0.m4 2019-02-19 11:23:05.089111556 +0100
|
||||||
|
@@ -10,6 +10,19 @@ io.h
|
||||||
|
dnl Check for strtoll, atoll
|
||||||
|
AC_CHECK_FUNCS(strtoll atoll)
|
||||||
|
|
||||||
|
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
|
||||||
|
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
|
||||||
|
+no, no)
|
||||||
|
+
|
||||||
|
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
|
||||||
|
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
|
||||||
|
+
|
||||||
|
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
|
||||||
|
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
|
||||||
|
+ [Define for location of system timezone data])
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
|
||||||
|
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
|
||||||
|
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
|
||||||
|
diff -up php-7.2.16RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.16RC1/ext/date/lib/parse_tz.c
|
||||||
|
--- php-7.2.16RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 11:13:22.000000000 +0100
|
||||||
|
+++ php-7.2.16RC1/ext/date/lib/parse_tz.c 2019-02-19 11:19:40.245313535 +0100
|
||||||
@@ -25,8 +25,21 @@
|
@@ -25,8 +25,21 @@
|
||||||
#include "timelib.h"
|
#include "timelib.h"
|
||||||
#include "timelib_private.h"
|
#include "timelib_private.h"
|
||||||
@ -632,23 +656,3 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li
|
|||||||
} else {
|
} else {
|
||||||
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
|
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
|
||||||
tmp = NULL;
|
tmp = NULL;
|
||||||
diff -up php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata php-7.2.3RC1/ext/date/lib/timelib.m4
|
|
||||||
--- php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata 2018-02-13 20:18:34.000000000 +0100
|
|
||||||
+++ php-7.2.3RC1/ext/date/lib/timelib.m4 2018-02-14 06:11:54.273089963 +0100
|
|
||||||
@@ -81,3 +81,16 @@ io.h
|
|
||||||
|
|
||||||
dnl Check for strtoll, atoll
|
|
||||||
AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday)
|
|
||||||
+
|
|
||||||
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
|
|
||||||
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
|
|
||||||
+no, no)
|
|
||||||
+
|
|
||||||
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
|
|
||||||
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
|
|
||||||
+
|
|
||||||
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
|
|
||||||
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
|
|
||||||
+ [Define for location of system timezone data])
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
71
php.spec
71
php.spec
@ -58,12 +58,11 @@
|
|||||||
%global with_lmdb 0
|
%global with_lmdb 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global upver 7.2.9
|
%global upver 7.2.24
|
||||||
#global rcver RC1
|
|
||||||
|
|
||||||
Summary: PHP scripting language for creating dynamic web sites
|
Summary: PHP scripting language for creating dynamic web sites
|
||||||
Name: php
|
Name: php
|
||||||
Version: %{upver}%{?rcver:~%{rcver}}
|
Version: %{upver}
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
# All files licensed under PHP version 3.01, except
|
# All files licensed under PHP version 3.01, except
|
||||||
# Zend is licensed under Zend
|
# Zend is licensed under Zend
|
||||||
@ -100,9 +99,9 @@ Patch8: php-7.2.0-libdb.patch
|
|||||||
|
|
||||||
# Functional changes
|
# Functional changes
|
||||||
Patch40: php-7.2.4-dlopen.patch
|
Patch40: php-7.2.4-dlopen.patch
|
||||||
Patch42: php-7.2.3-systzdata-v16.patch
|
Patch42: php-7.2.16-systzdata-v17.patch
|
||||||
# See http://bugs.php.net/53436
|
# See http://bugs.php.net/53436
|
||||||
Patch43: php-5.4.0-phpize.patch
|
Patch43: php-7.2.12-phpize.patch
|
||||||
# Use -lldap_r for OpenLDAP
|
# Use -lldap_r for OpenLDAP
|
||||||
Patch45: php-7.2.3-ldap_r.patch
|
Patch45: php-7.2.3-ldap_r.patch
|
||||||
# Make php_config.h constant across builds
|
# Make php_config.h constant across builds
|
||||||
@ -1556,6 +1555,68 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 22 2019 Remi Collet <remi@remirepo.net> - 7.2.24-1
|
||||||
|
- Update to 7.2.24 - http://www.php.net/releases/7_2_23.php
|
||||||
|
|
||||||
|
* Wed Sep 25 2019 Remi Collet <remi@remirepo.net> - 7.2.23-1
|
||||||
|
- Update to 7.2.23 - http://www.php.net/releases/7_2_23.php
|
||||||
|
|
||||||
|
* Wed Aug 28 2019 Remi Collet <remi@remirepo.net> - 7.2.22-1
|
||||||
|
- Update to 7.2.22 - http://www.php.net/releases/7_2_22.php
|
||||||
|
|
||||||
|
* Tue Jul 30 2019 Remi Collet <remi@remirepo.net> - 7.2.21-1
|
||||||
|
- Update to 7.2.21 - http://www.php.net/releases/7_2_21.php
|
||||||
|
|
||||||
|
* Tue Jul 2 2019 Remi Collet <remi@remirepo.net> - 7.2.20-1
|
||||||
|
- Update to 7.2.20 - http://www.php.net/releases/7_2_20.php
|
||||||
|
|
||||||
|
* Wed May 29 2019 Remi Collet <remi@remirepo.net> - 7.2.19-2
|
||||||
|
- Update to 7.2.19 - http://www.php.net/releases/7_2_19.php
|
||||||
|
|
||||||
|
* Tue Apr 30 2019 Remi Collet <remi@remirepo.net> - 7.2.18-1
|
||||||
|
- Update to 7.2.18 - http://www.php.net/releases/7_2_18.php
|
||||||
|
|
||||||
|
* Wed Apr 3 2019 Remi Collet <remi@remirepo.net> - 7.2.17-1
|
||||||
|
- Update to 7.2.17 - http://www.php.net/releases/7_2_17.php
|
||||||
|
|
||||||
|
* Wed Mar 6 2019 Remi Collet <remi@remirepo.net> - 7.2.16-1
|
||||||
|
- Update to 7.2.16 - http://www.php.net/releases/7_2_16.php
|
||||||
|
- add upstream patch for OpenSSL 1.1.1b
|
||||||
|
- adapt systzdata patch (v17)
|
||||||
|
|
||||||
|
* Wed Feb 6 2019 Remi Collet <remi@remirepo.net> - 7.2.15-1
|
||||||
|
- Update to 7.2.15 - http://www.php.net/releases/7_2_15.php
|
||||||
|
|
||||||
|
* Tue Jan 8 2019 Remi Collet <remi@remirepo.net> - 7.2.14-1
|
||||||
|
- Update to 7.2.14 - http://www.php.net/releases/7_2_14.php
|
||||||
|
|
||||||
|
* Tue Dec 18 2018 Remi Collet <remi@remirepo.net> - 7.2.14~RC1-1
|
||||||
|
- update to 7.2.14RC1
|
||||||
|
|
||||||
|
* Sat Dec 8 2018 Remi Collet <remi@remirepo.net> - 7.2.13-2
|
||||||
|
- Fix null pointer dereference in imap_mail CVE-2018-19935
|
||||||
|
|
||||||
|
* Wed Dec 5 2018 Remi Collet <remi@remirepo.net> - 7.2.13-1
|
||||||
|
- Update to 7.2.13 - http://www.php.net/releases/7_2_13.php
|
||||||
|
|
||||||
|
* Wed Nov 21 2018 Remi Collet <remi@remirepo.net> - 7.2.13-0.1.RC1
|
||||||
|
- update to 7.2.13RC1
|
||||||
|
|
||||||
|
* Tue Nov 6 2018 Remi Collet <remi@remirepo.net> - 7.2.12-1
|
||||||
|
- Update to 7.2.12 - http://www.php.net/releases/7_2_12.php
|
||||||
|
|
||||||
|
* Fri Nov 2 2018 Remi Collet <remi@remirepo.net> - 7.2.12-0.1.RC1
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Tue Oct 23 2018 Remi Collet <remi@remirepo.net> - 7.2.12~RC1-1
|
||||||
|
- update to 7.2.12RC1
|
||||||
|
|
||||||
|
* Wed Oct 10 2018 Remi Collet <remi@remirepo.net> - 7.2.11-1
|
||||||
|
- Update to 7.2.11 - http://www.php.net/releases/7_2_11.php
|
||||||
|
|
||||||
|
* Tue Sep 11 2018 Remi Collet <remi@remirepo.net> - 7.2.10-1
|
||||||
|
- Update to 7.2.10 - http://www.php.net/releases/7_2_10.php
|
||||||
|
|
||||||
* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 7.2.9-1
|
* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 7.2.9-1
|
||||||
- Update to 7.2.9 - http://www.php.net/releases/7_2_9.php
|
- Update to 7.2.9 - http://www.php.net/releases/7_2_9.php
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (php-7.2.9.tar.xz) = b898e78fcb4aeeb441395dcabe2e7686425487e32dffbf0e99393aedb917da87a744b23f0be557c45e447433c8058df6e53c34869fc2dcf874cc1af97ff8331f
|
SHA512 (php-7.2.24.tar.xz) = 39597b8328cb4d5284288bdce8dd9c7ef8446e46914de93203700efaf67f85ad5b69df777bea14eef9160b233fb79bcb60f6750c0df011bbf610b62a524689e3
|
||||||
|
Loading…
Reference in New Issue
Block a user