diff options
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/mod_suphp/Manifest | 16 | ||||
| -rw-r--r-- | www-apache/mod_suphp/files/70_mod_suphp.conf | 28 | ||||
| -rw-r--r-- | www-apache/mod_suphp/files/suphp.conf | 2 | ||||
| -rw-r--r-- | www-apache/mod_suphp/mod_suphp-0.6.0.ebuild | 18 |
4 files changed, 34 insertions, 30 deletions
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest index a266e9151936..297f90a332ce 100644 --- a/www-apache/mod_suphp/Manifest +++ b/www-apache/mod_suphp/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 0a2521d138d2e46d3c48d0c0c2509b93 mod_suphp-0.6.0.ebuild 2499 +MD5 30d1ca9b7dc60e0ad372f732a3e2efac mod_suphp-0.6.0.ebuild 2169 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226 MD5 dc19b619c72fd30f5caa58cf79a58715 ChangeLog 412 -MD5 cc7f45f9730b3d1b90fc2056e6b80a28 files/70_mod_suphp.conf 923 -MD5 140d0ff2066123c76f80fca983f4a561 files/suphp.conf 945 +MD5 ed1eb993e0e2f4740048b2225959862b files/70_mod_suphp.conf 1590 +MD5 487272d8938103e866fc92dadf5ebfa5 files/suphp.conf 953 MD5 350380d3dd8b4a29db78e1f336344688 files/digest-mod_suphp-0.6.0 63 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC9RKImPFBzbX68WERAjb+AJkBisByQELtOOtjvnTTNHAmr3qbigCfdolK -0GHTG4IK0U6dK/zACgy0Ud0= -=WVy+ ------END PGP SIGNATURE----- diff --git a/www-apache/mod_suphp/files/70_mod_suphp.conf b/www-apache/mod_suphp/files/70_mod_suphp.conf index 12426697790b..1be8706b2c4f 100644 --- a/www-apache/mod_suphp/files/70_mod_suphp.conf +++ b/www-apache/mod_suphp/files/70_mod_suphp.conf @@ -3,6 +3,18 @@ # 'php_admin_flag engine off' and 'suPHP_Engine on', which can be configured # per-vhost, this is not a supported configuration. +# Use suphp for every CGI script (not only for *.cgi and *.pl): +# 1) you can disable mod_cgi and mod_cgid if you run all your cgi scripts +# with mod_suphp! +# 2) Replace ScriptAlias directives with Alias ones +# (e.g. ScriptAlias /cgi-bin/ /path/to/cgi-bin/ will change to +# Alias /cgi-bin/ /path/to/cgi-bin/) +# 3) Put the x-suphp-cgi handler inside your cgi-bin: +# <Location /path/to/cgi-bin/> +# SetHandler x-suphp-cgi +# ... +# </Location> + <IfDefine SUPHP> <IfModule !mod_suphp.c> LoadModule suphp_module modules/mod_suphp.so @@ -13,15 +25,23 @@ AddType application/x-httpd-php5 .php5 AddType application/x-httpd-php4 .php4 AddType application/x-httpd-phtml .phtml + AddType application/x-suphp-cgi .cgi .pl </IfModule> + AddHandler x-httpd-php .php + AddHandler x-httpd-php5 .php5 + AddHandler x-httpd-php4 .php4 + AddHandler x-httpd-phtml .phtml + AddHandler x-suphp-cgi .cgi .pl + suPHP_Engine on <Location /> - SuPHP_AddHandler application/x-httpd-php - SuPHP_AddHandler application/x-httpd-php5 - SuPHP_AddHandler application/x-httpd-php4 - SuPHP_AddHandler application/x-httpd-phtml + SuPHP_AddHandler x-httpd-php + SuPHP_AddHandler x-httpd-php5 + SuPHP_AddHandler x-httpd-php4 + SuPHP_AddHandler x-httpd-phtml + SuPHP_AddHandler x-suphp-cgi </Location> SuPHP_UserGroup apache apache diff --git a/www-apache/mod_suphp/files/suphp.conf b/www-apache/mod_suphp/files/suphp.conf index 005f77f188c9..d3b674e5fa2b 100644 --- a/www-apache/mod_suphp/files/suphp.conf +++ b/www-apache/mod_suphp/files/suphp.conf @@ -1,6 +1,6 @@ [global] ;Path to logfile -logfile=/var/log/suphp.log +logfile=/var/log/apache2/suphp_log ;Loglevel loglevel=info diff --git a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild index 00cff89b1c12..300b0638554d 100644 --- a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild +++ b/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild,v 1.1 2005/08/06 19:40:15 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild,v 1.2 2005/08/07 13:00:00 hollow Exp $ inherit apache-module eutils @@ -55,6 +55,7 @@ src_compile() { --with-min-gid=${SUPHP_MINGID} \ --with-apache-user=${SUPHP_APACHEUSER} \ --with-logfile=${SUPHP_LOGFILE} \ + --disable-checkpath \ --with-apxs=${APXS2}" CFLAGS="$(apr-config --includes) $(apu-config --includes)" \ @@ -76,14 +77,7 @@ src_install() { doins ${FILESDIR}/suphp.conf } -# See: http://forums.gentoo.org/viewtopic.php?t=208570 for the -# answer to another user -#pkg_postinst() { -# # Due to Apache APR requiring R_OK and X_OK for exec*(), we -# # must install suPHP with 4755 permissions or it will not work -# # from within Apache. -# chmod 4755 /usr/sbin/suphp -# einfo "if you (want to) use webapp-config don't forget to uncomment" -# einfo "the example suPHP_MinUser entry in the suphp-module file" -#} - +pkg_postinst() { + # make suphp setuid + chmod 4755 /usr/sbin/suphp +} |