- up to 5.3.7 (curl limit looks merged; buff_ovf also)

Changed files:
    mysqlnd-shared.patch -> 1.2
    php-buff_ovf.patch -> 1.2
    php-curl-limit-speed.patch -> 1.4
    php-oracle-instantclient.patch -> 1.2
    php-stupidapache_version.patch -> 1.5
    php.spec -> 1.946
    suhosin.patch -> 1.10

diff --git a/mysqlnd-shared.patch b/mysqlnd-shared.patch
index fa1d125748b632d988bc75a6f85ed221c2a97e43..581f21141aac822c98dd7b68b055abfb2678a895 100644 (file)
--- a/mysqlnd-shared.patch
+++ b/mysqlnd-shared.patch
@@ -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 @@

diff --git a/php-buff_ovf.patch b/php-buff_ovf.patch
deleted file mode 100644 (file)
index 0b9c006..0000000
--- a/php-buff_ovf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur php-5.3.6-orig//ext/sockets/sockets.c php-5.3.6//ext/sockets/sockets.c
---- php-5.3.6-orig//ext/sockets/sockets.c      2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.6//ext/sockets/sockets.c   2011-05-24 07:09:54.592779164 +0200
-@@ -1333,6 +1333,11 @@
-                       break;
- 
-               case AF_UNIX:
-+                      if (addr_len >= sizeof(s_un.sun_path)) {
-+                                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long", php_sock->type);
-+                                      RETURN_FALSE;
-+                              }
-+
-                       memset(&s_un, 0, sizeof(struct sockaddr_un));
- 
-                       s_un.sun_family = AF_UNIX;
-Tylko w php-5.3.6//ext/sockets: sockets.c~

diff --git a/php-curl-limit-speed.patch b/php-curl-limit-speed.patch
deleted file mode 100644 (file)
index 8348dd4..0000000
--- a/php-curl-limit-speed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- php-5.2.5.orig/ext/curl/interface.c        2008-03-26 17:05:19.000000000 +0100
-+++ php-5.2.5/ext/curl/interface.c     2008-03-26 17:09:05.000000000 +0100
-@@ -462,6 +462,14 @@
-       REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
- #endif
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
-+
-+/* Added constants to support limiting the transfer speed in PHP */
-+/* Fixed by Tijnema (admin@tijnema.info) */
-+#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
-+      REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
-+      REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
-+#endif
-+
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
-@@ -1288,6 +1296,12 @@
- #if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since curl 7.11.2 */
-               case CURLOPT_TCP_NODELAY:
- #endif
-+/* Added case options to support limiting the transfer speed in PHP */
-+/* Fixed by Tijnema (admin@tijnema.info) */
-+#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
-+              case CURLOPT_MAX_SEND_SPEED_LARGE:
-+              case CURLOPT_MAX_RECV_SPEED_LARGE:
-+#endif
-                       convert_to_long_ex(zvalue);
-                       error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
-                       break;

diff --git a/php-oracle-instantclient.patch b/php-oracle-instantclient.patch
index 120c75ae3e41abe405a23e1e60bd5b377d766ea6..3322dc2736cc5b76d2561064d3dae76c44be4c04 100644 (file)
--- a/php-oracle-instantclient.patch
+++ b/php-oracle-instantclient.patch
@@ -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)

diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
index d27411707fc4e45623b5cc0700b989226d8af2e0..f2478a4400a1fe5250a7ae43da5f51f3b3439f23 100644 (file)
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -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="- /.

diff --git a/php.spec b/php.spec
index 2bbe49a29419fb6bb1eedc411b39c30e58a21716..1f79c2f042447dbb0cb77ec26424aeb381316639 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -105,7 +105,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %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
@@ -113,13 +113,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:          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
@@ -162,7 +162,6 @@ Patch26:    %{name}-pear.patch
 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
@@ -189,7 +188,7 @@ Patch60:    %{name}-oracle-instantclient.patch
 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}
@@ -1838,7 +1837,6 @@ cp php.ini-production php.ini
 %patch27 -p1
 %patch29 -p1
 %patch31 -p1
-%patch32 -p1
 %if "%{pld_release}" != "ac"
 %patch34 -p1
 %endif

diff --git a/suhosin.patch b/suhosin.patch
index 6e73e8e5f917f4b60ec757e57b7bb15a6a4b0f65..1da194c0c09e61e4c3a4d79cdd69ae185711f6c4 100644 (file)
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -5317,11 +5317,13 @@ diff -Naurp php-5.3.6RC1/Zend/zend_hash.c php-5.3.6RC1.oden/Zend/zend_hash.c
        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);
        }