diff options
Diffstat (limited to 'www/apache21/files')
-rw-r--r-- | www/apache21/files/FreeBSD.layout | 19 | ||||
-rw-r--r-- | www/apache21/files/apache.sh | 20 | ||||
-rw-r--r-- | www/apache21/files/patch-aa | 24 | ||||
-rw-r--r-- | www/apache21/files/patch-ab | 84 | ||||
-rw-r--r-- | www/apache21/files/patch-ag | 66 | ||||
-rw-r--r-- | www/apache21/files/patch-ak | 19 | ||||
-rw-r--r-- | www/apache21/files/patch-al | 24 |
7 files changed, 0 insertions, 256 deletions
diff --git a/www/apache21/files/FreeBSD.layout b/www/apache21/files/FreeBSD.layout deleted file mode 100644 index 5524e186e9c0..000000000000 --- a/www/apache21/files/FreeBSD.layout +++ /dev/null @@ -1,19 +0,0 @@ -# FreeBSD layout... -<Layout FreeBSD> - prefix: /usr/local - exec_prefix: $prefix - bindir: $exec_prefix/bin - sbindir: $exec_prefix/sbin - libexecdir: $exec_prefix/libexec/apache - mandir: $prefix/man - sysconfdir: $prefix/etc/apache - datadir: $prefix/www - iconsdir: $datadir/icons - htdocsdir: $datadir/data - cgidir: $datadir/cgi-bin - includedir: $prefix/include/apache - localstatedir: /var - runtimedir: $localstatedir/run - logfiledir: $localstatedir/log - proxycachedir: $datadir/proxy -</Layout> diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh deleted file mode 100644 index ca4321814e5a..000000000000 --- a/www/apache21/files/apache.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache' - ;; -stop) - [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa deleted file mode 100644 index 15cd58c27ef2..000000000000 --- a/www/apache21/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Tue Jan 18 01:53:17 2000 -+++ configure Mon Jan 24 19:37:21 2000 -@@ -1232,8 +1232,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" -@@ -1330,8 +1330,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 e4448f1e47ca..000000000000 --- a/www/apache21/files/patch-ab +++ /dev/null @@ -1,84 +0,0 @@ ---- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 -+++ Makefile.tmpl Mon Jan 24 19:50:42 2000 -@@ -123,6 +123,7 @@ - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -@@ -266,9 +267,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)$(includedir)/xml - $(MKDIR) $(root)$(runtimedir) -@@ -452,25 +453,33 @@ - # icons and distributed CGI scripts. - install-data: - @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -- else \ -- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; 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 {} \; ; \ -- fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ -+ (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 -+ $(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 -+ 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) - *) |\ -@@ -509,10 +518,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)/$${target_prefix}httpd-access.log;" \ -+ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ -+ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ -+ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ - -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ - -e 's;User nobody;User $(conf_user);' \ diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag deleted file mode 100644 index 80373fbcca63..000000000000 --- a/www/apache21/files/patch-ag +++ /dev/null @@ -1,66 +0,0 @@ ---- conf/httpd.conf-dist.orig Mon Feb 21 08:30:46 2000 -+++ conf/httpd.conf-dist Mon May 29 16:48:49 2000 -@@ -354,7 +354,22 @@ - # directory index. Separate multiple entries with spaces. - # - <IfModule mod_dir.c> -- DirectoryIndex index.html -+ <IfModule mod_php3.c> -+ <IfModule mod_php4.c> -+ DirectoryIndex index.php index.php3 index.html -+ </IfModule> -+ <IfModule !mod_php4.c> -+ DirectoryIndex index.php3 index.html -+ </IfModule> -+ </IfModule> -+ <IfModule !mod_php3.c> -+ <IfModule mod_php4.c> -+ DirectoryIndex index.php index.html -+ </IfModule> -+ <IfModule !mod_php4.c> -+ DirectoryIndex index.html -+ </IfModule> -+ </IfModule> - </IfModule> - - # -@@ -473,7 +488,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 -@@ -486,7 +501,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 -@@ -708,13 +723,17 @@ - # For example, the PHP 3.x module (not part of the Apache distribution - see - # http://www.php.net) will typically use: - # -- #AddType application/x-httpd-php3 .php3 -- #AddType application/x-httpd-php3-source .phps -+ <IfModule mod_php3.c> -+ 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 -+ <IfModule mod_php4.c> -+ AddType application/x-httpd-php .php -+ AddType application/x-httpd-php-source .phps -+ </IfModule> - - AddType application/x-tar .tgz - diff --git a/www/apache21/files/patch-ak b/www/apache21/files/patch-ak deleted file mode 100644 index 486f7ad159cf..000000000000 --- a/www/apache21/files/patch-ak +++ /dev/null @@ -1,19 +0,0 @@ ---- src/support/apachectl.orig Wed Apr 7 00:36:33 1999 -+++ src/support/apachectl Fri Sep 3 15:41:01 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 -@@ -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 b355a697b4ab..000000000000 --- a/www/apache21/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/support/log_server_status.orig Fri Jun 4 19:54:19 1999 -+++ src/support/log_server_status Fri Sep 3 15:53:16 1999 -@@ -67,10 +67,10 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "/var/log/httpd-status-"; - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server --$request = "/status/?auto"; # Request to send -+$request = "/server-status/?auto"; # Request to send - - sub tcp_connect - { -@@ -100,7 +100,7 @@ - chomp($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -- open(OUT,">>$wherelog$day"); -+ open(OUT,">>$wherelog$day.log"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; |