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: 07-Sep-2005 13:42:53
Branch: HEAD Handle: 2005090712425300
Modified files:
openpkg-src/apache apache.base apache.patch.suphp apache.spec
Log:
Ok, take the even larger hammer to get suPHP working again: 1. fix the
path to the suphp executable (variable was renamed by author) and 2.
fix implementation of new suPHP_{Add,Remove}Handler directives and 3.
use suPHP_AddHandler directive in apache.base to finally glue Apache
and suPHP together under run-time for .suphp scripts
Summary:
Revision Changes Path
1.15 +1 -0 openpkg-src/apache/apache.base
1.2 +16 -1 openpkg-src/apache/apache.patch.suphp
1.303 +1 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.14 -r1.15 apache.base
--- openpkg-src/apache/apache.base 14 May 2005 20:41:42 -0000 1.14
+++ openpkg-src/apache/apache.base 7 Sep 2005 11:42:53 -0000 1.15
@@ -239,6 +239,7 @@
<IfModule mod_suphp.c>
suPHP_Engine on
suPHP_ConfigPath @l_prefix@/etc/php
+ suPHP_AddHandler x-httpd-php
AddHandler x-httpd-php .suphp
</IfModule>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch.suphp
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache.patch.suphp
--- openpkg-src/apache/apache.patch.suphp 7 Sep 2005 10:11:55 -0000
1.1
+++ openpkg-src/apache/apache.patch.suphp 7 Sep 2005 11:42:53 -0000
1.2
@@ -1,6 +1,6 @@
Index: src/Configuration.cpp
--- src/Configuration.cpp.orig 2005-02-27 18:53:05 +0100
-+++ src/Configuration.cpp 2005-09-07 12:09:45 +0200
++++ src/Configuration.cpp 2005-09-07 13:31:39 +0200
@@ -21,6 +21,8 @@
#include <string>
#include <vector>
@@ -22,3 +22,18 @@
#ifdef OPT_APACHE_USER
this->webserver_user = OPT_APACHE_USER;
#else
+Index: src/apache/mod_suphp.c
+--- src/apache/mod_suphp.c.orig 2005-02-27 18:56:37 +0100
++++ src/apache/mod_suphp.c 2005-09-07 13:32:19 +0200
+@@ -249,9 +249,9 @@
+ {"suPHP_UserGroup", suphp_handle_cmd_user_group, NULL,
+ RSRC_CONF|ACCESS_CONF, TAKE2, "User and group scripts shall be run
as"},
+ #endif
+- {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF,
++ {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL,
RSRC_CONF|ACCESS_CONF,
+ ITERATE, "Tells mod_suphp to handle these MIME-types"},
+- {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL,
ACCESS_CONF,
++ {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL,
RSRC_CONF|ACCESS_CONF,
+ ITERATE, "Tells mod_suphp not to handle these MIME-types"},
+ {NULL}
+ };
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.302 -r1.303 apache.spec
--- openpkg-src/apache/apache.spec 7 Sep 2005 10:11:55 -0000 1.302
+++ openpkg-src/apache/apache.spec 7 Sep 2005 11:42:53 -0000 1.303
@@ -1078,7 +1078,7 @@
libs="$libs -limap -lmodphp4 -limap"
%endif
%if "%{with_suphp}" == "yes"
- cflags="$cflags -DPATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
+ cflags="$cflags -DSUPHP_PATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
