From 4696e15058475079996c489bfbd65e2868401cb2 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 20 Sep 2013 07:46:19 +0000
Subject: [PATCH] - updated for 5.4.20

---
 php-ini.patch     | 21 +++++++++------------
 php-nohttpd.patch |  9 ++++-----
 php.spec          |  4 ++--
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/php-ini.patch b/php-ini.patch
index 1f925aa..7997c14 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.4.18/php.ini	2013-08-14 05:47:24.000000000 +0000
-+++ php-5.4.18/php.ini	2013-08-19 12:11:57.755000043 +0000
+--- php-5.4.20/php.ini	2013-09-18 05:48:57.000000000 +0000
++++ php-5.4.20/php.ini	2013-09-20 07:16:06.089891443 +0000
 @@ -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
@@ -111,11 +111,10 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -858,52 +825,9 @@
- ;
+@@ -859,50 +826,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
--;
+ ;
 -; 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)
@@ -160,14 +159,12 @@
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_zip.dll
-+
 +; Ideally in TLD Linux you should install appropriate php-<extension> or
 +; php-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -938,9 +862,9 @@
+@@ -937,9 +862,9 @@
  ;filter.default_flags =
  
  [iconv]
@@ -180,7 +177,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1154,6 +1078,9 @@
+@@ -1153,6 +1078,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -190,7 +187,7 @@
  ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
  ; SQL-Errors will be displayed.
  ; http://php.net/mysql.trace-mode
-@@ -1193,6 +1120,9 @@
+@@ -1192,6 +1120,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -200,7 +197,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1359,7 +1289,7 @@
+@@ -1358,7 +1289,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -209,7 +206,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1824,7 +1754,7 @@
+@@ -1823,7 +1754,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir
diff --git a/php-nohttpd.patch b/php-nohttpd.patch
index dcaafc4..8770d8a 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-20 07:26:19.746891550 +0000
++++ php-5.4.20/sapi/apache2handler/config.m4	2013-09-20 07:31:24.386891253 +0000
+@@ -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 b5a9a82..8a92607 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
-- 
2.46.0