From 2261b4fe849bd16404d4bc257c000511382ec74f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 10 Dec 2015 11:39:10 +0100
Subject: [PATCH] 5.6.17RC1

---
 .gitignore                                    |  1 +
 ....6.3-libdb.patch => php-5.6.17-libdb.patch | 20 ++++++++++++-------
 php.spec                                      | 11 ++++++----
 sources                                       |  2 +-
 4 files changed, 22 insertions(+), 12 deletions(-)
 rename php-5.6.3-libdb.patch => php-5.6.17-libdb.patch (74%)

diff --git a/.gitignore b/.gitignore
index 97de241..2c20d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ php-5.5.*.xz
 /php-5.6.15-strip.tar.xz
 /php-5.6.16RC1-strip.tar.xz
 /php-5.6.16-strip.tar.xz
+/php-5.6.17RC1-strip.tar.xz
diff --git a/php-5.6.3-libdb.patch b/php-5.6.17-libdb.patch
similarity index 74%
rename from php-5.6.3-libdb.patch
rename to php-5.6.17-libdb.patch
index dc0e40b..a7bbd2e 100644
--- a/php-5.6.3-libdb.patch
+++ b/php-5.6.17-libdb.patch
@@ -1,6 +1,7 @@
---- php-5.4.7/ext/dba/config.m4.orig	2012-09-20 12:23:00.548322754 +0200
-+++ php-5.4.7/ext/dba/config.m4	2012-09-20 12:28:07.656380829 +0200
-@@ -312,57 +312,13 @@
+diff -up php-5.6.17RC1/ext/dba/config.m4.libdb php-5.6.17RC1/ext/dba/config.m4
+--- php-5.6.17RC1/ext/dba/config.m4.libdb	2015-12-10 10:42:34.643252975 +0100
++++ php-5.6.17RC1/ext/dba/config.m4	2015-12-10 10:44:27.924729361 +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
@@ -12,6 +13,10 @@
 -      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
@@ -55,13 +60,14 @@
        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)
  
---- php-5.4.7/ext/dba/dba.c.old	2012-09-19 14:55:23.868456900 +0200
-+++ php-5.4.7/ext/dba/dba.c	2012-09-19 15:02:42.796009320 +0200
+diff -up php-5.6.17RC1/ext/dba/dba.c.libdb php-5.6.17RC1/ext/dba/dba.c
+--- php-5.6.17RC1/ext/dba/dba.c.libdb	2015-12-10 01:36:02.000000000 +0100
++++ php-5.6.17RC1/ext/dba/dba.c	2015-12-10 10:42:34.644252979 +0100
 @@ -52,6 +52,10 @@
  #include "php_qdbm.h"
  #include "php_tcadb.h"
@@ -73,7 +79,7 @@
  /* {{{ arginfo */
  ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
  	ZEND_ARG_INFO(0, path)
-@@ -535,6 +539,10 @@
+@@ -535,6 +539,10 @@ PHP_MINFO_FUNCTION(dba)
  
  	php_info_print_table_start();
   	php_info_print_table_row(2, "DBA support", "enabled");
diff --git a/php.spec b/php.spec
index d4ece4c..9d70157 100644
--- a/php.spec
+++ b/php.spec
@@ -64,12 +64,12 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver  RC1
-%global rpmrel 2
+%global rcver  RC1
+%global rpmrel 1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.6.16
+Version: 5.6.17
 %if 0%{?rcver:1}
 Release: 0.%{rpmrel}.%{rcver}%{?dist}
 %else
@@ -106,7 +106,7 @@ Source51: opcache-default.blacklist
 Patch5: php-5.6.3-includedir.patch
 Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
-Patch8: php-5.6.3-libdb.patch
+Patch8: php-5.6.17-libdb.patch
 
 # Fixes for extension modules
 # https://bugs.php.net/63171 no odbc call during timeout
@@ -1484,6 +1484,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %changelog
+* Thu Dec 10 2015 Remi Collet <remi@fedoraproject.org> 5.6.17-0.1.RC1
+- update to 5.6.17RC1
+
 * Tue Dec  1 2015 Tom Callaway <spot@fedoraproject.org> 5.6.16-2
 - rebuild for libvpx 1.5.0
 
diff --git a/sources b/sources
index 2a30539..d7341bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fdf8abc1ec6c6c5b594fcd7cf3e98e3  php-5.6.16-strip.tar.xz
+e366397734fb382b269cd4466016e427  php-5.6.17RC1-strip.tar.xz