From f31b57cb0b5a71df4015d8c49fd85b12e13c845c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 27 Sep 2013 00:10:07 +0300 Subject: [PATCH] up to 5.4.20 --- php-bug-60598.patch | 16 ---------------- php-ini.patch | 20 ++++++-------------- php-nohttpd.patch | 9 ++++----- php.spec | 6 ++---- 4 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 php-bug-60598.patch diff --git a/php-bug-60598.patch b/php-bug-60598.patch deleted file mode 100644 index 613889f..0000000 --- a/php-bug-60598.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c -index 1fe5d0c..b5dd48f 100644 ---- a/Zend/zend_objects_API.c -+++ b/Zend/zend_objects_API.c -@@ -57,6 +57,11 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS - obj->dtor(obj->object, i TSRMLS_CC); - obj = &objects->object_buckets[i].bucket.obj; - obj->refcount--; -+ -+ if (obj->refcount == 0) { -+ /* in case gc_collect_cycle is triggered before free_storage */ -+ GC_REMOVE_ZOBJ_FROM_BUFFER(obj); -+ } - } - } - } diff --git a/php-ini.patch b/php-ini.patch index c651cf6..59efe4c 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,5 +1,5 @@ ---- php-5.4.5/php.ini~ 2012-07-20 12:22:18.000000000 +0300 -+++ php-5.4.5/php.ini 2012-07-20 12:32:16.646206310 +0300 +--- php-5.4.20/php.ini~ 2013-09-27 00:10:56.000000000 +0300 ++++ php-5.4.20/php.ini 2013-09-27 00:12:08.255696371 +0300 @@ -82,6 +82,20 @@ ; much more verbose when it comes to errors. We recommending using the ; development version only in development environments as errors shown to @@ -102,16 +102,10 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; -@@ -859,52 +812,9 @@ - ; If you only provide the name of the extension, PHP will look for it in its - ; default extension directory. +@@ -832,44 +832,9 @@ + ; extension folders as well as the separate PECL DLL download (PHP 5). + ; Be sure to appropriately set the extension_dir directive. ; --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) --; extension folders as well as the separate PECL DLL download (PHP 5). --; Be sure to appropriately set the extension_dir directive. --; -;extension=php_bz2.dll -;extension=php_curl.dll -;extension=php_fileinfo.dll @@ -150,14 +144,12 @@ -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll --;extension=php_zip.dll -- +; Ideally in PLD Linux you should install appropriate php- or +; php-pecl- package. +; + ;;;;;;;;;;;;;;;;;;; ; Module Settings ; - ;;;;;;;;;;;;;;;;;;; @@ -938,9 +848,9 @@ ;filter.default_flags = diff --git a/php-nohttpd.patch b/php-nohttpd.patch index dcaafc4..234b03b 100644 --- a/php-nohttpd.patch +++ b/php-nohttpd.patch @@ -1,13 +1,12 @@ -diff -urBb php-5.1.0RC1.org/sapi/apache2handler/config.m4 php-5.1.0RC1/sapi/apache2handler/config.m4 ---- php-5.1.0RC1.org/sapi/apache2handler/config.m4 2005-08-05 10:14:54.000000000 +0200 -+++ php-5.1.0RC1/sapi/apache2handler/config.m4 2005-08-25 15:09:38.486655320 +0200 -@@ -58,9 +58,9 @@ +--- php-5.4.20/sapi/apache2handler/config.m4~ 2013-09-18 08:48:57.000000000 +0300 ++++ php-5.4.20/sapi/apache2handler/config.m4 2013-09-27 00:14:09.307972159 +0300 +@@ -60,9 +60,9 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then + if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then - AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) + AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then + elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) diff --git a/php.spec b/php.spec index 14e581d..96334eb 100644 --- a/php.spec +++ b/php.spec @@ -135,13 +135,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.4.19 +Version: 5.4.20 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: f06f99b9872b503758adab5ba7a7e755 +# Source0-md5: e25db5592ed14842b4239be9d990cce8 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -212,7 +212,6 @@ Patch63: %{orgname}-mysql-nowarning.patch #Patch64: %{orgname}-m4.patch # not needed on 5.4 branch Patch65: system-libzip.patch Patch66: php-db.patch -Patch67: php-bug-60598.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} @@ -1928,7 +1927,6 @@ cp -p php.ini-production php.ini %patch63 -p1 %{?with_system_libzip:%patch65 -p1} %patch66 -p1 -%patch67 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 -- 2.44.0