update to 7.2.4RC1
This commit is contained in:
Remi Collet
parent
81536250e3
commit
612dd4b638
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ php-7.1.*.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
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up php-7.2.3RC1/configure.ac.fixheader php-7.2.3RC1/configure.ac
|
||||
--- php-7.2.3RC1/configure.ac.fixheader 2018-02-14 06:09:37.792429866 +0100
|
||||
+++ php-7.2.3RC1/configure.ac 2018-02-14 06:10:33.755701362 +0100
|
||||
@@ -1272,7 +1272,7 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PR
|
||||
PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d`
|
||||
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
|
||||
|
||||
-PHP_UNAME=`uname -a | xargs`
|
||||
+PHP_UNAME=`uname | xargs`
|
||||
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
|
||||
PHP_OS=`uname | xargs`
|
||||
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
|
||||
@ -1,19 +1,19 @@
|
||||
diff -up php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen php-7.1.3RC1/sapi/litespeed/lsapilib.c
|
||||
--- php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen 2017-02-28 10:12:34.000000000 +0100
|
||||
+++ php-7.1.3RC1/sapi/litespeed/lsapilib.c 2017-02-28 10:23:11.384521740 +0100
|
||||
@@ -616,7 +616,7 @@ static int (*fp_lve_leave)(struct liblve
|
||||
diff -up php-7.2.4RC1/sapi/litespeed/lsapilib.c.dlopen php-7.2.4RC1/sapi/litespeed/lsapilib.c
|
||||
--- php-7.2.4RC1/sapi/litespeed/lsapilib.c.dlopen 2018-03-13 12:40:25.330885880 +0100
|
||||
+++ php-7.2.4RC1/sapi/litespeed/lsapilib.c 2018-03-13 12:41:35.797251042 +0100
|
||||
@@ -755,7 +755,7 @@ static int (*fp_lve_leave)(struct liblve
|
||||
static int (*fp_lve_jail)( struct passwd *, char *) = NULL;
|
||||
static int lsapi_load_lve_lib()
|
||||
static int lsapi_load_lve_lib(void)
|
||||
{
|
||||
- s_liblve = dlopen("liblve.so.0", RTLD_LAZY);
|
||||
+ s_liblve = dlopen("liblve.so.0", RTLD_NOW);
|
||||
if (s_liblve)
|
||||
{
|
||||
fp_lve_is_available = dlsym(s_liblve, "lve_is_available");
|
||||
diff -up php-7.1.3RC1/Zend/zend_portability.h.dlopen php-7.1.3RC1/Zend/zend_portability.h
|
||||
--- php-7.1.3RC1/Zend/zend_portability.h.dlopen 2017-02-28 10:23:11.384521740 +0100
|
||||
+++ php-7.1.3RC1/Zend/zend_portability.h 2017-02-28 10:26:08.960308560 +0100
|
||||
@@ -146,11 +146,11 @@
|
||||
diff -up php-7.2.4RC1/Zend/zend_portability.h.dlopen php-7.2.4RC1/Zend/zend_portability.h
|
||||
--- php-7.2.4RC1/Zend/zend_portability.h.dlopen 2018-03-13 12:33:38.000000000 +0100
|
||||
+++ php-7.2.4RC1/Zend/zend_portability.h 2018-03-13 12:40:25.330885880 +0100
|
||||
@@ -144,11 +144,11 @@
|
||||
# endif
|
||||
|
||||
# if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
|
||||
12
php-7.2.4-fixheader.patch
Normal file
12
php-7.2.4-fixheader.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac
|
||||
--- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100
|
||||
+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100
|
||||
@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d`
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
|
||||
|
||||
-PHP_UNAME=`uname -a | xargs`
|
||||
+PHP_UNAME=`uname | xargs`
|
||||
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
|
||||
PHP_OS=`uname | xargs`
|
||||
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
|
||||
13
php.spec
13
php.spec
@ -59,8 +59,8 @@
|
||||
%global with_argon2 0
|
||||
%endif
|
||||
|
||||
%global upver 7.2.3
|
||||
#global rcver RC1
|
||||
%global upver 7.2.4
|
||||
%global rcver RC1
|
||||
|
||||
Summary: PHP scripting language for creating dynamic web sites
|
||||
Name: php
|
||||
@ -99,14 +99,14 @@ Patch7: php-5.3.0-recode.patch
|
||||
Patch8: php-7.2.0-libdb.patch
|
||||
|
||||
# Functional changes
|
||||
Patch40: php-7.1.3-dlopen.patch
|
||||
Patch40: php-7.2.4-dlopen.patch
|
||||
Patch42: php-7.2.3-systzdata-v16.patch
|
||||
# See http://bugs.php.net/53436
|
||||
Patch43: php-5.4.0-phpize.patch
|
||||
# Use -lldap_r for OpenLDAP
|
||||
Patch45: php-7.2.3-ldap_r.patch
|
||||
# Make php_config.h constant across builds
|
||||
Patch46: php-7.2.3-fixheader.patch
|
||||
Patch46: php-7.2.4-fixheader.patch
|
||||
# drop "Configure command" from phpinfo output
|
||||
Patch47: php-5.6.3-phpinfo.patch
|
||||
|
||||
@ -683,7 +683,7 @@ License: PHP
|
||||
BuildRequires: pkgconfig(libsodium) >= 1.0.9
|
||||
|
||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: php-pecl-libsodium2 < 7
|
||||
Obsoletes: php-pecl-libsodium2 < 3
|
||||
Provides: php-pecl(libsodium) = %{version}
|
||||
Provides: php-pecl(libsodium)%{?_isa} = %{version}
|
||||
|
||||
@ -1559,6 +1559,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 13 2018 Remi Collet <remi@remirepo.net> - 7.2.4~RC1-1
|
||||
- update to 7.2.4RC1
|
||||
|
||||
* Wed Feb 28 2018 Remi Collet <remi@remirepo.net> - 7.2.3-1
|
||||
- Update to 7.2.3 - http://www.php.net/releases/7_2_3.php
|
||||
- FPM: revert pid file removal
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (php-7.2.3.tar.xz) = 843d4ae46182eaec58beb583a321c55a6baddb0dbf1b77d7cf31953d816fc74813937576a87d0a18d388d256c5ec3f1c80065ec636e2f70d362384112b8c6c72
|
||||
SHA512 (php-7.2.4RC1.tar.xz) = e9005947fc016162fed8d077c26076c9c823ed02957f21ac5a749749577c361a72e0f998b810a8b4529e157c6d210f1cf550dd99d316505dcb59f74483fc4be5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user