summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1999-09-03 16:07:53 +0000
committerache <ache@FreeBSD.org>1999-09-03 16:07:53 +0000
commit1cbf7fc9a6eb815db616fa7debfab019e646eef0 (patch)
tree31fe3920bf12c5245d907bad5c247e874465e0ce /www
parent9009629707ff6302801a468f8d4e365e1078e31f (diff)
downloadFreeBSD-ports-1cbf7fc9a6eb815db616fa7debfab019e646eef0.zip
FreeBSD-ports-1cbf7fc9a6eb815db616fa7debfab019e646eef0.tar.gz
upgrade to 1.3.9
Diffstat (limited to 'www')
-rw-r--r--www/apache13/Makefile18
-rw-r--r--www/apache13/distinfo2
-rw-r--r--www/apache13/files/FreeBSD.layout19
-rw-r--r--www/apache13/files/patch-aa17
-rw-r--r--www/apache13/files/patch-ab38
-rw-r--r--www/apache13/files/patch-ag17
-rw-r--r--www/apache13/files/patch-ak13
-rw-r--r--www/apache13/files/patch-al74
-rw-r--r--www/apache13/pkg-plist17
-rw-r--r--www/apache2/Makefile18
-rw-r--r--www/apache2/distinfo2
-rw-r--r--www/apache2/files/FreeBSD.layout19
-rw-r--r--www/apache2/files/patch-aa17
-rw-r--r--www/apache2/files/patch-ab38
-rw-r--r--www/apache2/files/patch-ag17
-rw-r--r--www/apache2/files/patch-ak13
-rw-r--r--www/apache2/files/patch-al74
-rw-r--r--www/apache2/pkg-plist17
-rw-r--r--www/apache20/Makefile18
-rw-r--r--www/apache20/distinfo2
-rw-r--r--www/apache20/files/FreeBSD.layout19
-rw-r--r--www/apache20/files/patch-aa17
-rw-r--r--www/apache20/files/patch-ab38
-rw-r--r--www/apache20/files/patch-ag17
-rw-r--r--www/apache20/files/patch-ak13
-rw-r--r--www/apache20/files/patch-al74
-rw-r--r--www/apache20/pkg-plist17
-rw-r--r--www/apache21/Makefile18
-rw-r--r--www/apache21/distinfo2
-rw-r--r--www/apache21/files/FreeBSD.layout19
-rw-r--r--www/apache21/files/patch-aa17
-rw-r--r--www/apache21/files/patch-ab38
-rw-r--r--www/apache21/files/patch-ag17
-rw-r--r--www/apache21/files/patch-ak13
-rw-r--r--www/apache21/files/patch-al74
-rw-r--r--www/apache21/pkg-plist17
-rw-r--r--www/apache22/Makefile18
-rw-r--r--www/apache22/distinfo2
-rw-r--r--www/apache22/files/FreeBSD.layout19
-rw-r--r--www/apache22/files/patch-aa17
-rw-r--r--www/apache22/files/patch-ab38
-rw-r--r--www/apache22/files/patch-ag17
-rw-r--r--www/apache22/files/patch-ak13
-rw-r--r--www/apache22/files/patch-al74
-rw-r--r--www/apache22/pkg-plist17
45 files changed, 500 insertions, 575 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 75f7a68..489167c 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: apache HTTPD
# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
-# Whom: ache@nagual.pp.ru
+# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.6
-PKGNAME= apache-1.3.6
+DISTNAME= apache_1.3.9
+PKGNAME= apache-1.3.9
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -36,23 +36,15 @@ Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
- --with-layout=GNU \
- --sysconfdir=${PREFIX}/etc/apache \
- --includedir=${PREFIX}/include/apache \
- --localstatedir=/var \
- --datadir=${PREFIX}/www \
+ --with-perl=${PERL} \
+ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
-# Currently perl version don't matter
-# --with-perl=${PERL5}
-
OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index ddcb734..df01311 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
diff --git a/www/apache13/files/FreeBSD.layout b/www/apache13/files/FreeBSD.layout
new file mode 100644
index 0000000..5524e18
--- /dev/null
+++ b/www/apache13/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# 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/apache13/files/patch-aa b/www/apache13/files/patch-aa
index 1a05440..b0478de 100644
--- a/www/apache13/files/patch-aa
+++ b/www/apache13/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig Sat Jan 2 16:19:41 1999
-+++ configure Fri Jan 15 00:44:01 1999
-@@ -1012,8 +1012,8 @@
+--- configure.orig Sat Aug 14 12:29:05 1999
++++ configure Fri Sep 3 15:38:10 1999
+@@ -1084,7 +1084,7 @@
+ ## UID/GID as production oriented as a web server in NIS anyway.
+ ##
+ conf_user="nobody"
+-conf_group="#-1"
++conf_group="nogroup"
+ conf_port="80"
+ conf_serveradmin="you@your.address"
+ conf_servername="new.host.name"
+@@ -1153,8 +1153,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -11,7 +20,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,8 @@
+@@ -1244,8 +1244,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index 8e8b8a4..935f243 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -1,14 +1,6 @@
---- 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@
+--- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999
++++ Makefile.tmpl Fri Sep 3 14:57:01 1999
+@@ -120,6 +120,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
@@ -16,7 +8,7 @@
libexecdir_relative = @libexecdir_relative@
-@@ -249,9 +250,9 @@
+@@ -255,9 +256,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -26,9 +18,9 @@
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-@@ -379,26 +380,34 @@
+@@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -76,18 +68,18 @@
@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;' \
+@@ -498,10 +507,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/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;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;Group #-1;Group $(conf_group);' \
+ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
+ -e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache13/files/patch-ag b/www/apache13/files/patch-ag
index fe3b957..436f8f3 100644
--- a/www/apache13/files/patch-ag
+++ b/www/apache13/files/patch-ag
@@ -1,15 +1,6 @@
---- 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 @@
+--- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999
++++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999
+@@ -467,7 +467,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -18,7 +9,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -472,7 +472,7 @@
+@@ -480,7 +480,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
diff --git a/www/apache13/files/patch-ak b/www/apache13/files/patch-ak
index 09c3852..486f7ad 100644
--- a/www/apache13/files/patch-ak
+++ b/www/apache13/files/patch-ak
@@ -1,5 +1,5 @@
---- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
-+++ src/support/apachectl Fri Mar 26 00:08:20 1999
+--- 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 ||||||||||||||||||||
@@ -9,15 +9,6 @@
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
diff --git a/www/apache13/files/patch-al b/www/apache13/files/patch-al
index 039d632..b355a69 100644
--- a/www/apache13/files/patch-al
+++ b/www/apache13/files/patch-al
@@ -1,50 +1,24 @@
-*** 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;
+--- 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;
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index dfc1e27..71b62df 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -15,6 +15,7 @@ include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
+include/apache/ap_sha1.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -39,6 +40,18 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -52,6 +65,7 @@ libexec/apache/mod_rewrite.so
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
sbin/ab
sbin/apachectl
sbin/apxs
@@ -126,6 +140,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_digest.html
share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
@@ -160,6 +175,7 @@ share/doc/apache/manual/mod/mod_status.html
share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
@@ -302,6 +318,7 @@ www/icons/world1.gif
www/icons/world2.gif
@exec mkdir -p %D/www/proxy
@dirrm etc/apache
+@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 75f7a68..489167c 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: apache HTTPD
# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
-# Whom: ache@nagual.pp.ru
+# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.6
-PKGNAME= apache-1.3.6
+DISTNAME= apache_1.3.9
+PKGNAME= apache-1.3.9
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -36,23 +36,15 @@ Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
- --with-layout=GNU \
- --sysconfdir=${PREFIX}/etc/apache \
- --includedir=${PREFIX}/include/apache \
- --localstatedir=/var \
- --datadir=${PREFIX}/www \
+ --with-perl=${PERL} \
+ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
-# Currently perl version don't matter
-# --with-perl=${PERL5}
-
OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index ddcb734..df01311 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
diff --git a/www/apache2/files/FreeBSD.layout b/www/apache2/files/FreeBSD.layout
new file mode 100644
index 0000000..5524e18
--- /dev/null
+++ b/www/apache2/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# 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/apache2/files/patch-aa b/www/apache2/files/patch-aa
index 1a05440..b0478de 100644
--- a/www/apache2/files/patch-aa
+++ b/www/apache2/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig Sat Jan 2 16:19:41 1999
-+++ configure Fri Jan 15 00:44:01 1999
-@@ -1012,8 +1012,8 @@
+--- configure.orig Sat Aug 14 12:29:05 1999
++++ configure Fri Sep 3 15:38:10 1999
+@@ -1084,7 +1084,7 @@
+ ## UID/GID as production oriented as a web server in NIS anyway.
+ ##
+ conf_user="nobody"
+-conf_group="#-1"
++conf_group="nogroup"
+ conf_port="80"
+ conf_serveradmin="you@your.address"
+ conf_servername="new.host.name"
+@@ -1153,8 +1153,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -11,7 +20,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,8 @@
+@@ -1244,8 +1244,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
index 8e8b8a4..935f243 100644
--- a/www/apache2/files/patch-ab
+++ b/www/apache2/files/patch-ab
@@ -1,14 +1,6 @@
---- 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@
+--- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999
++++ Makefile.tmpl Fri Sep 3 14:57:01 1999
+@@ -120,6 +120,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
@@ -16,7 +8,7 @@
libexecdir_relative = @libexecdir_relative@
-@@ -249,9 +250,9 @@
+@@ -255,9 +256,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -26,9 +18,9 @@
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-@@ -379,26 +380,34 @@
+@@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -76,18 +68,18 @@
@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;' \
+@@ -498,10 +507,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/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;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;Group #-1;Group $(conf_group);' \
+ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
+ -e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache2/files/patch-ag b/www/apache2/files/patch-ag
index fe3b957..436f8f3 100644
--- a/www/apache2/files/patch-ag
+++ b/www/apache2/files/patch-ag
@@ -1,15 +1,6 @@
---- 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 @@
+--- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999
++++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999
+@@ -467,7 +467,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -18,7 +9,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -472,7 +472,7 @@
+@@ -480,7 +480,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
diff --git a/www/apache2/files/patch-ak b/www/apache2/files/patch-ak
index 09c3852..486f7ad 100644
--- a/www/apache2/files/patch-ak
+++ b/www/apache2/files/patch-ak
@@ -1,5 +1,5 @@
---- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
-+++ src/support/apachectl Fri Mar 26 00:08:20 1999
+--- 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 ||||||||||||||||||||
@@ -9,15 +9,6 @@
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
diff --git a/www/apache2/files/patch-al b/www/apache2/files/patch-al
index 039d632..b355a69 100644
--- a/www/apache2/files/patch-al
+++ b/www/apache2/files/patch-al
@@ -1,50 +1,24 @@
-*** 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;
+--- 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;
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index dfc1e27..71b62df 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -15,6 +15,7 @@ include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
+include/apache/ap_sha1.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -39,6 +40,18 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -52,6 +65,7 @@ libexec/apache/mod_rewrite.so
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
sbin/ab
sbin/apachectl
sbin/apxs
@@ -126,6 +140,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_digest.html
share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
@@ -160,6 +175,7 @@ share/doc/apache/manual/mod/mod_status.html
share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
@@ -302,6 +318,7 @@ www/icons/world1.gif
www/icons/world2.gif
@exec mkdir -p %D/www/proxy
@dirrm etc/apache
+@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 75f7a68..489167c 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: apache HTTPD
# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
-# Whom: ache@nagual.pp.ru
+# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.6
-PKGNAME= apache-1.3.6
+DISTNAME= apache_1.3.9
+PKGNAME= apache-1.3.9
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -36,23 +36,15 @@ Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
- --with-layout=GNU \
- --sysconfdir=${PREFIX}/etc/apache \
- --includedir=${PREFIX}/include/apache \
- --localstatedir=/var \
- --datadir=${PREFIX}/www \
+ --with-perl=${PERL} \
+ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
-# Currently perl version don't matter
-# --with-perl=${PERL5}
-
OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index ddcb734..df01311 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
diff --git a/www/apache20/files/FreeBSD.layout b/www/apache20/files/FreeBSD.layout
new file mode 100644
index 0000000..5524e18
--- /dev/null
+++ b/www/apache20/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# 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/apache20/files/patch-aa b/www/apache20/files/patch-aa
index 1a05440..b0478de 100644
--- a/www/apache20/files/patch-aa
+++ b/www/apache20/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig Sat Jan 2 16:19:41 1999
-+++ configure Fri Jan 15 00:44:01 1999
-@@ -1012,8 +1012,8 @@
+--- configure.orig Sat Aug 14 12:29:05 1999
++++ configure Fri Sep 3 15:38:10 1999
+@@ -1084,7 +1084,7 @@
+ ## UID/GID as production oriented as a web server in NIS anyway.
+ ##
+ conf_user="nobody"
+-conf_group="#-1"
++conf_group="nogroup"
+ conf_port="80"
+ conf_serveradmin="you@your.address"
+ conf_servername="new.host.name"
+@@ -1153,8 +1153,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -11,7 +20,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,8 @@
+@@ -1244,8 +1244,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
index 8e8b8a4..935f243 100644
--- a/www/apache20/files/patch-ab
+++ b/www/apache20/files/patch-ab
@@ -1,14 +1,6 @@
---- 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@
+--- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999
++++ Makefile.tmpl Fri Sep 3 14:57:01 1999
+@@ -120,6 +120,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
@@ -16,7 +8,7 @@
libexecdir_relative = @libexecdir_relative@
-@@ -249,9 +250,9 @@
+@@ -255,9 +256,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -26,9 +18,9 @@
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-@@ -379,26 +380,34 @@
+@@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -76,18 +68,18 @@
@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;' \
+@@ -498,10 +507,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/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;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;Group #-1;Group $(conf_group);' \
+ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
+ -e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache20/files/patch-ag b/www/apache20/files/patch-ag
index fe3b957..436f8f3 100644
--- a/www/apache20/files/patch-ag
+++ b/www/apache20/files/patch-ag
@@ -1,15 +1,6 @@
---- 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 @@
+--- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999
++++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999
+@@ -467,7 +467,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -18,7 +9,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -472,7 +472,7 @@
+@@ -480,7 +480,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
diff --git a/www/apache20/files/patch-ak b/www/apache20/files/patch-ak
index 09c3852..486f7ad 100644
--- a/www/apache20/files/patch-ak
+++ b/www/apache20/files/patch-ak
@@ -1,5 +1,5 @@
---- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
-+++ src/support/apachectl Fri Mar 26 00:08:20 1999
+--- 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 ||||||||||||||||||||
@@ -9,15 +9,6 @@
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
diff --git a/www/apache20/files/patch-al b/www/apache20/files/patch-al
index 039d632..b355a69 100644
--- a/www/apache20/files/patch-al
+++ b/www/apache20/files/patch-al
@@ -1,50 +1,24 @@
-*** 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;
+--- 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;
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index dfc1e27..71b62df 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -15,6 +15,7 @@ include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
+include/apache/ap_sha1.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -39,6 +40,18 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -52,6 +65,7 @@ libexec/apache/mod_rewrite.so
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
sbin/ab
sbin/apachectl
sbin/apxs
@@ -126,6 +140,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_digest.html
share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
@@ -160,6 +175,7 @@ share/doc/apache/manual/mod/mod_status.html
share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
@@ -302,6 +318,7 @@ www/icons/world1.gif
www/icons/world2.gif
@exec mkdir -p %D/www/proxy
@dirrm etc/apache
+@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 75f7a68..489167c 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: apache HTTPD
# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
-# Whom: ache@nagual.pp.ru
+# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.6
-PKGNAME= apache-1.3.6
+DISTNAME= apache_1.3.9
+PKGNAME= apache-1.3.9
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -36,23 +36,15 @@ Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
- --with-layout=GNU \
- --sysconfdir=${PREFIX}/etc/apache \
- --includedir=${PREFIX}/include/apache \
- --localstatedir=/var \
- --datadir=${PREFIX}/www \
+ --with-perl=${PERL} \
+ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
-# Currently perl version don't matter
-# --with-perl=${PERL5}
-
OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index ddcb734..df01311 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
diff --git a/www/apache21/files/FreeBSD.layout b/www/apache21/files/FreeBSD.layout
new file mode 100644
index 0000000..5524e18
--- /dev/null
+++ b/www/apache21/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# 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/patch-aa b/www/apache21/files/patch-aa
index 1a05440..b0478de 100644
--- a/www/apache21/files/patch-aa
+++ b/www/apache21/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig Sat Jan 2 16:19:41 1999
-+++ configure Fri Jan 15 00:44:01 1999
-@@ -1012,8 +1012,8 @@
+--- configure.orig Sat Aug 14 12:29:05 1999
++++ configure Fri Sep 3 15:38:10 1999
+@@ -1084,7 +1084,7 @@
+ ## UID/GID as production oriented as a web server in NIS anyway.
+ ##
+ conf_user="nobody"
+-conf_group="#-1"
++conf_group="nogroup"
+ conf_port="80"
+ conf_serveradmin="you@your.address"
+ conf_servername="new.host.name"
+@@ -1153,8 +1153,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -11,7 +20,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,8 @@
+@@ -1244,8 +1244,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
index 8e8b8a4..935f243 100644
--- a/www/apache21/files/patch-ab
+++ b/www/apache21/files/patch-ab
@@ -1,14 +1,6 @@
---- 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@
+--- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999
++++ Makefile.tmpl Fri Sep 3 14:57:01 1999
+@@ -120,6 +120,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
@@ -16,7 +8,7 @@
libexecdir_relative = @libexecdir_relative@
-@@ -249,9 +250,9 @@
+@@ -255,9 +256,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -26,9 +18,9 @@
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-@@ -379,26 +380,34 @@
+@@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -76,18 +68,18 @@
@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;' \
+@@ -498,10 +507,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/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;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;Group #-1;Group $(conf_group);' \
+ -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
index fe3b957..436f8f3 100644
--- a/www/apache21/files/patch-ag
+++ b/www/apache21/files/patch-ag
@@ -1,15 +1,6 @@
---- 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 @@
+--- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999
++++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999
+@@ -467,7 +467,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -18,7 +9,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -472,7 +472,7 @@
+@@ -480,7 +480,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
diff --git a/www/apache21/files/patch-ak b/www/apache21/files/patch-ak
index 09c3852..486f7ad 100644
--- a/www/apache21/files/patch-ak
+++ b/www/apache21/files/patch-ak
@@ -1,5 +1,5 @@
---- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
-+++ src/support/apachectl Fri Mar 26 00:08:20 1999
+--- 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 ||||||||||||||||||||
@@ -9,15 +9,6 @@
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
diff --git a/www/apache21/files/patch-al b/www/apache21/files/patch-al
index 039d632..b355a69 100644
--- a/www/apache21/files/patch-al
+++ b/www/apache21/files/patch-al
@@ -1,50 +1,24 @@
-*** 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;
+--- 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;
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index dfc1e27..71b62df 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -15,6 +15,7 @@ include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
+include/apache/ap_sha1.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -39,6 +40,18 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -52,6 +65,7 @@ libexec/apache/mod_rewrite.so
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
sbin/ab
sbin/apachectl
sbin/apxs
@@ -126,6 +140,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_digest.html
share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
@@ -160,6 +175,7 @@ share/doc/apache/manual/mod/mod_status.html
share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
@@ -302,6 +318,7 @@ www/icons/world1.gif
www/icons/world2.gif
@exec mkdir -p %D/www/proxy
@dirrm etc/apache
+@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 75f7a68..489167c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: apache HTTPD
# Version required: 1.3*
# Date created: Fri Aug 25 16:42:36 CDT 1995
-# Whom: ache@nagual.pp.ru
+# Whom: ache@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= apache_1.3.6
-PKGNAME= apache-1.3.6
+DISTNAME= apache_1.3.9
+PKGNAME= apache-1.3.9
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -36,23 +36,15 @@ Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
- --with-layout=GNU \
- --sysconfdir=${PREFIX}/etc/apache \
- --includedir=${PREFIX}/include/apache \
- --localstatedir=/var \
- --datadir=${PREFIX}/www \
+ --with-perl=${PERL} \
+ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
-# Currently perl version don't matter
-# --with-perl=${PERL5}
-
OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index ddcb734..df01311 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
diff --git a/www/apache22/files/FreeBSD.layout b/www/apache22/files/FreeBSD.layout
new file mode 100644
index 0000000..5524e18
--- /dev/null
+++ b/www/apache22/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# 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/apache22/files/patch-aa b/www/apache22/files/patch-aa
index 1a05440..b0478de 100644
--- a/www/apache22/files/patch-aa
+++ b/www/apache22/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig Sat Jan 2 16:19:41 1999
-+++ configure Fri Jan 15 00:44:01 1999
-@@ -1012,8 +1012,8 @@
+--- configure.orig Sat Aug 14 12:29:05 1999
++++ configure Fri Sep 3 15:38:10 1999
+@@ -1084,7 +1084,7 @@
+ ## UID/GID as production oriented as a web server in NIS anyway.
+ ##
+ conf_user="nobody"
+-conf_group="#-1"
++conf_group="nogroup"
+ conf_port="80"
+ conf_serveradmin="you@your.address"
+ conf_servername="new.host.name"
+@@ -1153,8 +1153,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -11,7 +20,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,8 @@
+@@ -1244,8 +1244,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index 8e8b8a4..935f243 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -1,14 +1,6 @@
---- 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@
+--- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999
++++ Makefile.tmpl Fri Sep 3 14:57:01 1999
+@@ -120,6 +120,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
@@ -16,7 +8,7 @@
libexecdir_relative = @libexecdir_relative@
-@@ -249,9 +250,9 @@
+@@ -255,9 +256,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -26,9 +18,9 @@
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-@@ -379,26 +380,34 @@
+@@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@@ -76,18 +68,18 @@
@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;' \
+@@ -498,10 +507,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/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;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;Group #-1;Group $(conf_group);' \
+ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
+ -e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag
index fe3b957..436f8f3 100644
--- a/www/apache22/files/patch-ag
+++ b/www/apache22/files/patch-ag
@@ -1,15 +1,6 @@
---- 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 @@
+--- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999
++++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999
+@@ -467,7 +467,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -18,7 +9,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -472,7 +472,7 @@
+@@ -480,7 +480,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
diff --git a/www/apache22/files/patch-ak b/www/apache22/files/patch-ak
index 09c3852..486f7ad 100644
--- a/www/apache22/files/patch-ak
+++ b/www/apache22/files/patch-ak
@@ -1,5 +1,5 @@
---- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
-+++ src/support/apachectl Fri Mar 26 00:08:20 1999
+--- 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 ||||||||||||||||||||
@@ -9,15 +9,6 @@
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
diff --git a/www/apache22/files/patch-al b/www/apache22/files/patch-al
index 039d632..b355a69 100644
--- a/www/apache22/files/patch-al
+++ b/www/apache22/files/patch-al
@@ -1,50 +1,24 @@
-*** 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;
+--- 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;
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index dfc1e27..71b62df 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -15,6 +15,7 @@ include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
+include/apache/ap_sha1.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
@@ -39,6 +40,18 @@ include/apache/util_date.h
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
@@ -52,6 +65,7 @@ libexec/apache/mod_rewrite.so
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
sbin/ab
sbin/apachectl
sbin/apxs
@@ -126,6 +140,7 @@ share/doc/apache/manual/mod/mod_auth.html
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_digest.html
share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
@@ -160,6 +175,7 @@ share/doc/apache/manual/mod/mod_status.html
share/doc/apache/manual/mod/mod_unique_id.html
share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
@@ -302,6 +318,7 @@ www/icons/world1.gif
www/icons/world2.gif
@exec mkdir -p %D/www/proxy
@dirrm etc/apache
+@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
OpenPOWER on IntegriCloud