summaryrefslogtreecommitdiff
path: root/www/apache21/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache21/files')
-rw-r--r--www/apache21/files/patch-aa24
-rw-r--r--www/apache21/files/patch-ab93
-rw-r--r--www/apache21/files/patch-ag29
-rw-r--r--www/apache21/files/patch-ak28
-rw-r--r--www/apache21/files/patch-al50
5 files changed, 0 insertions, 224 deletions
diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa
deleted file mode 100644
index 1a054409abf9..000000000000
--- a/www/apache21/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig Sat Jan 2 16:19:41 1999
-+++ configure Fri Jan 15 00:44:01 1999
-@@ -1012,8 +1012,8 @@
- echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
- echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
- echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
-- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
-- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+ echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
-+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
- echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
- echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
- echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,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
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
--echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
deleted file mode 100644
index 8e8b8a45919c..000000000000
--- a/www/apache21/files/patch-ab
+++ /dev/null
@@ -1,93 +0,0 @@
---- Makefile.tmpl.orig Tue Mar 16 03:38:46 1999
-+++ Makefile.tmpl Thu Mar 25 23:53:46 1999
-@@ -113,13 +113,14 @@
- sysconfdir = @sysconfdir@
- datadir = @datadir@
- iconsdir = $(datadir)/icons
--htdocsdir = $(datadir)/htdocs
-+htdocsdir = $(datadir)/data
- cgidir = $(datadir)/cgi-bin
- includedir = @includedir@
- localstatedir = @localstatedir@
- runtimedir = @runtimedir@
- logfiledir = @logfiledir@
- proxycachedir = @proxycachedir@
-+doc_prefix = $(prefix)/share/doc/apache
-
- libexecdir_relative = @libexecdir_relative@
-
-@@ -249,9 +250,9 @@
- $(MKDIR) $(root)$(mandir)/man1
- $(MKDIR) $(root)$(mandir)/man8
- $(MKDIR) $(root)$(sysconfdir)
-- $(MKDIR) $(root)$(htdocsdir)
-+ $(MKDIR) $(root)$(doc_prefix)
- $(MKDIR) $(root)$(iconsdir)
-- $(MKDIR) $(root)$(cgidir)
-+ $(MKDIR) $(root)$(cgidir).default
- $(MKDIR) $(root)$(includedir)
- $(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-@@ -379,26 +380,34 @@
- # icons and distributed CGI scripts.
- install-data:
- @echo "===> [data: Installing initial data files]"
-- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
-- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-- else \
-- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
-+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+# else \
-+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
-- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
-- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
-- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
-+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-+# fi
-+ if [ ! -d $(root)$(htdocsdir) ]; then \
-+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
- fi
-- -@if [ -f $(root)$(cgidir)/printenv ]; then \
-- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-- else \
-+ $(RM) $(root)$(htdocsdir).default
-+ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
-+# -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-+# else \
- for script in printenv test-cgi; do \
- cat $(TOP)/cgi-bin/$${script} |\
- sed -e 's;^#!/.*perl;#!$(PERL);' \
- > $(TOP)/$(SRC)/.apaci.install.tmp; \
-- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
-+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
- done; \
-- fi
-+# fi
-+ if [ ! -d $(root)$(cgidir) ]; then \
-+ $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
-+ fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
- (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -436,10 +445,10 @@
- -e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
- -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
- -e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
-- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
-- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
-- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
-- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+ -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \
-+ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \
-+ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \
-+ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \
- -e 's;conf/magic;$(sysconfdir)/magic;' \
- -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
- -e 's;Group #-1;Group $(conf_group);' \
diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag
deleted file mode 100644
index fe3b9579cd7f..000000000000
--- a/www/apache21/files/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
---- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998
-+++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999
-@@ -241,7 +241,7 @@
- # don't use Group #-1 on these systems!
- #
- User nobody
--Group #-1
-+Group nogroup
-
- #
- # ServerAdmin: Your address, where problems with the server should be
-@@ -459,7 +459,7 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog logs/access_log common
-
- #
- # If you would like to have agent and referer logfiles, uncomment the
-@@ -472,7 +472,7 @@
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog logs/access_log combined
-
- #
- # Optionally add a line containing the server version and virtual host
diff --git a/www/apache21/files/patch-ak b/www/apache21/files/patch-ak
deleted file mode 100644
index 09c3852d49fa..000000000000
--- a/www/apache21/files/patch-ak
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
-+++ src/support/apachectl Fri Mar 26 00:08:20 1999
-@@ -39,6 +39,8 @@
- # -------------------- --------------------
- # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-
-+eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then
-@@ -50,7 +52,7 @@
- # check for pidfile
- if [ -f $PIDFILE ] ; then
- PID=`cat $PIDFILE`
-- if [ ! "x$PID" = "x" ] && kill -0 $PID; then
-+ if [ ! "x$PID" = "x" ] && kill -0 $PID > /dev/null 2>&1; then
- STATUS="httpd (pid $PID) running"
- RUNNING=1
- else
-@@ -82,6 +84,7 @@
- fi
- if kill $PID ; then
- echo "$0 $ARG: httpd stopped"
-+ rm $PIDFILE
- else
- echo "$0 $ARG: httpd could not be stopped"
- ERROR=4
diff --git a/www/apache21/files/patch-al b/www/apache21/files/patch-al
deleted file mode 100644
index 039d6320f415..000000000000
--- a/www/apache21/files/patch-al
+++ /dev/null
@@ -1,50 +0,0 @@
-*** src/support/log_server_status.orig Tue Mar 31 16:53:50 1998
---- src/support/log_server_status Tue Apr 21 17:18:10 1998
-***************
-*** 67,76 ****
- #
- require 'sys/socket.ph';
-
-! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
- $server = "localhost"; # Name of server, could be "www.foo.com"
- $port = "80"; # Port on server
-! $request = "/status/?auto"; # Request to send
-
- sub tcp_connect
- {
---- 67,76 ----
- #
- require 'sys/socket.ph';
-
-! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
- $server = "localhost"; # Name of server, could be "www.foo.com"
- $port = "80"; # Port on server
-! $request = "/server-status/?auto"; # Request to send
-
- sub tcp_connect
- {
-***************
-*** 93,103 ****
- ### Main
-
- {
-! $date=`date +%y%m%d:%H%M%S`;
- chop($date);
- ($day,$time)=split(/:/,$date);
- $res=&tcp_connect($server,$port);
-! open(OUT,">>$wherelog$day");
- if ($res) {
- print OUT "$time:-1:-1:-1:-1:$res\n";
- exit 1;
---- 93,103 ----
- ### Main
-
- {
-! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
- chop($date);
- ($day,$time)=split(/:/,$date);
- $res=&tcp_connect($server,$port);
-! open(OUT,">>$wherelog$day.log");
- if ($res) {
- print OUT "$time:-1:-1:-1:-1:$res\n";
- exit 1;