[packages/php/PHP_5_6] up to 5.6.17

glen glen at pld-linux.org
Sun Jan 10 23:22:16 CET 2016


commit 4e5e4cd2d946e70e4d0bdfe2e12c28c454f41398
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 11 00:07:16 2016 +0200

    up to 5.6.17

 php-db.patch | 8 ++++----
 php.spec     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2cb2b83..cbfb435 100644
--- a/php.spec
+++ b/php.spec
@@ -153,7 +153,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	2
+%define		rel	1
 %define		orgname	php
 %define		ver_suffix 56
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -164,7 +164,7 @@ 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}
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -173,7 +173,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 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
diff --git a/php-db.patch b/php-db.patch
index 07032ec..7b3a8df 100644
--- a/php-db.patch
+++ b/php-db.patch
@@ -1,5 +1,5 @@
---- 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
+--- php-5.6.17/ext/dba/config.m4~	2016-01-11 00:04:19.000000000 +0200
++++ php-5.6.17/ext/dba/config.m4	2016-01-11 00:05:56.899471849 +0200
 @@ -287,6 +287,14 @@
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/db4/db.h
@@ -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 @@
+@@ -376,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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/9d9bb2e84360aa88f8926cfcb6a94ed66302219f



More information about the pld-cvs-commit mailing list