diff options
| -rw-r--r-- | php-7.0.2-libdb.patch (renamed from php-7.0.0-libdb.patch) | 22 | ||||
| -rw-r--r-- | php70.spec | 9 |
2 files changed, 18 insertions, 13 deletions
diff --git a/php-7.0.0-libdb.patch b/php-7.0.2-libdb.patch index 4578cf9..f9bff95 100644 --- a/php-7.0.0-libdb.patch +++ b/php-7.0.2-libdb.patch @@ -1,7 +1,7 @@ -diff -up php-7.0.0beta1/ext/dba/config.m4.libdb php-7.0.0beta1/ext/dba/config.m4 ---- php-7.0.0beta1/ext/dba/config.m4.libdb 2015-07-08 02:24:59.252022638 +0200 -+++ php-7.0.0beta1/ext/dba/config.m4 2015-07-08 07:00:16.834403233 +0200 -@@ -312,57 +312,13 @@ if test "$PHP_DB4" != "no"; then +diff -up php-7.0.2RC1/ext/dba/config.m4.libdb php-7.0.2RC1/ext/dba/config.m4 +--- php-7.0.2RC1/ext/dba/config.m4.libdb 2015-12-27 07:54:48.669923462 +0100 ++++ php-7.0.2RC1/ext/dba/config.m4 2015-12-27 07:55:03.607947034 +0100 +@@ -312,61 +312,13 @@ if test "$PHP_DB4" != "no"; then dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do @@ -13,6 +13,10 @@ diff -up php-7.0.0beta1/ext/dba/config.m4.libdb php-7.0.0beta1/ext/dba/config.m4 - THIS_PREFIX=$i - THIS_INCLUDE=$i/db4/db.h - break +- elif test -f "$i/include/db5.3/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db5.3/db.h +- break - elif test -f "$i/include/db5.1/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db5.1/db.h @@ -56,14 +60,14 @@ diff -up php-7.0.0beta1/ext/dba/config.m4.libdb php-7.0.0beta1/ext/dba/config.m4 break fi done -- PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) +- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) -diff -up php-7.0.0beta1/ext/dba/dba.c.libdb php-7.0.0beta1/ext/dba/dba.c ---- php-7.0.0beta1/ext/dba/dba.c.libdb 2015-07-08 02:24:59.119020904 +0200 -+++ php-7.0.0beta1/ext/dba/dba.c 2015-07-08 07:01:43.158767655 +0200 +diff -up php-7.0.2RC1/ext/dba/dba.c.libdb php-7.0.2RC1/ext/dba/dba.c +--- php-7.0.2RC1/ext/dba/dba.c.libdb 2015-12-22 16:19:29.000000000 +0100 ++++ php-7.0.2RC1/ext/dba/dba.c 2015-12-27 07:52:30.381638216 +0100 @@ -52,6 +52,10 @@ #include "php_qdbm.h" #include "php_tcadb.h" @@ -75,7 +79,7 @@ diff -up php-7.0.0beta1/ext/dba/dba.c.libdb php-7.0.0beta1/ext/dba/dba.c /* {{{ arginfo */ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) ZEND_ARG_INFO(0, path) -@@ -545,6 +549,10 @@ PHP_MINFO_FUNCTION(dba) +@@ -552,6 +556,10 @@ PHP_MINFO_FUNCTION(dba) php_info_print_table_start(); php_info_print_table_row(2, "DBA support", "enabled"); @@ -120,12 +120,12 @@ %global db_devel libdb-devel %endif -#global rcver RC1 +%global rcver RC1 %global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 7.0.1 +Version: 7.0.2 Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -158,7 +158,7 @@ Source99: php-fpm.init Patch5: php-7.0.0-includedir.patch Patch6: php-5.6.3-embed.patch Patch7: php-5.3.0-recode.patch -Patch8: php-7.0.0-libdb.patch +Patch8: php-7.0.2-libdb.patch Patch9: php-5.5.30-curl.patch # Fixes for extension modules @@ -1983,7 +1983,8 @@ fi %changelog -* Thu Dec 17 2015 Remi Collet <remi@fedoraproject.org> 7.0.1-1.1 +* Sun Dec 27 2015 Remi Collet <remi@fedoraproject.org> 7.0.2-0.1.0RC1 +- Update to 7.0.2RC1 - opcache: build with --disable-huge-code-pages on EL-6 * Wed Dec 16 2015 Remi Collet <remi@fedoraproject.org> 7.0.1-1 |