SOURCES: apache1-mod_suphp-apr.patch (NEW), apache1-mod_suphp-nota...
qboosh
qboosh at pld-linux.org
Fri Apr 27 11:52:38 CEST 2007
Author: qboosh Date: Fri Apr 27 09:52:38 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from AntiC (antic at tuchow.pl)
---- Files affected:
SOURCES:
apache1-mod_suphp-apr.patch (NONE -> 1.1) (NEW), apache1-mod_suphp-notallowed.patch (NONE -> 1.1) (NEW), apache1-mod_suphp-suphp.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/apache1-mod_suphp-apr.patch
diff -u /dev/null SOURCES/apache1-mod_suphp-apr.patch:1.1
--- /dev/null Fri Apr 27 11:52:38 2007
+++ SOURCES/apache1-mod_suphp-apr.patch Fri Apr 27 11:52:33 2007
@@ -0,0 +1,73 @@
+diff -ur suphp-0.6.1/acinclude.m4 suphp-0.6.1.apr/acinclude.m4
+--- suphp-0.6.1/acinclude.m4 2005-11-26 20:45:49.000000000 +0100
++++ suphp-0.6.1.apr/acinclude.m4 2006-01-27 18:53:40.000000000 +0100
+@@ -40,7 +40,7 @@
+ dnl value of apr_config to fetch any necessary build/link information.
+ dnl
+
+-AC_DEFUN(APR_FIND_APR, [
++AC_DEFUN([APR_FIND_APR], [
+ apr_found="no"
+
+ if test "$ac_cv_emxos2" = "yes"; then
+@@ -53,18 +53,18 @@
+ AC_MSG_CHECKING(for APR)
+ AC_ARG_WITH(apr,
+ [ --with-apr=DIR|FILE prefix for installed APR, path to APR build tree,
+- or the full path to apr-config],
++ or the full path to apr-1-config],
+ [
+ if test "$withval" = "no" || test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-apr requires a directory to be provided])
+ fi
+
+- if $TEST_X "$withval/bin/apr-config"; then
++ if $TEST_X "$withval/bin/apr-1-config"; then
+ apr_found="yes"
+- apr_config="$withval/bin/apr-config"
+- elif $TEST_X "$withval/apr-config"; then
++ apr_config="$withval/bin/apr-1-config"
++ elif $TEST_X "$withval/apr-1-config"; then
+ apr_found="yes"
+- apr_config="$withval/apr-config"
++ apr_config="$withval/apr-1-config"
+ elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+ apr_found="yes"
+ apr_config="$withval"
+@@ -73,7 +73,7 @@
+ dnl if --with-apr is used, then the target prefix/directory must be valid
+ if test "$apr_found" != "yes"; then
+ AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
+-build directory, or an apr-config file.])
++build directory, or an apr-1-config file.])
+ fi
+ ],[
+ dnl if we have a bundled source directory, use it
+@@ -81,21 +81,21 @@
+ apr_temp_abs_srcdir="`cd $1 && pwd`"
+ apr_found="reconfig"
+ if test -n "$2"; then
+- apr_config="$2/apr-config"
++ apr_config="$2/apr-1-config"
+ else
+- apr_config="$1/apr-config"
++ apr_config="$1/apr-1-config"
+ fi
+ fi
+ if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
+- if apr-config --help > /dev/null 2>&1 ; then
++ if apr-1-config --help > /dev/null 2>&1 ; then
+ apr_found="yes"
+- apr_config="apr-config"
++ apr_config="apr-1-config"
+ else
+ dnl look in some standard places (apparently not in builtin/default)
+ for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
+- if $TEST_X "$lookdir/bin/apr-config"; then
++ if $TEST_X "$lookdir/bin/apr-1-config"; then
+ apr_found="yes"
+- apr_config="$lookdir/bin/apr-config"
++ apr_config="$lookdir/bin/apr-1-config"
+ break
+ fi
+ done
================================================================
Index: SOURCES/apache1-mod_suphp-notallowed.patch
diff -u /dev/null SOURCES/apache1-mod_suphp-notallowed.patch:1.1
--- /dev/null Fri Apr 27 11:52:38 2007
+++ SOURCES/apache1-mod_suphp-notallowed.patch Fri Apr 27 11:52:33 2007
@@ -0,0 +1,14 @@
+--- suphp-0.6.1/src/apache/mod_suphp.orig 2006-02-21 01:52:59.000000000 +0100
++++ suphp-0.6.1/src/apache/mod_suphp.c 2006-02-21 01:53:31.000000000 +0100
+@@ -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}
+ };
================================================================
Index: SOURCES/apache1-mod_suphp-suphp.conf
diff -u /dev/null SOURCES/apache1-mod_suphp-suphp.conf:1.1
--- /dev/null Fri Apr 27 11:52:38 2007
+++ SOURCES/apache1-mod_suphp-suphp.conf Fri Apr 27 11:52:33 2007
@@ -0,0 +1,47 @@
+[global]
+;Path to logfile
+logfile=/var/log/apache/suphp_log
+
+;Loglevel
+loglevel=info
+
+;User Apache is running as
+webserver_user=http
+
+;Path all scripts have to be in
+docroot=/
+
+;Path to chroot() to before executing script
+;chroot=/mychroot
+
+; Security options
+allow_file_group_writeable=false
+allow_file_others_writeable=false
+allow_directory_group_writeable=false
+allow_directory_others_writeable=false
+
+;Check wheter script is within DOCUMENT_ROOT
+check_vhost_docroot=false
+
+;Send minor error messages to browser
+errors_to_browser=false
+
+;PATH environment variable
+env_path=/bin:/usr/bin
+
+;Umask to set, specify in octal notation
+umask=0077
+
+; Minimum UID
+min_uid=500
+
+; Minimum GID
+min_gid=1000
+
+
+[handlers]
+;Handler for php-scripts
+x-httpd-php=php:/usr/bin/php.cgi
+
+;Handler for CGI-scripts
+x-suphp-cgi=execute:!self
================================================================
More information about the pld-cvs-commit
mailing list