From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Sun, 3 Nov 2013 10:55:01 +0000 (+0100)
Subject: - 5.4.21
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=c2335c46f34220f6aa9e322876acefadac67f18b;p=packages%2Fphp.git

- 5.4.21
---

diff --git a/php-ini.patch b/php-ini.patch
index 7997c14..f147a34 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- 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
+--- php-5.4.21/php.ini.orig	2013-10-16 07:39:33.000000000 +0200
++++ php-5.4.21/php.ini	2013-11-03 11:45:28.586384794 +0100
 @@ -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
@@ -19,9 +19,9 @@
 +; few options)
 +
  
- ;;;;;;;;;;;;;;;;;;;
- ; Quick Reference ;
-@@ -157,7 +171,7 @@
+ ; This is php.ini-production INI file.
+ 
+@@ -159,7 +173,7 @@
  ;   Production Value: 5
  
  ; short_open_tag
@@ -30,16 +30,16 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -204,7 +218,7 @@
- ; confused and end up parsing the wrong code in the wrong context. But because
- ; this short cut has been a feature for such a long time, it's currently still
- ; supported for backwards compatibility, but we recommend you don't use them.
+@@ -205,7 +219,7 @@
+ ; documents, however this remains supported for backward compatibility reasons.
+ ; Note that this directive does not control the <?= shorthand tag, which can be
+ ; used regardless of this directive.
 -; Default Value: On
 +; Default Value: Off
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -372,7 +386,7 @@
+@@ -373,7 +387,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
  ; http://php.net/expose-php
@@ -48,7 +48,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -725,7 +739,7 @@
+@@ -726,7 +740,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -57,7 +57,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -735,53 +749,6 @@
+@@ -736,53 +750,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -111,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -859,50 +826,8 @@
+@@ -860,50 +827,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -164,7 +164,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -937,9 +862,9 @@
+@@ -938,9 +863,9 @@
  ;filter.default_flags =
  
  [iconv]
@@ -177,7 +177,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1153,6 +1078,9 @@
+@@ -1154,6 +1079,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -187,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
-@@ -1192,6 +1120,9 @@
+@@ -1193,6 +1121,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -197,7 +197,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1358,7 +1289,7 @@
+@@ -1359,7 +1290,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -206,7 +206,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1823,7 +1754,7 @@
+@@ -1824,7 +1755,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir
diff --git a/php.spec b/php.spec
index 8a92607..568a760 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.20
+Version:	5.4.21
 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:	e25db5592ed14842b4239be9d990cce8
+# Source0-md5:	3dcf021e89b039409d0b1c346b936b5f
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini