1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Customizations for Gentoo
---
Makefile.in | 2 +-
include/httpd.h | 2 +-
server/core.c | 2 +-
support/apxs.in | 11 -----------
4 files changed, 3 insertions(+), 14 deletions(-)
Index: httpd-2.2.6/Makefile.in
===================================================================
--- httpd-2.2.6.orig/Makefile.in
+++ httpd-2.2.6/Makefile.in
@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
PROGRAMS = $(PROGRAM_NAME)
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
+INSTALL_TARGETS = install-htdocs install-error install-icons \
install-other install-cgi install-include install-suexec install-build \
install-man
Index: httpd-2.2.6/include/httpd.h
===================================================================
--- httpd-2.2.6.orig/include/httpd.h
+++ httpd-2.2.6/include/httpd.h
@@ -155,7 +155,7 @@ extern "C" {
/** 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/suexec"
#endif
/** The timeout for waiting for messages */
Index: httpd-2.2.6/server/core.c
===================================================================
--- httpd-2.2.6.orig/server/core.c
+++ httpd-2.2.6/server/core.c
@@ -2794,7 +2794,7 @@ static void set_banner(apr_pool_t *pconf
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
}
else {
- ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ")");
+ ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (Gentoo)");
}
/*
Index: httpd-2.2.6/support/apxs.in
===================================================================
--- httpd-2.2.6.orig/support/apxs.in
+++ httpd-2.2.6/support/apxs.in
@@ -190,9 +190,6 @@ if (@opt_S) {
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
$httpd = eval qq("$httpd");
-my $envvars = get_vars("sbindir") . "/envvars";
-$envvars = eval qq("$envvars");
-$envvars = eval qq("$envvars");
#allow apxs to be run from the source tree, before installation
if ($0 =~ m:support/apxs$:) {
@@ -204,14 +201,6 @@ unless (-x "$httpd") {
exit 1;
}
-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
- error("Sorry, no shared object support for Apache");
- error("available under your platform. Make sure");
- error("the Apache module mod_so is compiled into");
- error("your server binary `$httpd'.");
- exit 1;
-}
-
sub get_config_vars{
my ($file, $rh_config) = @_;
|
GitWeb
