Author: arekm Date: Sat Aug 20 16:39:17 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.3.7 (curl limit looks merged; buff_ovf also)
---- Files affected:
packages/php:
mysqlnd-shared.patch (1.1 -> 1.2) , php-oracle-instantclient.patch (1.1 ->
1.2) , php-stupidapache_version.patch (1.4 -> 1.5) , php.spec (1.945 -> 1.946)
, suhosin.patch (1.9 -> 1.10) , php-buff_ovf.patch (1.1 -> NONE) (REMOVED),
php-curl-limit-speed.patch (1.3 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/php/mysqlnd-shared.patch
diff -u packages/php/mysqlnd-shared.patch:1.1
packages/php/mysqlnd-shared.patch:1.2
--- packages/php/mysqlnd-shared.patch:1.1 Wed Apr 14 09:19:15 2010
+++ packages/php/mysqlnd-shared.patch Sat Aug 20 18:39:10 2011
@@ -1,14 +1,14 @@
--- php-5.3.2/ext/mysqlnd/config9.m4~ 2009-12-22 21:30:09.000000000 +0200
+++ php-5.3.2/ext/mysqlnd/config9.m4 2010-04-14 01:33:20.435275382 +0300
-@@ -20,7 +20,7 @@
- mysqlnd_result.c mysqlnd_result_meta.c
mysqlnd_debug.c\
- mysqlnd_block_alloc.c php_mysqlnd.c"
+@@ -27,7 +27,7 @@
+ AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
+ mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, yes)
PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
PHP_INSTALL_HEADERS([ext/mysqlnd/])
-
+ fi
--- php-5.3.2/ext/mysqlnd/php_mysqlnd.c~ 2010-01-20 19:09:28.000000000
+0200
+++ php-5.3.2/ext/mysqlnd/php_mysqlnd.c 2010-04-14 09:18:30.725599897
+0300
@@ -273,6 +273,9 @@
================================================================
Index: packages/php/php-oracle-instantclient.patch
diff -u packages/php/php-oracle-instantclient.patch:1.1
packages/php/php-oracle-instantclient.patch:1.2
--- packages/php/php-oracle-instantclient.patch:1.1 Fri Sep 10 21:15:10 2010
+++ packages/php/php-oracle-instantclient.patch Sat Aug 20 18:39:10 2011
@@ -37,10 +37,10 @@
fi
done
if test -z "$PDO_OCI_VERSION"; then
-@@ -86,6 +86,9 @@
- elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
- PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/client/include)
- AC_MSG_RESULT($PDO_OCI_IC_PREFIX/client/include)
+@@ -103,6 +103,9 @@
+ elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
+ PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
+ AC_MSG_RESULT($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
+ elif test -f $PDO_OCI_IC_PREFIX/../include/oracle/client/oci.h ; then
+ PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/../include/oracle/client)
+ AC_MSG_RESULT($PDO_OCI_IC_PREFIX/../include/oracle/client)
================================================================
Index: packages/php/php-stupidapache_version.patch
diff -u packages/php/php-stupidapache_version.patch:1.4
packages/php/php-stupidapache_version.patch:1.5
--- packages/php/php-stupidapache_version.patch:1.4 Thu Nov 26 00:01:23 2009
+++ packages/php/php-stupidapache_version.patch Sat Aug 20 18:39:10 2011
@@ -4,11 +4,11 @@
dnl version for apache1/2.
dnl
AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
-- ac_output=`$1 -v 2>&1 | grep version`
+- ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
+ if test "$with_apache_version" != "no"; then
+ ac_output="foo bar baz $with_apache_version"
+ else
-+ ac_output=`$1 -v 2>&1 | grep version`
++ ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
+ fi
ac_IFS=$IFS
IFS="- /.
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.945 packages/php/php.spec:1.946
--- packages/php/php.spec:1.945 Sun Aug 7 19:42:45 2011
+++ packages/php/php.spec Sat Aug 20 18:39:10 2011
@@ -106,7 +106,7 @@
%undefine with_filter
%endif
-%define rel 11
+%define rel 1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -114,13 +114,13 @@
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов,
выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: php
-Version: 5.3.6
+Version: 5.3.7
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 2286f5a82a6e8397955a0025c1c2ad98
+# Source0-md5: 2d47d003c96de4e88863ff38da61af33
Source2: %{name}-mod_%{name}.conf
Source3: %{name}-cgi-fcgi.ini
Source4: %{name}-apache.ini
@@ -163,7 +163,6 @@
Patch27: %{name}-config-dir.patch
Patch29: %{name}-fcgi-graceful.patch
Patch31: %{name}-fcgi-error_log-no-newlines.patch
-Patch32: %{name}-curl-limit-speed.patch
Patch34: %{name}-libtool.patch
Patch35: %{name}-tds.patch
Patch36: %{name}-mysql-charsetphpini.patch
@@ -190,7 +189,7 @@
Patch61: %{name}-krb5-ac.patch
Patch62: mcrypt-libs.patch
Patch63: %{name}-mysql-nowarning.patch
-Patch64: %{name}-buff_ovf.patch
+Patch64: %{name}-m4.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1839,7 +1838,6 @@
%patch27 -p1
%patch29 -p1
%patch31 -p1
-%patch32 -p1
%if "%{pld_release}" != "ac"
%patch34 -p1
%endif
@@ -3178,6 +3176,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.946 2011/08/20 16:39:10 arekm
+- up to 5.3.7 (curl limit looks merged; buff_ovf also)
+
Revision 1.945 2011/08/07 17:42:45 glen
- --enable-spl/--disable-spl option does not exist in 5.3+
================================================================
Index: packages/php/suhosin.patch
diff -u packages/php/suhosin.patch:1.9 packages/php/suhosin.patch:1.10
--- packages/php/suhosin.patch:1.9 Thu Mar 24 20:44:30 2011
+++ packages/php/suhosin.patch Sat Aug 20 18:39:12 2011
@@ -5317,11 +5317,13 @@
while (p != NULL) {
q = p;
p = p->pListNext;
-@@ -610,6 +811,7 @@ static Bucket *zend_hash_apply_deleter(H
+--- x/Zend/zend_hash.c~ 2011-08-20 18:08:23.000000000 +0200
++++ x/Zend/zend_hash.c 2011-08-20 18:09:01.292927307 +0200
+@@ -808,6 +808,7 @@
ht->nNumOfElements--;
HANDLE_UNBLOCK_INTERRUPTIONS();
-+ zend_hash_check_destructor(ht->pDestructor);
++ zend_hash_check_destructor(ht->pDestructor);
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/mysqlnd-shared.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-oracle-instantclient.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-stupidapache_version.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.945&r2=1.946&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/suhosin.patch?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
