summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/apache13/Makefile12
-rw-r--r--www/apache13/distinfo2
-rw-r--r--www/apache13/files/patch-ab256
-rw-r--r--www/apache13/files/patch-ag37
-rw-r--r--www/apache2/Makefile12
-rw-r--r--www/apache2/distinfo2
-rw-r--r--www/apache2/files/patch-ab256
-rw-r--r--www/apache2/files/patch-ag37
-rw-r--r--www/apache20/Makefile12
-rw-r--r--www/apache20/distinfo2
-rw-r--r--www/apache20/files/patch-ab256
-rw-r--r--www/apache20/files/patch-ag37
-rw-r--r--www/apache21/Makefile12
-rw-r--r--www/apache21/distinfo2
-rw-r--r--www/apache21/files/patch-ab256
-rw-r--r--www/apache21/files/patch-ag37
-rw-r--r--www/apache22/Makefile12
-rw-r--r--www/apache22/distinfo2
-rw-r--r--www/apache22/files/patch-ab256
-rw-r--r--www/apache22/files/patch-ag37
20 files changed, 740 insertions, 795 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 446de777a49c..061959302bd8 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -3,15 +3,15 @@
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@nagual.pp.ru
#
-# $Id: Makefile,v 1.49 1998/04/22 12:39:33 asami Exp $
+# $Id: Makefile,v 1.50 1998/04/22 16:28:43 ache Exp $
#
-DISTNAME= apache_1.3b6
-PKGNAME= apache-1.3b6
+DISTNAME= apache_1.3b7
+PKGNAME= apache-1.3b7
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
-#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
+#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b7/
MAINTAINER= ache@freebsd.org
@@ -19,8 +19,10 @@ NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= \
- --localstatedir=/var \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
--datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
--enable-shared=remain \
--enable-module=most \
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index e290b622bf3f..4615f96a2615 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b6.tar.gz) = f58db5a72656a36605934fbcb215c154
+MD5 (apache_1.3b7.tar.gz) = 10f06615578483df4a0d8838dfdd77f3
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index b0f108c37db2..55c4a50bbd3e 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -1,133 +1,137 @@
-*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998
---- Makefile.tmpl Tue Apr 21 23:48:17 1998
+*** Makefile.tmpl.orig Tue May 12 15:52:11 1998
+--- Makefile.tmpl Fri Jun 5 19:13:32 1998
***************
-*** 207,218 ****
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/htdocs
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(localstatedir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
---- 207,218 ----
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/data.default
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin.default
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(datadir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
+*** 161,167 ****
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
+--- 161,167 ----
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/data\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
***************
-*** 311,327 ****
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/htdocs/ && $(TAR) xf -)
-! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
---- 311,333 ----
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/data.default/ && $(TAR) xf -)
-! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/data ]; then \
-! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \
-! fi
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/cgi-bin ]; then \
-! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+*** 216,224 ****
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/htdocs
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+--- 216,224 ----
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/data.default
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin.default
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+***************
+*** 330,352 ****
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
+! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
! fi
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
+! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
+--- 330,358 ----
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! # else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/data ]; then \
+! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
+! fi
+! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! # else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
+! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
-*** 335,351 ****
+*** 366,373 ****
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
---- 341,356 ----
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+--- 372,379 ----
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
-*** 356,363 ****
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
-! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
- @echo "<=== [config]"
-
-
---- 361,374 ----
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
-! if [ ! -f "$(sysconfdir)/mime.types" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
-! fi
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
-! if [ ! -f "$(sysconfdir)/magic" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
-! fi
- @echo "<=== [config]"
-
-
+*** 375,384 ****
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -e 's;logs/access_log;$(logfiledir)/access_log;' \
+! -e 's;logs/error_log;$(logfiledir)/error_log;' \
+! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
+! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
+--- 381,390 ----
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -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;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
diff --git a/www/apache13/files/patch-ag b/www/apache13/files/patch-ag
index 7f0c21c34f13..11aedaa76270 100644
--- a/www/apache13/files/patch-ag
+++ b/www/apache13/files/patch-ag
@@ -1,16 +1,16 @@
-*** conf/httpd.conf-dist.orig Wed Apr 1 17:16:39 1998
---- conf/httpd.conf-dist Tue Apr 21 23:43:19 1998
+*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998
+--- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998
***************
-*** 42,48 ****
- # suggested workaround is to create a user www and use that user.
+*** 50,56 ****
+ # don't use Group #-1 on these systems!
User nobody
! Group #-1
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
---- 42,48 ----
- # suggested workaround is to create a user www and use that user.
+--- 50,56 ----
+ # don't use Group #-1 on these systems!
User nobody
! Group nogroup
@@ -18,7 +18,7 @@
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
***************
-*** 86,92 ****
+*** 94,100 ****
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -26,7 +26,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
---- 86,92 ----
+--- 94,100 ----
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -35,7 +35,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
***************
-*** 97,103 ****
+*** 105,111 ****
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -43,7 +43,7 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
---- 97,103 ----
+--- 105,111 ----
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -51,20 +51,3 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
-***************
-*** 106,112 ****
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 106,112 ----
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! #ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 446de777a49c..061959302bd8 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,15 +3,15 @@
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@nagual.pp.ru
#
-# $Id: Makefile,v 1.49 1998/04/22 12:39:33 asami Exp $
+# $Id: Makefile,v 1.50 1998/04/22 16:28:43 ache Exp $
#
-DISTNAME= apache_1.3b6
-PKGNAME= apache-1.3b6
+DISTNAME= apache_1.3b7
+PKGNAME= apache-1.3b7
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
-#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
+#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b7/
MAINTAINER= ache@freebsd.org
@@ -19,8 +19,10 @@ NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= \
- --localstatedir=/var \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
--datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
--enable-shared=remain \
--enable-module=most \
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index e290b622bf3f..4615f96a2615 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b6.tar.gz) = f58db5a72656a36605934fbcb215c154
+MD5 (apache_1.3b7.tar.gz) = 10f06615578483df4a0d8838dfdd77f3
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
index b0f108c37db2..55c4a50bbd3e 100644
--- a/www/apache2/files/patch-ab
+++ b/www/apache2/files/patch-ab
@@ -1,133 +1,137 @@
-*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998
---- Makefile.tmpl Tue Apr 21 23:48:17 1998
+*** Makefile.tmpl.orig Tue May 12 15:52:11 1998
+--- Makefile.tmpl Fri Jun 5 19:13:32 1998
***************
-*** 207,218 ****
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/htdocs
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(localstatedir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
---- 207,218 ----
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/data.default
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin.default
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(datadir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
+*** 161,167 ****
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
+--- 161,167 ----
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/data\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
***************
-*** 311,327 ****
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/htdocs/ && $(TAR) xf -)
-! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
---- 311,333 ----
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/data.default/ && $(TAR) xf -)
-! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/data ]; then \
-! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \
-! fi
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/cgi-bin ]; then \
-! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+*** 216,224 ****
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/htdocs
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+--- 216,224 ----
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/data.default
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin.default
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+***************
+*** 330,352 ****
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
+! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
! fi
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
+! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
+--- 330,358 ----
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! # else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/data ]; then \
+! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
+! fi
+! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! # else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
+! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
-*** 335,351 ****
+*** 366,373 ****
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
---- 341,356 ----
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+--- 372,379 ----
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
-*** 356,363 ****
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
-! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
- @echo "<=== [config]"
-
-
---- 361,374 ----
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
-! if [ ! -f "$(sysconfdir)/mime.types" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
-! fi
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
-! if [ ! -f "$(sysconfdir)/magic" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
-! fi
- @echo "<=== [config]"
-
-
+*** 375,384 ****
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -e 's;logs/access_log;$(logfiledir)/access_log;' \
+! -e 's;logs/error_log;$(logfiledir)/error_log;' \
+! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
+! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
+--- 381,390 ----
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -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;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
diff --git a/www/apache2/files/patch-ag b/www/apache2/files/patch-ag
index 7f0c21c34f13..11aedaa76270 100644
--- a/www/apache2/files/patch-ag
+++ b/www/apache2/files/patch-ag
@@ -1,16 +1,16 @@
-*** conf/httpd.conf-dist.orig Wed Apr 1 17:16:39 1998
---- conf/httpd.conf-dist Tue Apr 21 23:43:19 1998
+*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998
+--- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998
***************
-*** 42,48 ****
- # suggested workaround is to create a user www and use that user.
+*** 50,56 ****
+ # don't use Group #-1 on these systems!
User nobody
! Group #-1
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
---- 42,48 ----
- # suggested workaround is to create a user www and use that user.
+--- 50,56 ----
+ # don't use Group #-1 on these systems!
User nobody
! Group nogroup
@@ -18,7 +18,7 @@
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
***************
-*** 86,92 ****
+*** 94,100 ****
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -26,7 +26,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
---- 86,92 ----
+--- 94,100 ----
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -35,7 +35,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
***************
-*** 97,103 ****
+*** 105,111 ****
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -43,7 +43,7 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
---- 97,103 ----
+--- 105,111 ----
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -51,20 +51,3 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
-***************
-*** 106,112 ****
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 106,112 ----
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! #ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 446de777a49c..061959302bd8 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -3,15 +3,15 @@
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@nagual.pp.ru
#
-# $Id: Makefile,v 1.49 1998/04/22 12:39:33 asami Exp $
+# $Id: Makefile,v 1.50 1998/04/22 16:28:43 ache Exp $
#
-DISTNAME= apache_1.3b6
-PKGNAME= apache-1.3b6
+DISTNAME= apache_1.3b7
+PKGNAME= apache-1.3b7
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
-#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
+#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b7/
MAINTAINER= ache@freebsd.org
@@ -19,8 +19,10 @@ NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= \
- --localstatedir=/var \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
--datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
--enable-shared=remain \
--enable-module=most \
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index e290b622bf3f..4615f96a2615 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b6.tar.gz) = f58db5a72656a36605934fbcb215c154
+MD5 (apache_1.3b7.tar.gz) = 10f06615578483df4a0d8838dfdd77f3
diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
index b0f108c37db2..55c4a50bbd3e 100644
--- a/www/apache20/files/patch-ab
+++ b/www/apache20/files/patch-ab
@@ -1,133 +1,137 @@
-*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998
---- Makefile.tmpl Tue Apr 21 23:48:17 1998
+*** Makefile.tmpl.orig Tue May 12 15:52:11 1998
+--- Makefile.tmpl Fri Jun 5 19:13:32 1998
***************
-*** 207,218 ****
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/htdocs
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(localstatedir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
---- 207,218 ----
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/data.default
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin.default
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(datadir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
+*** 161,167 ****
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
+--- 161,167 ----
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/data\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
***************
-*** 311,327 ****
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/htdocs/ && $(TAR) xf -)
-! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
---- 311,333 ----
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/data.default/ && $(TAR) xf -)
-! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/data ]; then \
-! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \
-! fi
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/cgi-bin ]; then \
-! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+*** 216,224 ****
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/htdocs
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+--- 216,224 ----
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/data.default
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin.default
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+***************
+*** 330,352 ****
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
+! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
! fi
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
+! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
+--- 330,358 ----
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! # else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/data ]; then \
+! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
+! fi
+! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! # else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
+! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
-*** 335,351 ****
+*** 366,373 ****
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
---- 341,356 ----
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+--- 372,379 ----
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
-*** 356,363 ****
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
-! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
- @echo "<=== [config]"
-
-
---- 361,374 ----
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
-! if [ ! -f "$(sysconfdir)/mime.types" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
-! fi
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
-! if [ ! -f "$(sysconfdir)/magic" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
-! fi
- @echo "<=== [config]"
-
-
+*** 375,384 ****
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -e 's;logs/access_log;$(logfiledir)/access_log;' \
+! -e 's;logs/error_log;$(logfiledir)/error_log;' \
+! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
+! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
+--- 381,390 ----
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -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;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
diff --git a/www/apache20/files/patch-ag b/www/apache20/files/patch-ag
index 7f0c21c34f13..11aedaa76270 100644
--- a/www/apache20/files/patch-ag
+++ b/www/apache20/files/patch-ag
@@ -1,16 +1,16 @@
-*** conf/httpd.conf-dist.orig Wed Apr 1 17:16:39 1998
---- conf/httpd.conf-dist Tue Apr 21 23:43:19 1998
+*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998
+--- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998
***************
-*** 42,48 ****
- # suggested workaround is to create a user www and use that user.
+*** 50,56 ****
+ # don't use Group #-1 on these systems!
User nobody
! Group #-1
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
---- 42,48 ----
- # suggested workaround is to create a user www and use that user.
+--- 50,56 ----
+ # don't use Group #-1 on these systems!
User nobody
! Group nogroup
@@ -18,7 +18,7 @@
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
***************
-*** 86,92 ****
+*** 94,100 ****
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -26,7 +26,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
---- 86,92 ----
+--- 94,100 ----
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -35,7 +35,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
***************
-*** 97,103 ****
+*** 105,111 ****
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -43,7 +43,7 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
---- 97,103 ----
+--- 105,111 ----
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -51,20 +51,3 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
-***************
-*** 106,112 ****
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 106,112 ----
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! #ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 446de777a49c..061959302bd8 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -3,15 +3,15 @@
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@nagual.pp.ru
#
-# $Id: Makefile,v 1.49 1998/04/22 12:39:33 asami Exp $
+# $Id: Makefile,v 1.50 1998/04/22 16:28:43 ache Exp $
#
-DISTNAME= apache_1.3b6
-PKGNAME= apache-1.3b6
+DISTNAME= apache_1.3b7
+PKGNAME= apache-1.3b7
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
-#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
+#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b7/
MAINTAINER= ache@freebsd.org
@@ -19,8 +19,10 @@ NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= \
- --localstatedir=/var \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
--datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
--enable-shared=remain \
--enable-module=most \
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index e290b622bf3f..4615f96a2615 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b6.tar.gz) = f58db5a72656a36605934fbcb215c154
+MD5 (apache_1.3b7.tar.gz) = 10f06615578483df4a0d8838dfdd77f3
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
index b0f108c37db2..55c4a50bbd3e 100644
--- a/www/apache21/files/patch-ab
+++ b/www/apache21/files/patch-ab
@@ -1,133 +1,137 @@
-*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998
---- Makefile.tmpl Tue Apr 21 23:48:17 1998
+*** Makefile.tmpl.orig Tue May 12 15:52:11 1998
+--- Makefile.tmpl Fri Jun 5 19:13:32 1998
***************
-*** 207,218 ****
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/htdocs
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(localstatedir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
---- 207,218 ----
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/data.default
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin.default
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(datadir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
+*** 161,167 ****
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
+--- 161,167 ----
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/data\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
***************
-*** 311,327 ****
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/htdocs/ && $(TAR) xf -)
-! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
---- 311,333 ----
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/data.default/ && $(TAR) xf -)
-! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/data ]; then \
-! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \
-! fi
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/cgi-bin ]; then \
-! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+*** 216,224 ****
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/htdocs
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+--- 216,224 ----
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/data.default
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin.default
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+***************
+*** 330,352 ****
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
+! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
! fi
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
+! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
+--- 330,358 ----
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! # else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/data ]; then \
+! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
+! fi
+! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! # else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
+! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
-*** 335,351 ****
+*** 366,373 ****
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
---- 341,356 ----
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+--- 372,379 ----
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
-*** 356,363 ****
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
-! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
- @echo "<=== [config]"
-
-
---- 361,374 ----
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
-! if [ ! -f "$(sysconfdir)/mime.types" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
-! fi
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
-! if [ ! -f "$(sysconfdir)/magic" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
-! fi
- @echo "<=== [config]"
-
-
+*** 375,384 ****
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -e 's;logs/access_log;$(logfiledir)/access_log;' \
+! -e 's;logs/error_log;$(logfiledir)/error_log;' \
+! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
+! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
+--- 381,390 ----
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -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;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag
index 7f0c21c34f13..11aedaa76270 100644
--- a/www/apache21/files/patch-ag
+++ b/www/apache21/files/patch-ag
@@ -1,16 +1,16 @@
-*** conf/httpd.conf-dist.orig Wed Apr 1 17:16:39 1998
---- conf/httpd.conf-dist Tue Apr 21 23:43:19 1998
+*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998
+--- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998
***************
-*** 42,48 ****
- # suggested workaround is to create a user www and use that user.
+*** 50,56 ****
+ # don't use Group #-1 on these systems!
User nobody
! Group #-1
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
---- 42,48 ----
- # suggested workaround is to create a user www and use that user.
+--- 50,56 ----
+ # don't use Group #-1 on these systems!
User nobody
! Group nogroup
@@ -18,7 +18,7 @@
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
***************
-*** 86,92 ****
+*** 94,100 ****
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -26,7 +26,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
---- 86,92 ----
+--- 94,100 ----
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -35,7 +35,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
***************
-*** 97,103 ****
+*** 105,111 ****
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -43,7 +43,7 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
---- 97,103 ----
+--- 105,111 ----
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -51,20 +51,3 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
-***************
-*** 106,112 ****
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 106,112 ----
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! #ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 446de777a49c..061959302bd8 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,15 +3,15 @@
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@nagual.pp.ru
#
-# $Id: Makefile,v 1.49 1998/04/22 12:39:33 asami Exp $
+# $Id: Makefile,v 1.50 1998/04/22 16:28:43 ache Exp $
#
-DISTNAME= apache_1.3b6
-PKGNAME= apache-1.3b6
+DISTNAME= apache_1.3b7
+PKGNAME= apache-1.3b7
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
-#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
+#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b7/
MAINTAINER= ache@freebsd.org
@@ -19,8 +19,10 @@ NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= \
- --localstatedir=/var \
+ --logfiledir=/var/log \
+ --runtimedir=/var/run \
--datadir=${PREFIX}/www \
+ --proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
--enable-shared=remain \
--enable-module=most \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index e290b622bf3f..4615f96a2615 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b6.tar.gz) = f58db5a72656a36605934fbcb215c154
+MD5 (apache_1.3b7.tar.gz) = 10f06615578483df4a0d8838dfdd77f3
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index b0f108c37db2..55c4a50bbd3e 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -1,133 +1,137 @@
-*** Makefile.tmpl.orig Tue Apr 14 23:17:36 1998
---- Makefile.tmpl Tue Apr 21 23:48:17 1998
+*** Makefile.tmpl.orig Tue May 12 15:52:11 1998
+--- Makefile.tmpl Fri Jun 5 19:13:32 1998
***************
-*** 207,218 ****
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/htdocs
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(localstatedir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
---- 207,218 ----
- $(MKDIR) $(mandir)/man1
- $(MKDIR) $(mandir)/man8
- $(MKDIR) $(sysconfdir)
-! $(MKDIR) $(datadir)/data.default
- $(MKDIR) $(datadir)/icons
-! $(MKDIR) $(datadir)/cgi-bin.default
- $(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
- $(MKDIR) $(localstatedir)/$(localstatesubdir_run)
-! $(MKDIR) $(datadir)/proxy
- $(MKDIR) $(includedir)
- @echo "<=== [mktree]"
-
+*** 161,167 ****
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
+--- 161,167 ----
+ -DGID_MIN=$(suexec_gidmin) \
+ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
+ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
+! -DDOC_ROOT=\"$(datadir)/data\" \
+ -DSAFE_PATH=\"$(suexec_safepath)\" \
+ ' \
+ suexec; \
***************
-*** 311,327 ****
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/htdocs/ && $(TAR) xf -)
-! -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
---- 311,333 ----
- install-docroot:
- @echo "===> [docroot: Installing initial DocumentRoot files]"
- -(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(datadir)/data.default/ && $(TAR) xf -)
-! -find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/data ]; then \
-! $(CP) -Rp $(datadir)/data.default $(datadir)/data; \
-! fi
- -(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
- (cd $(datadir)/icons/ && $(TAR) xf -)
- -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
- -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
- -(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
-! (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
-! -find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
-! -find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
-! if [ ! -d $(datadir)/cgi-bin ]; then \
-! $(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+*** 216,224 ****
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/htdocs
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+--- 216,224 ----
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+! $(MKDIR) $(root)$(datadir)/data.default
+ $(MKDIR) $(root)$(datadir)/icons
+! $(MKDIR) $(root)$(datadir)/cgi-bin.default
+ $(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(runtimedir)
+ $(MKDIR) $(root)$(logfiledir)
+***************
+*** 330,352 ****
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
+! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
! fi
- @echo "<=== [docroot]"
-
- # create the initial configuration by providing default files
+! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
+--- 330,358 ----
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+! # else \
+! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/data ]; then \
+! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
+! fi
+! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+! # else \
+! echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \
+ (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
+! (cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \
+! find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \
+! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
+! # fi
+! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
+! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
+ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ (cd $(TOP)/icons/ && $(TAR) cf - *) |\
***************
-*** 335,351 ****
+*** 366,373 ****
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
---- 341,356 ----
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+--- 372,379 ----
echo ""; \
- cat $(ROOT)/conf/$$conf-dist ) |\
- sed -e '/# LoadModule/r .install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-! -e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
- -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-! -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
-! -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
- >.install.tmp && \
- echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
- $(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+ cat $(TOP)/conf/$${conf}-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
***************
-*** 356,363 ****
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
-! $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
- @echo "<=== [config]"
-
-
---- 361,374 ----
- echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
- fi; \
- done
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
-! if [ ! -f "$(sysconfdir)/mime.types" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
-! fi
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
-! if [ ! -f "$(sysconfdir)/magic" ]; then \
-! $(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
-! fi
- @echo "<=== [config]"
-
-
+*** 375,384 ****
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -e 's;logs/access_log;$(logfiledir)/access_log;' \
+! -e 's;logs/error_log;$(logfiledir)/error_log;' \
+! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
+! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
+--- 381,390 ----
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+! -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;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag
index 7f0c21c34f13..11aedaa76270 100644
--- a/www/apache22/files/patch-ag
+++ b/www/apache22/files/patch-ag
@@ -1,16 +1,16 @@
-*** conf/httpd.conf-dist.orig Wed Apr 1 17:16:39 1998
---- conf/httpd.conf-dist Tue Apr 21 23:43:19 1998
+*** conf/httpd.conf-dist.orig Thu May 7 01:12:39 1998
+--- conf/httpd.conf-dist Fri Jun 5 19:34:17 1998
***************
-*** 42,48 ****
- # suggested workaround is to create a user www and use that user.
+*** 50,56 ****
+ # don't use Group #-1 on these systems!
User nobody
! Group #-1
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
---- 42,48 ----
- # suggested workaround is to create a user www and use that user.
+--- 50,56 ----
+ # don't use Group #-1 on these systems!
User nobody
! Group nogroup
@@ -18,7 +18,7 @@
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
***************
-*** 86,92 ****
+*** 94,100 ****
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -26,7 +26,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
---- 86,92 ----
+--- 94,100 ----
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
@@ -35,7 +35,7 @@
# If you would like to have an agent and referer logfile uncomment the
# following directives.
***************
-*** 97,103 ****
+*** 105,111 ****
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -43,7 +43,7 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
---- 97,103 ----
+--- 105,111 ----
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
@@ -51,20 +51,3 @@
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
-***************
-*** 106,112 ****
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 106,112 ----
- # Not all architectures require this. But if yours does (you'll know because
- # this file is created when you run Apache) then you *must* ensure that
- # no two invocations of Apache share the same scoreboard file.
-! #ScoreBoardFile logs/apache_runtime_status
-
- # The LockFile directive sets the path to the lockfile used when Apache
- # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 14:44:52 +0000