summaryrefslogtreecommitdiff
path: root/www/apache13-fp/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache13-fp/files')
-rw-r--r--www/apache13-fp/files/patch-aa12
-rw-r--r--www/apache13-fp/files/patch-ab18
-rw-r--r--www/apache13-fp/files/patch-ag41
3 files changed, 34 insertions, 37 deletions
diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa
index 5ee49c1d65d5..2aadd37e4a21 100644
--- a/www/apache13-fp/files/patch-aa
+++ b/www/apache13-fp/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon Jan 17 16:53:17 2000
-+++ configure Sun Feb 20 15:43:26 2000
-@@ -1151,7 +1151,8 @@
+--- configure.orig Thu Sep 27 13:12:03 2001
++++ configure Fri Jan 25 14:32:58 2002
+@@ -1169,7 +1169,8 @@
conf_port="80"
fi
conf_serveradmin="you@your.address"
@@ -10,7 +10,7 @@
if [ "x$confadjust" = "x1" ]; then
if [ -f /etc/passwd ]; then
if [ "x$conf_user" = "x" ]; then
-@@ -1175,7 +1176,10 @@
+@@ -1193,7 +1194,10 @@
conf_port="8080"
fi
conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`"
@@ -22,7 +22,7 @@
fi
##
-@@ -1232,8 +1236,8 @@
+@@ -1251,8 +1255,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -33,7 +33,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1334,8 @@
+@@ -1350,8 +1354,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab
index d5b7f70e1b43..a6aeed38f9fa 100644
--- a/www/apache13-fp/files/patch-ab
+++ b/www/apache13-fp/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.tmpl.orig Sat Oct 6 17:01:09 2001
-+++ Makefile.tmpl Thu Oct 18 12:39:52 2001
+--- Makefile.tmpl.orig Wed Nov 28 09:02:12 2001
++++ Makefile.tmpl Fri Jan 25 14:48:40 2002
@@ -127,6 +127,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
@@ -61,7 +61,7 @@
fi
@echo "<=== [programs]"
-@@ -410,6 +426,7 @@
+@@ -411,6 +427,7 @@
echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
@@ -69,7 +69,7 @@
< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
-@@ -457,15 +474,15 @@
+@@ -459,15 +476,15 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -93,7 +93,7 @@
-@if [ -d $(TOP)/htdocs/manual ]; then \
echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
-@@ -473,17 +490,17 @@
+@@ -475,17 +492,17 @@
find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
fi
@@ -117,7 +117,7 @@
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -517,42 +534,46 @@
+@@ -519,15 +536,17 @@
-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
@@ -139,11 +139,7 @@
-e 's;conf/magic;$(sysconfdir)/magic;' \
-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
-e 's;User nobody;User $(conf_user);' \
-- -e 's;Group #-1;Group $(conf_group);' \
-+ -e 's;Group \"#-1\";Group $(conf_group);' \
- -e 's;Port 80;Port $(conf_port);' \
- -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
- -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
+@@ -539,23 +558,25 @@
> $(TOP)/$(SRC)/.apaci.install.tmp && \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag
index e0953b24d628..ed0f472bc837 100644
--- a/www/apache13-fp/files/patch-ag
+++ b/www/apache13-fp/files/patch-ag
@@ -1,5 +1,5 @@
---- conf/httpd.conf-dist.orig Fri Oct 5 22:40:04 2001
-+++ conf/httpd.conf-dist Wed Oct 17 18:16:27 2001
+--- conf/httpd.conf-dist.orig Wed Jan 9 10:05:31 2002
++++ conf/httpd.conf-dist Fri Jan 25 15:07:51 2002
@@ -95,6 +95,9 @@
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf
@@ -93,32 +93,33 @@
#
# Optionally add a line containing the server version and virtual host
-@@ -768,13 +804,17 @@
- # For example, the PHP 3.x module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
+@@ -765,6 +801,21 @@
+ # AddType allows you to tweak mime.types without actually editing it, or to
+ # make certain files to be certain types.
#
-- #AddType application/x-httpd-php3 .php3
-- #AddType application/x-httpd-php3-source .phps
++ # For example, the PHP 3.x module (not part of the Apache distribution - see
++ # http://www.php.net) will typically use:
++ #
+ <IfModule mod_php3.c>
-+ AddType application/x-httpd-php3 .php3
-+ AddType application/x-httpd-php3-source .php3s
++ AddType application/x-httpd-php3 .php3
++ AddType application/x-httpd-php3-source .php3s
+ </IfModule>
- #
- # And for PHP 4.x, use:
- #
-- #AddType application/x-httpd-php .php
-- #AddType application/x-httpd-php-source .phps
++ #
++ # And for PHP 4.x, use:
++ #
+ <IfModule mod_php4.c>
-+ AddType application/x-httpd-php .php
-+ AddType application/x-httpd-php-source .phps
++ AddType application/x-httpd-php .php
++ AddType application/x-httpd-php-source .phps
+ </IfModule>
-
++
AddType application/x-tar .tgz
-@@ -984,3 +1024,14 @@
+ #
+@@ -972,4 +1023,15 @@
+ # ServerName dummy-host.example.com
# ErrorLog logs/dummy-host.example.com-error_log
# CustomLog logs/dummy-host.example.com-access_log common
- #</VirtualHost>
++#</VirtualHost>
+
+# This Virtual Host makes it so FrontPage will display pages from the
+# root web. When multiple Listen directives are specified, Frontpage
@@ -129,4 +130,4 @@
+#<VirtualHost _default_:80>
+# ServerAdmin webmaster@@@HOSTNAME@@
+# ServerName @@HOSTNAME@@
-+#</VirtualHost>
+ #</VirtualHost>