From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 13 Jan 2016 10:29:31 +0000 (+0000)
Subject: - updated to 5.6.17
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f8210a159dfc30a419fbf8ee21cdbf4b7a2afba7;p=packages%2Fphp.git

- updated to 5.6.17
---

diff --git a/php-db.patch b/php-db.patch
index 07032ec..fc0e464 100644
--- a/php-db.patch
+++ b/php-db.patch
@@ -1,8 +1,8 @@
---- php-5.3.16/ext/dba/config.m4.orig	2012-09-06 11:15:09.743002303 +0200
-+++ php-5.3.16/ext/dba/config.m4	2012-09-06 11:28:12.192974701 +0200
-@@ -287,6 +287,14 @@
+--- php-5.3.17/ext/dba/config.m4.orig	2016-01-13 10:20:20.966367491 +0000
++++ php-5.3.17/ext/dba/config.m4	2016-01-13 10:23:13.085367491 +0000
+@@ -326,6 +326,14 @@
        THIS_PREFIX=$i
-       THIS_INCLUDE=$i/db4/db.h
+       THIS_INCLUDE=$i/include/db5.3/db.h
        break
 +    elif test -f "$i/include/db5.3/db.h"; then
 +      THIS_PREFIX=$i
@@ -15,11 +15,11 @@
      elif test -f "$i/include/db5.1/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -329,7 +337,7 @@
+@@ -368,7 +376,7 @@
        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-5.3 db-5.2 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)])
  fi
  PHP_DBA_STD_RESULT(db4,Berkeley DB4)
diff --git a/php.spec b/php.spec
index 6bea7b6..9479ee1 100644
--- a/php.spec
+++ b/php.spec
@@ -144,13 +144,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.6.16
+Version:	5.6.17
 Release:	%{rel}%{?with_type_hints:.th}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	3f1d999ed1f9cb5713c9a0161c557f2f
+# Source0-md5:	5e080e4b7df5db24f1b64313f8114bd8
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini