[packages/php/PHP_5_4] up to 5.4.5, fails build checks if other php present in system
glen
glen at pld-linux.org
Fri Jul 27 23:07:57 CEST 2012
commit ce9aa3afa815896094925ca6a80c3fbc1597a7ba
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jul 28 00:07:53 2012 +0300
up to 5.4.5, fails build checks if other php present in system
php-ini.patch | 20 +++++++++-----------
php.spec | 6 +++---
2 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/php-ini.patch b/php-ini.patch
index 56250b5..eb057de 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.4.1/php.ini~ 2012-04-28 01:25:58.000000000 +0300
-+++ php-5.4.1/php.ini 2012-04-28 01:27:51.622637977 +0300
+--- 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
@@ -223,7 +223,7 @@
; Development Value: Off
; Production Value: Off
@@ -27,12 +27,10 @@
; On windows:
; extension_dir = "ext"
-@@ -812,54 +812,7 @@
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
- ; disabled on them.
+@@ -735,53 +735,6 @@
; http://php.net/enable-dl
--enable_dl = Off
--
+ enable_dl = Off
+
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers. Left undefined, PHP turns this on by default. You can
-; turn it off here AT YOUR OWN RISK
@@ -49,7 +47,7 @@
-; will look for to know it is OK to continue execution. Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; http://php.net/cgi.redirect-status-env
--;cgi.redirect_status_env = ;
+-;cgi.redirect_status_env =
-
-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -66,7 +64,7 @@
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS. Default is zero.
-; http://php.net/fastcgi.impersonate
--;fastcgi.impersonate = 1;
+-;fastcgi.impersonate = 1
-
-; Disable logging through FastCGI connection. PHP's default behavior is to enable
-; this feature.
@@ -79,10 +77,10 @@
-; Default is zero.
-; http://php.net/cgi.rfc2616-headers
-;cgi.rfc2616_headers = 0
-+enable_dl = Off
-
+-
;;;;;;;;;;;;;;;;
; File Uploads ;
+ ;;;;;;;;;;;;;;;;
@@ -812,52 +812,9 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
diff --git a/php.spec b/php.spec
index 05537e2..9023d65 100644
--- a/php.spec
+++ b/php.spec
@@ -133,13 +133,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.4
+Version: 5.4.5
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: 1fd98dc3f6f3805cd67bff12a26ed77f
+# Source0-md5: ffcc7f4dcf2b79d667fe0c110e6cb724
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -319,7 +319,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define jsonver 1.2.1
%define pharver 2.0.1
%define sqlite3ver 0.7
-%define zipver 1.9.1
+%define zipver 1.11.0
%define zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
More information about the pld-cvs-commit
mailing list