gunnar: server/php Makefile,1.25,1.26 kolab.patch,1.17,1.18

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv9320

Modified Files:
	Makefile kolab.patch 
Log Message:
Remove deprecated ini settings.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	17 Jan 2010 13:22:55 -0000	1.25
+++ Makefile	16 Feb 2010 08:34:25 -0000	1.26
@@ -4,7 +4,7 @@
 DOWNLOAD_VERSION=5.3.1
 OPENPKG_RELEASE=20091129
 VERSION=5.3.1
-RELEASE=20091129_kolab1
+RELEASE=20091129_kolab2
 
 SOURCE_URL=http://www.php.net/distributions
 SOURCE_0=php-5.3.1.tar.gz

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab.patch	23 Dec 2009 23:27:16 -0000	1.17
+++ kolab.patch	16 Feb 2010 08:34:25 -0000	1.18
@@ -10,7 +10,7 @@
  License:      PHP
  Version:      %{V_php}
 -Release:      20091129
-+Release:      20091129_kolab1
++Release:      20091129_kolab2
  
  #   package options
  %option       with_suhosin              no
@@ -62,9 +62,16 @@
  %endif
  %if "%{with_mysql}" == "yes"
          --with-mysql=%{l_prefix} \
---- php.ini.orig	2009-02-09 09:26:40.000000000 +0000
-+++ php.ini	2009-02-09 09:27:01.000000000 +0000
-@@ -13,8 +13,8 @@
+--- php.ini.orig	2010-02-16 08:53:09.000000000 +0100
++++ php.ini	2010-02-16 08:53:23.000000000 +0100
+@@ -6,17 +6,14 @@
+ 
+ ;   Resource Limits
+ register_globals   = off    ; Global variables are no longer registered for input data
+-safe_mode          = on     ; Enable Safe Mode (file UID comparisons)
+-safe_mode_gid      = off    ; Whether to relax Safe Mode to file GID comparisons
+ allow_url_fopen    = off    ; Disable the opening of remote URLs
+ display_errors     = off    ; Errors will NOT be displayed
  log_errors         = on     ; Errors will be logged
  max_execution_time = 60     ; Maximum execution time of each script, in seconds
  max_input_time     = 60     ; Maximum amount of time each script may spend parsing request data
@@ -75,3 +82,5 @@
  
  ;   Include Paths
  include_path          = ".:@l_prefix@/lib/php"
+-safe_mode_include_dir = "@l_prefix@/lib/php"
+