diff options
author | Christian Heim <phreak@gentoo.org> | 2007-06-03 11:13:59 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2007-06-03 11:13:59 +0000 |
commit | fc9e47de94ccbd5afca33a2d35a5d254d8c6cbe5 (patch) | |
tree | c381629a602e510056e18d9415d64d5edf032714 /2.0 | |
parent | Reordering the remaining patches. (diff) | |
download | apache-fc9e47de94ccbd5afca33a2d35a5d254d8c6cbe5.tar.gz apache-fc9e47de94ccbd5afca33a2d35a5d254d8c6cbe5.tar.bz2 apache-fc9e47de94ccbd5afca33a2d35a5d254d8c6cbe5.zip |
Don't patch apachctl.in any longer, we don't even install it anymore. Also adopt Luca's change from the 2.2 series, using #define SUEXEC_BIN "/usr/sbin/suexec" instead of suexec2.
Diffstat (limited to '2.0')
-rw-r--r-- | 2.0/patches/01_all_gentoo_base.patch | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/2.0/patches/01_all_gentoo_base.patch b/2.0/patches/01_all_gentoo_base.patch index 30c17ea..bf27f0b 100644 --- a/2.0/patches/01_all_gentoo_base.patch +++ b/2.0/patches/01_all_gentoo_base.patch @@ -4,9 +4,8 @@ modules/ssl/ssl_engine_mutex.c | 2 ++ server/Makefile.in | 3 +++ server/core.c | 2 +- - support/apachectl.in | 22 +++++++++++++++++++--- support/apxs.in | 13 ------------- - 7 files changed, 27 insertions(+), 19 deletions(-) + 6 files changed, 8 insertions(+), 16 deletions(-) --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +25,7 @@ /* The path to the suExec wrapper, can be overridden in Configuration */ #ifndef SUEXEC_BIN -#define SUEXEC_BIN HTTPD_ROOT "/bin/suexec" -+#define SUEXEC_BIN "/usr/sbin/suexec2" ++#define SUEXEC_BIN "/usr/sbin/suexec" #endif /* The timeout for waiting for messages */ @@ -64,52 +63,6 @@ } /* ---- a/support/apachectl.in -+++ b/support/apachectl.in -@@ -41,17 +41,25 @@ ARGV="$@" - # -------------------- -------------------- - # - # the path to your httpd binary, including options if necessary --HTTPD='@exp_sbindir@/@progname@' -+. /etc/conf.d/apache2 -+if [ -n ${MPM} ] && [ -x @exp_sbindir@/@progname@.${MPM} ]; then -+ HTTPD="@exp_sbindir@/@progname@.${MPM} ${APACHE2_OPTS}" -+else -+ HTTPD="@exp_sbindir@/@progname@ ${APACHE2_OPTS}" -+fi - # - # pick up any necessary environment variables --if test -f @exp_sbindir@/envvars; then -- . @exp_sbindir@/envvars -+if test -f @exp_installbuilddir@/envvars; then -+ . @exp_installbuilddir@/envvars - fi - # - # a command that outputs a formatted text version of the HTML at the - # url given on the command line. Designed for lynx, however other - # programs may work. - LYNX="lynx -dump" -+if ! type -p lynx 2>&1 >/dev/null; then -+ LYNX=no -+fi - # - # the URL to your server's mod_status status page. If you do not - # have one, then status and fullstatus will not work. -@@ -75,6 +83,14 @@ if [ "x$ARGV" = "x" ] ; then - ARGV="-h" - fi - -+if [ "${LYNX}" = "no" ] && [ "${ARGV}" = "status" -o "${ARGV}" = "fullstatus" ]; then -+ echo >&2 "lynx not found!" -+ echo >&2 "" -+ echo >&2 "You need to emerge 'www-client/lynx' for status monitoring via the" -+ echo >&2 "'status' and 'fullstatus' commands to work." -+ exit 1 -+fi -+ - case $ARGV in - start|stop|restart|graceful) - $HTTPD -k $ARGV --- a/support/apxs.in +++ b/support/apxs.in @@ -199,19 +199,6 @@ if ($0 =~ m:support/apxs$:) { |