OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Dec-2007 23:11:33
Branch: HEAD Handle: 2007122122113200
Modified files:
openpkg-src/apache-php apache-php.ini apache-php.spec
Log:
make sure the mm/session extension can be used out-of-the-box
Summary:
Revision Changes Path
1.3 +13 -10 openpkg-src/apache-php/apache-php.ini
1.16 +10 -1 openpkg-src/apache-php/apache-php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.ini
============================================================================
$ cvs diff -u -r1.2 -r1.3 apache-php.ini
--- openpkg-src/apache-php/apache-php.ini 25 Aug 2007 20:52:53 -0000
1.2
+++ openpkg-src/apache-php/apache-php.ini 21 Dec 2007 22:11:32 -0000
1.3
@@ -5,18 +5,21 @@
[PHP]
; 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
-memory_limit = 8M ; Maximum amount of memory a script may consume
-post_max_size = 8M ; Maximum amount of POST data accepted
+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
+memory_limit = 8M ; Maximum amount of memory a script may
consume
+post_max_size = 8M ; Maximum amount of POST data accepted
; Include Paths
include_path = ".:@l_prefix@/lib/php"
safe_mode_include_dir = "@l_prefix@/lib/php"
+; Session Paths
+session.safe_path = "@l_prefix@/var/apache/run/apache-php.session"
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 apache-php.spec
--- openpkg-src/apache-php/apache-php.spec 9 Dec 2007 10:37:36 -0000
1.15
+++ openpkg-src/apache-php/apache-php.spec 21 Dec 2007 22:11:32 -0000
1.16
@@ -40,7 +40,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20071209
+Release: 20071221
# package options
%option with_suhosin no
@@ -546,8 +546,17 @@
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE apache-php.conf}
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
+ # create session storage directory
+%if "%{with_mm}" == "yes"
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache-php.session
+%endif
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+%if "%{with_mm}" == "yes"
+ '%attr(-,%{l_nusr},%{l_ngrp})
%{l_prefix}/var/apache/run/apache-php.session' \
+%endif
'%config %{l_prefix}/etc/apache/apache-php.ini' \
'%config %{l_prefix}/etc/apache/apache.d/apache-php.conf'
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
