Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl

now makes use of OpenSSL.

22 files changed, 198 insertions, 378 deletions

diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 3872a59ae07..8ec80a72ca1 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/04/14 18:00:48 bad Exp $
+# $NetBSD: Makefile,v 1.12 1999/04/30 17:05:20 tv Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
 
-DEPENDS+=	apache-1.3.3.2:../../www/apache
+DEPENDS+=	apache-1.3.6p0:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
 
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index f767dc3df74..ce03d801173 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/14 18:00:48 bad Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/30 17:05:21 tv Exp $
 #
 
 DISTNAME=	mod_fastcgi-2.0.18
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.fastcgi.com/
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.fastcgi.com/
 
-DEPENDS+=	apache-1.3.3.2:../../www/apache
+DEPENDS+=	apache-1.3.6p0:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
 
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index ea8c4170bcd..e48041924c3 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/30 17:05:21 tv Exp $
 #
 
-DISTNAME=       	mod_perl-1.16
-PKGNAME=        	ap-perl-1.16
+DISTNAME=       	mod_perl-1.19
+PKGNAME=        	ap-perl-1.19
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/}
 
@@ -10,35 +10,16 @@ MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://perl.apache.org/
 
 DEPENDS=		libperl-5.00404:../../lang/libperl \
-			apache-1.3.3.2:../../www/apache
+			apache-1.3.6p0:../../www/apache
 USE_PERL5=		yes
 
-post-extract:
-	@${LN} -sf ../../../Apache/typemap ${WRKSRC}/src/modules/perl/
-	@${LN} -sf ${PREFIX}/include/httpd ${WRKSRC}/include
-	@for module in Connection File Log ModuleConfig PerlRunXS Tie URI \
-		Util Server; do \
-		${LN} -sf ../src/modules/perl/$$module.xs ${WRKSRC}/$$module/; \
-	done
-
 do-configure:
-	@${RM} -f ${WRKSRC}/lib/Apache/src.pm.orig
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} NO_HTTPD=1 \
-		APACHE_PREFIX=${PREFIX} ${PREFIX}/bin/perl Makefile.PL
-
-post-build:
-	@cd ${WRKSRC}/src/modules/perl && \
-	${MAKE} PERL=${PREFIX}/bin/perl STATIC_EXTS="Apache Apache::Constants" \
-		Apache.c Constants.c perlxsi.c && \
-	PERLLIBDIR=`${PREFIX}/bin/perl -MConfig -e 'print $$Config{archlibexp}'` && \
-	${PREFIX}/sbin/apxs -c -o mod_perl.so -I$$PERLLIBDIR/CORE -DMOD_PERL \
-		-DPERL_TRACE Apache.c Constants.c [mop]*.c $$PERLLIBDIR/DynaLoader_pic.o
+	@cd ${WRKSRC} && ${PREFIX}/bin/perl Makefile.PL USE_APXS=1 \
+		WITH_APXS=${PREFIX}/sbin/apxs EVERYTHING=1
 
 post-install:
-	@cd ${WRKSRC}/src/modules/perl && ${PREFIX}/sbin/apxs -i mod_perl.so
 	${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
 		${PREFIX}/share/httpd/htdocs/manual/mod/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_perl
 .if exists(/usr/libexec/ld.elf_so)
 	${SED}	-e 's,@@MACHINE_ARCH@@,${MACHINE_ARCH},' \
 		-e 's,@@PERL_EXT@@,,' ${FILESDIR}/httpd.conf.add >${WRKSRC}/httpd.conf.add
diff --git a/www/ap-perl/files/md5 b/www/ap-perl/files/md5
index 4f140b50670..a7d7a0d61f1 100644
--- a/www/ap-perl/files/md5
+++ b/www/ap-perl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
+$NetBSD: md5,v 1.2 1999/04/30 17:05:21 tv Exp $
 
-MD5 (mod_perl-1.16.tar.gz) = 0ef261732f91bdefa655e98d9d51d5d2
+MD5 (mod_perl-1.19.tar.gz) = 721fe5245aefdffecf5f54a9c29c5938
diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa
index 4ff8535446a..0e3b141ce26 100644
--- a/www/ap-perl/patches/patch-aa
+++ b/www/ap-perl/patches/patch-aa
@@ -1,13 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
-
---- lib/Apache/src.pm.orig	Thu Oct  1 13:55:29 1998
-+++ lib/Apache/src.pm	Thu Dec  3 15:32:42 1998
-@@ -184,7 +184,7 @@
-     my $src  = $self->dir;
-     my $main = $self->main;
-     my $os = $Is_Win32 ? "win32" : "unix";
--    my @inc = ("-I$src", "-I$src/modules/perl", "-I$main");
-+    my @inc = ("-I../include", "-I../src/modules/perl -DMOD_PERL");
-     for ("src/regex", "$src/os/$os") {
- 	push @inc, "-I$_" if -d $_;
-     }
+--- apaci/Makefile.tmpl.orig	Mon Apr 26 18:22:37 1999
++++ apaci/Makefile.tmpl	Mon Apr 26 18:32:27 1999
+@@ -58,7 +58,7 @@
+ 
+ libperl.so: $(MP_OBJS_PIC)
+ 	$(MP_RM) $@
+-	$(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS)
++	$(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC)
+ 
+ .SUFFIXES: .xs .c .o .lo
+ 
+@@ -94,7 +94,8 @@
+ 
+ #   FOR STAND-ALONE BUILDING ONLY
+ install:
+-	$(APXS) -i -a -n perl libperl.so
++	@cp libperl.so mod_perl.so
++	$(APXS) -i -n perl mod_perl.so
+ 
+ depend:
+ 	cp Makefile.tmpl Makefile.tmpl.bak \
diff --git a/www/ap-perl/patches/patch-ab b/www/ap-perl/patches/patch-ab
deleted file mode 100644
index 55f1af72491..00000000000
--- a/www/ap-perl/patches/patch-ab
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/12/07 16:36:15 tv Exp $
-
---- src/modules/perl/mod_perl.c.orig	Wed Sep 30 23:13:14 1998
-+++ src/modules/perl/mod_perl.c	Thu Dec  3 17:30:09 1998
-@@ -58,6 +58,57 @@
- 
- #define CORE_PRIVATE 
- #include "mod_perl.h"
-+#include <ap_include_extern.h>
-+
-+/* --- ripped from mod_include.c --- */
-+/* 
-+ * sub key may be anything a Perl*Handler can be:
-+ * subroutine name, package name (defaults to package::handler),
-+ * Class->method call or anoymous sub {}
-+ *
-+ * Child <!--#perl sub="sub {print $$}" --> accessed
-+ * <!--#perl sub="sub {print ++$Access::Cnt }" --> times. <br>
-+ *
-+ * <!--#perl arg="one" sub="mymod::includer" -->
-+ *
-+ * -Doug MacEachern
-+ */
-+
-+static int handle_perl(FILE *in, request_rec *r, const char *error, const char *timefmt)
-+{
-+    char tag[MAX_STRING_LEN];
-+    char parsed_string[MAX_STRING_LEN];
-+    char *tag_val;
-+    SV *sub = Nullsv;
-+    AV *av = newAV();
-+
-+    if (ap_allow_options(r) & OPT_INCNOEXEC) {
-+        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-+                    "httpd: #perl SSI disallowed by IncludesNoExec in %s",
-+                    r->filename);
-+        return DECLINED;
-+    }
-+    while (1) {
-+        if (!(tag_val = ap_include_get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+            break;
-+        }
-+        if (strnEQ(tag, "sub", 3)) {
-+            sub = newSVpv(tag_val, 0);
-+        }
-+        else if (strnEQ(tag, "arg", 3)) {
-+            ap_include_parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
-+            av_push(av, newSVpv(parsed_string, 0));
-+        }
-+        else if (strnEQ(tag, "done", 4)) {
-+            break;
-+        }
-+    }
-+    perl_stdout2client(r);
-+    perl_setup_env(r);
-+    perl_call_handler(sub, r, av);
-+    return OK;
-+}
-+/* --- end from mod_include.c --- */
- 
- #ifdef WIN32
- void *mod_perl_mutex = &mod_perl_mutex;
-@@ -486,6 +537,11 @@
- #endif
-     ap_add_version_component(MOD_PERL_STRING_VERSION);
- #endif
-+
-+    if (ap_include_register_extern("perl", handle_perl)) {
-+	fprintf(stderr, "mod_perl: Cannot register XSSI handler\n");
-+	exit(1);
-+    }
- 
- #ifndef WIN32
-     argv[0] = server_argv0;
diff --git a/www/ap-perl/pkg/PLIST b/www/ap-perl/pkg/PLIST
index 5b8c741a5af..2e45e4e8c49 100644
--- a/www/ap-perl/pkg/PLIST
+++ b/www/ap-perl/pkg/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 1999/04/08 18:51:59 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/04/30 17:05:21 tv Exp $
 etc/httpd/httpd.conf.modperl
 lib/httpd/mod_perl.so
 lib/perl5/man/man3/Apache.3
 lib/perl5/man/man3/Apache::Constants.3
 lib/perl5/man/man3/Apache::Debug.3
 lib/perl5/man/man3/Apache::ExtUtils.3
+lib/perl5/man/man3/Apache::FakeRequest.3
 lib/perl5/man/man3/Apache::Include.3
+lib/perl5/man/man3/Apache::Leak.3
 lib/perl5/man/man3/Apache::Log.3
 lib/perl5/man/man3/Apache::Options.3
 lib/perl5/man/man3/Apache::PerlRun.3
@@ -20,7 +22,8 @@ lib/perl5/man/man3/Apache::SizeLimit.3
 lib/perl5/man/man3/Apache::StatINC.3
 lib/perl5/man/man3/Apache::Status.3
 lib/perl5/man/man3/Apache::Symbol.3
-lib/perl5/man/man3/Apache::Tie.3
+lib/perl5/man/man3/Apache::Symdump.3
+lib/perl5/man/man3/Apache::Table.3
 lib/perl5/man/man3/Apache::URI.3
 lib/perl5/man/man3/Apache::Util.3
 lib/perl5/man/man3/Apache::httpd_conf.3
@@ -41,6 +44,7 @@ lib/perl5/site_perl/Apache/ExtUtils.pm
 lib/perl5/site_perl/Apache/FakeRequest.pm
 lib/perl5/site_perl/Apache/File.pm
 lib/perl5/site_perl/Apache/Include.pm
+lib/perl5/site_perl/Apache/Leak.pm
 lib/perl5/site_perl/Apache/Log.pm
 lib/perl5/site_perl/Apache/ModuleConfig.pm
 lib/perl5/site_perl/Apache/MyConfig.pm
@@ -61,33 +65,18 @@ lib/perl5/site_perl/Apache/SizeLimit.pm
 lib/perl5/site_perl/Apache/StatINC.pm
 lib/perl5/site_perl/Apache/Status.pm
 lib/perl5/site_perl/Apache/Symbol.pm
-lib/perl5/site_perl/Apache/Tie.pm
+lib/perl5/site_perl/Apache/Symdump.pm
+lib/perl5/site_perl/Apache/Table.pm
 lib/perl5/site_perl/Apache/URI.pm
 lib/perl5/site_perl/Apache/Util.pm
 lib/perl5/site_perl/Apache/httpd_conf.pm
 lib/perl5/site_perl/Apache/src.pm
 lib/perl5/site_perl/Apache/test.pm
 lib/perl5/site_perl/Bundle/Apache.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Connection/Connection.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Connection/Connection.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/File/File.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/File/File.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Log/Log.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Log/Log.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/ModuleConfig/ModuleConfig.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/ModuleConfig/ModuleConfig.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/PerlRunXS/PerlRunXS.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/PerlRunXS/PerlRunXS.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Server/Server.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Server/Server.so
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak/Leak.bs
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak/Leak.so
 lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol/Symbol.bs
 lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol/Symbol.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Tie/Tie.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Tie/Tie.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/URI/URI.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/URI/URI.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Util/Util.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Util/Util.so
 lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/mod_perl/.packlist
 lib/perl5/site_perl/cgi_to_mod_perl.pod
 lib/perl5/site_perl/mod_perl.pm
@@ -102,16 +91,7 @@ share/httpd/htdocs/manual/mod/mod_perl.html
 @dirrm lib/perl5/site_perl/Apache/Constants
 @dirrm lib/perl5/site_perl/Apache
 @dirrm lib/perl5/site_perl/Bundle
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Connection
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/File
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Log
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/ModuleConfig
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/PerlRunXS
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Server
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Tie
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/URI
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Util
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/mod_perl
-@dirrm share/doc/mod_perl
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 577b2102df5..f36e6ed9af7 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.6 1999/04/14 18:00:48 bad Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/30 17:05:21 tv Exp $
 #
 
-DISTNAME=	mod_ssl-2.1.3-1.3.3
-PKGNAME=	ap-ssl-2.1.3
+DISTNAME=	mod_ssl-2.2.8-1.3.6
+PKGNAME=	ap-ssl-2.2.8
 CATEGORIES=	www
-MASTER_SITES=	http://www.engelschall.com/sw/mod_ssl/distrib/
+MASTER_SITES=	ftp://ftp.engelschall.com/sw/mod_ssl/
 
 MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.sngelschall.com/sw/mod_ssl/
+HOMEPAGE=	http://www.engelschall.com/sw/mod_ssl/
 
-DEPENDS=	ssleay-0.9.0b:../../security/ssleay \
-		apache-1.3.3.2:../../www/apache
+DEPENDS=	openssl-0.9.2b:../../security/openssl \
+		apache-1.3.6p0:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
 
@@ -30,7 +30,7 @@ fetch-depends:
 .endif
 
 LDFLAGS+=	-L${PREFIX}/lib -lcrypto -lssl
-CPPFLAGS+=	-I${PREFIX}/include/ssleay
+CPPFLAGS+=	-I${PREFIX}/include/openssl
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 LDFLAGS+=	-lrsaref
 .endif
@@ -39,9 +39,9 @@ LDFLAGS+=	-lrsaref
 # to get all the appropriate config information and compile with apxs.
 do-build:
 	@cd ${WRKSRC}/pkg.sslmod && ${PREFIX}/sbin/apxs -c -o mod_ssl.so \
-		${CPPFLAGS} -DSSL_COMPAT -DMOD_SSL_VERSION=\\\"2.1.2\\\" \
+		${CPPFLAGS} -DSSL_COMPAT -DMOD_SSL_VERSION=\\\"2.2.8\\\" \
 		-DSSL_PRODUCT_NAME=\\\"mod_ssl\\\" \
-		-DSSL_PRODUCT_VERSION=\\\"2.1.2\\\" *.c
+		-DSSL_PRODUCT_VERSION=\\\"2.2.8\\\" *.c
 	cd ${WRKSRC}/pkg.sslsup && ${LINK.c} -o ca-fix ca-fix.c
 
 do-install:
@@ -49,7 +49,10 @@ do-install:
 	@cd ${WRKSRC}/pkg.sslmod && ${PREFIX}/sbin/apxs -i mod_ssl.so
 	${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl
 	cd ${WRKSRC}/pkg.ssldoc && \
-		${INSTALL_DATA} *.html *.gif ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl/
+		${INSTALL_DATA} *.html *.gif *.jpg ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/mod_ssl
+	cd ${WRKSRC}/pkg.contrib && \
+		${INSTALL_SCRIPT} *.sh *.cgi ${PREFIX}/share/mod_ssl/
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/Makefile ${WRKSRC}/pkg.sslcfg/README.CRT \
 		${WRKSRC}/pkg.sslcfg/*.crt ${PREFIX}/etc/httpd/ssl.crt/
 	${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CSR \
diff --git a/www/ap-ssl/files/md5 b/www/ap-ssl/files/md5
index 43cb67e779d..96c0ff30892 100644
--- a/www/ap-ssl/files/md5
+++ b/www/ap-ssl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/12/07 21:29:09 tv Exp $
+$NetBSD: md5,v 1.3 1999/04/30 17:05:21 tv Exp $
 
-MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
+MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
diff --git a/www/ap-ssl/pkg/MESSAGE b/www/ap-ssl/pkg/MESSAGE
index b2f4ef2f6f9..44a8e4fbc2a 100644
--- a/www/ap-ssl/pkg/MESSAGE
+++ b/www/ap-ssl/pkg/MESSAGE
@@ -1,5 +1,5 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+$NetBSD: MESSAGE,v 1.2 1999/04/30 17:05:21 tv Exp $
 
 In order to start Apache with mod_ssl support, you need to run Apache with
 "apachectl startssl" instead of "apachectl start".  The SSL-specific
@@ -8,7 +8,7 @@ configuration parts of the default httpd.conf are bracketed by:
   <IfDefine SSL>
   </IfDefine>
 
-If you are using RSAREF, you MUST uncomment the line near the top of
+If you are using RSAREF, you MUST uncomment the line in the SSL block of
 httpd.conf which reads:
 
   #LoadFile !librsaref.so.2
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
index 305060babcb..5ba47328de8 100644
--- a/www/ap-ssl/pkg/PLIST
+++ b/www/ap-ssl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/04/30 17:05:22 tv Exp $
 bin/ca-fix
 etc/httpd/ssl.crt/Makefile
 etc/httpd/ssl.crt/README.CRT
@@ -16,12 +16,16 @@ lib/httpd/mod_ssl.so
 share/httpd/htdocs/manual/mod/mod_ssl/apache_pb.gif
 share/httpd/htdocs/manual/mod/mod_ssl/index.html
 share/httpd/htdocs/manual/mod/mod_ssl/mod_ssl_sb.gif
+share/httpd/htdocs/manual/mod/mod_ssl/openssl_ics.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_title.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_glossary.html
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_howto.gfont000.gif
+share/httpd/htdocs/manual/mod/mod_ssl/ssl_howto.html
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.gfont000.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.html
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif
@@ -57,5 +61,10 @@ share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
 share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssleay.gif
+share/mod_ssl/cca.sh
+share/mod_ssl/gid-mkcert.sh
+share/mod_ssl/loadcacert.cgi
+share/mod_ssl/mca.sh
+share/mod_ssl/sign.sh
 @dirrm share/httpd/htdocs/manual/mod/mod_ssl
+@dirrm share/mod_ssl
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 2c469bb4670..5c1fdd15a25 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 1999/02/20 22:48:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.30 1999/04/30 17:05:19 tv Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -8,11 +8,11 @@
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 #
 
-DISTNAME=		apache_1.3.3
-PKGNAME=		apache-1.3.3.2
+DISTNAME=		apache_1.3.6
+PKGNAME=		apache-1.3.6p0
 CATEGORIES=		www
 MASTER_SITES=		http://www.apache.org/dist/ \
-			http://www.engelschall.com/sw/mod_ssl/distrib/ \
+			ftp://ftp.engelschall.com/sw/mod_ssl/ \
 			http://www.netbsd.org/images/logos/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${SSL_DISTNAME}${EXTRACT_SUFX} \
@@ -23,7 +23,7 @@ HOMEPAGE=		http://www.apache.org/
 
 CONFLICTS=		apache-*modssl-*
 
-SSL_DISTNAME=		mod_ssl-2.1.3-1.3.3
+SSL_DISTNAME=		mod_ssl-2.2.8-1.3.6
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 HAS_CONFIGURE=		YES
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
 			--logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \
 			--proxycachedir=/var/spool/httpd/proxy \
 			--includedir=${PREFIX}/include/httpd \
+			--sbindir=${PREFIX}/sbin \
 			--enable-rule=EAPI --enable-module=most \
 			--disable-module=ssl --enable-module=auth_db \
 			--disable-module=auth_dbm \
@@ -40,7 +41,6 @@ CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
 .if defined(APACHE_SUEXEC)
 CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=www \
-			--suexec-userdir=WWW \
 			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
 .endif
 
@@ -66,18 +66,21 @@ pre-patch:
 		../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
 		../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
 		| ${PATCH} ${PATCH_ARGS}
+	@cd ${WRKSRC} && tail +129 \
+		../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
+		| ${PATCH} ${PATCH_ARGS}
+
 post-patch:
-	@cd ${WRKSRC}/src/include && \
-		${SED} -e s,@@PREFIX@@,${PREFIX}, ap_config.h >tmp && \
-		${MV} -f tmp ap_config.h
 	@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
 
 post-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/httpd
+	@${MV} ${PREFIX}/lib/httpd/libproxy.so ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || ${MKDIR} ${PREFIX}/lib/httpd
 
 .include "../../mk/bsd.pkg.mk"
 
 .if !defined(NOPIC)
-CONFIGURE_ARGS+=	--enable-module=so
+CONFIGURE_ARGS+=	--enable-module=so --enable-shared=proxy
+.else
+CONFIGURE_ARGS+=	--disable-module=proxy
 .endif
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index 38194bdb0b3..865fb8bf201 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.10 1998/12/07 16:20:40 tv Exp $
+$NetBSD: md5,v 1.11 1999/04/30 17:05:20 tv Exp $
 
-MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
-MD5 (mod_ssl-2.1.3-1.3.3.tar.gz) = 76bd1f0d5f5c9623a71fea336312a753
+MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 5891deb6c58..e6af557ed6c 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,51 +1,37 @@
-$NetBSD: patch-aa,v 1.7 1998/12/04 17:23:20 tv Exp $
+$NetBSD: patch-aa,v 1.8 1999/04/30 17:05:20 tv Exp $
 
---- Makefile.tmpl.orig	Fri Dec  4 11:41:42 1998
-+++ Makefile.tmpl	Fri Dec  4 11:47:53 1998
-@@ -275,7 +275,7 @@
- 	$(MKDIR) $(root)$(sysconfdir)/ssl.key
- 	$(MKDIR) $(root)$(datadir)/htdocs
- 	$(MKDIR) $(root)$(datadir)/icons
--	$(MKDIR) $(root)$(datadir)/cgi-bin
-+	$(MKDIR) $(root)$(prefix)/libexec/cgi-bin
- 	$(MKDIR) $(root)$(includedir)
- 	$(MKDIR) $(root)$(runtimedir)
- 	$(MKDIR) $(root)$(logfiledir)
-@@ -352,6 +352,7 @@
- 	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl"; \
- 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \
- 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
-+		-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
- 		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
- 		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
- 	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
-@@ -413,17 +414,13 @@
- 		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+--- Makefile.tmpl.orig	Mon Apr 26 16:03:46 1999
++++ Makefile.tmpl	Mon Apr 26 16:29:40 1999
+@@ -114,7 +114,7 @@
+ datadir         = @datadir@
+ iconsdir        = $(datadir)/icons
+ htdocsdir       = $(datadir)/htdocs
+-cgidir          = $(datadir)/cgi-bin
++cgidir          = $(prefix)/libexec/cgi-bin
+ includedir      = @includedir@
+ localstatedir   = @localstatedir@
+ runtimedir      = @runtimedir@
+@@ -453,12 +453,13 @@
+ 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
--	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
--	else \
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
++	-@if false; then \
+ 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+ 	else \
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
-         		> $(TOP)/$(SRC)/.apaci.install.tmp; \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
--		done; \
--	fi
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(prefix)/libexec/cgi-bin/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(prefix)/libexec/cgi-bin/$${script}; \
-+		done;
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
- 	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
- 	(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
-@@ -450,7 +447,7 @@
- 			-e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
- 			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- 			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
--			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-+			-e 's;@@ServerRoot@@/cgi-bin;$(prefix)/libexec/cgi-bin;' \
- 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
- 			-e 's;@@ServerRoot@@;$(prefix);' \
- 			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
++			-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+@@ -475,7 +476,7 @@
+ #   and initial config files while preserving existing ones.
+ install-config:
+ 	@echo "===> [config: Installing Apache configuration files]"
+-	-@for conf in httpd.conf access.conf srm.conf; do \
++	-@for conf in httpd.conf; do \
+ 		if [ .$$conf = .httpd.conf ]; then \
+ 			target_conf="$(TARGET).conf"; \
+ 		else \
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
deleted file mode 100644
index fa06308e0f1..00000000000
--- a/www/apache/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/10/02 14:40:13 tv Exp $
-
---- src/os/unix/os.h.orig	Fri Oct  2 10:14:27 1998
-+++ src/os/unix/os.h	Fri Oct  2 10:14:54 1998
-@@ -114,7 +114,8 @@
- #define RTLD_GLOBAL 0
- #endif
- 
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || \
-+	(defined(__NetBSD__) && !defined(__ELF__))
- #define DLSYM_NEEDS_UNDERSCORE
- #endif
- 
diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad
deleted file mode 100644
index e5ab86e7208..00000000000
--- a/www/apache/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/12/03 17:23:52 tv Exp $
-
---- src/include/ap_config.h.orig	Sat Oct  3 11:33:35 1998
-+++ src/include/ap_config.h	Wed Dec  2 11:18:59 1998
-@@ -398,7 +398,7 @@
- #define DEFAULT_USER_DIR        "Library/Web Documents"
- #define DEFAULT_USER            "nobody"
- #define DEFAULT_GROUP           "nogroup"
--#define DEFAULT_PATH            "/bin:/usr/bin:/usr/local/bin"
-+#define DEFAULT_PATH            "/bin:/usr/bin:@@PREFIX@@/bin:/usr/local/bin"
- #endif
- 
- #elif defined(LINUX)
-@@ -592,6 +592,7 @@
- #define HAVE_MMAP 1
- #define USE_MMAP_SCOREBOARD
- #define USE_MMAP_FILES
-+#define USE_FLOCK_SERIALIZED_ACCEPT
- #endif
- 
- #elif defined(UTS21)
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
index c865314e7d8..e8d3973f363 100644
--- a/www/apache/patches/patch-ag
+++ b/www/apache/patches/patch-ag
@@ -1,27 +1,29 @@
-$NetBSD: patch-ag,v 1.1 1998/12/03 17:23:53 tv Exp $
+$NetBSD: patch-ag,v 1.2 1999/04/30 17:05:20 tv Exp $
 
---- src/Configure.orig	Wed Oct  7 05:19:30 1998
-+++ src/Configure	Wed Dec  2 11:49:22 1998
-@@ -913,16 +914,15 @@
-             LDFLAGS_SHLIB_EXPORT=""
-             SHLIB_SUFFIX_DEPTH=2
-             ;;
--        alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*)
--            CFLAGS_SHLIB="-fpic -DPIC"
--            LDFLAGS_SHLIB="-shared"
--            LDFLAGS_SHLIB_EXPORT=""
--            SHLIB_SUFFIX_DEPTH=2
--            ;;
-         *-netbsd*)
--            CFLAGS_SHLIB="-fpic -DPIC"
-+            CFLAGS_SHLIB="-fPIC -DPIC"
-+if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
-             LDFLAGS_SHLIB="-Bshareable"
-             LDFLAGS_SHLIB_EXPORT=""
-+else
-+            LDFLAGS_SHLIB="-shared"
-+            LDFLAGS_SHLIB_EXPORT="-Wl,-E"
-+fi
-             SHLIB_SUFFIX_DEPTH=2
-             ;;
-         *-apple-rhapsody*)
+--- src/Configure.orig	Mon Apr 26 14:34:33 1999
++++ src/Configure	Mon Apr 26 15:10:13 1999
+@@ -974,16 +974,15 @@
+ 	    LDFLAGS_SHLIB_EXPORT=""
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+-	alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*)
+-	    CFLAGS_SHLIB="-fpic -DPIC"
+-	    LDFLAGS_SHLIB="-shared"
+-	    LDFLAGS_SHLIB_EXPORT=""
+-	    SHLIB_SUFFIX_DEPTH=2
+-	    ;;
+ 	*-netbsd*)
+-	    CFLAGS_SHLIB="-fpic -DPIC"
+-	    LDFLAGS_SHLIB="-Bshareable"
+-	    LDFLAGS_SHLIB_EXPORT=""
++	    CFLAGS_SHLIB="-fPIC -DPIC"
++	    if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
++		LDFLAGS_SHLIB="-Bshareable"
++		LDFLAGS_SHLIB_EXPORT=""
++	    else
++		LDFLAGS_SHLIB="-shared"
++		LDFLAGS_SHLIB_EXPORT="-Wl,-E"
++	    fi
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+ 	*-bsdi)
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
deleted file mode 100644
index e3d3e794fc6..00000000000
--- a/www/apache/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1998/12/03 17:23:54 tv Exp $
-
---- htdocs/manual/mod/index.html.orig	Thu Dec  3 10:16:58 1998
-+++ htdocs/manual/mod/index.html	Thu Dec  3 10:17:57 1998
-@@ -111,6 +111,8 @@
- <DD>Experimental support for loading modules (DLLs on Windows) at runtime
- <DT><A HREF="mod_speling.html">mod_speling</A> Apache 1.3 and up
- <DD>Automatically correct minor typos in URLs
-+<DT><A HREF="mod_ssl/index.html">mod_ssl</A> Apache 1.3 with mod_ssl applied
-+<DD>Apache SSL interface to SSLeay
- <DT><A HREF="mod_status.html">mod_status</A>
- <DD>Server status display
- <DT><A HREF="mod_userdir.html">mod_userdir</A>
diff --git a/www/apache/patches/patch-am b/www/apache/patches/patch-am
index 04c306f5a03..82325745f69 100644
--- a/www/apache/patches/patch-am
+++ b/www/apache/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 1998/12/07 17:35:49 tv Exp $
+$NetBSD: patch-am,v 1.3 1999/04/30 17:05:20 tv Exp $
 
 --- src/ap/ap_hook.c.orig	Mon Dec  7 10:31:53 1998
 +++ src/ap/ap_hook.c	Mon Dec  7 10:32:48 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 1998/12/07 17:35:49 tv Exp $
          rc = (*((int *)v_rc) != he->he_modeval.v_int);
      }
 +    else if (he->he_sig == AP_HOOK_SIG5(int, ptr, ptr, ptr, ptr)) {
-+        /* Call: int func(ptr,ptr,ptr,int) */
++        /* Call: int func(ptr,ptr,ptr,ptr) */
 +        void *v1 = va_arg(ap, va_type(ptr));
 +        void *v2 = va_arg(ap, va_type(ptr));
 +        void *v3 = va_arg(ap, va_type(ptr));
diff --git a/www/apache/patches/patch-core-404 b/www/apache/patches/patch-core-404
deleted file mode 100644
index 301103c8944..00000000000
--- a/www/apache/patches/patch-core-404
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-core-404,v 1.2 1998/12/05 05:00:00 tv Exp $
-
-This patch fixes a potential denial-of-service vulnerability in
-Apache 1.3.2 and 1.3.3.  It is strongly recommended that you apply
-it or upgrade to a more recent version of Apache when it is available.
-
-Thanks to Studenten Net Twente for finding and reporting the problem.
-
-Index: include/http_log.h
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/include/http_log.h,v
-retrieving revision 1.31
-diff -u -r1.31 http_log.h
---- src/include/http_log.h	1998/08/06 17:30:24	1.31
-+++ src/include/http_log.h	1998/10/30 02:23:06
-@@ -105,6 +105,15 @@
- #define APLOG_MARK	__FILE__,__LINE__
- 
- void ap_open_logs (server_rec *, pool *p);
-+
-+/* The two primary logging functions, ap_log_error and ap_log_rerror,
-+ * use a printf style format string to build the log message.  It is
-+ * VERY IMPORTANT that you not include any raw data from the network,
-+ * such as the request-URI or request header fields, within the format
-+ * string.  Doing so makes the server vulnerable to a denial-of-service
-+ * attack and other messy behavior.  Instead, use a simple format string
-+ * like "%s", followed by the string containing the untrusted data.
-+ */
- API_EXPORT(void) ap_log_error(const char *file, int line, int level,
- 			     const server_rec *s, const char *fmt, ...)
- 			    __attribute__((format(printf,5,6)));
-Index: main/http_core.c
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
-retrieving revision 1.237
-diff -u -r1.237 http_core.c
---- src/main/http_core.c	1998/10/23 20:07:39	1.237
-+++ src/main/http_core.c	1998/10/30 02:23:07
-@@ -2783,7 +2783,7 @@
- 	else {
- 	    emsg = ap_pstrcat(r->pool, emsg, r->filename, r->path_info, NULL);
- 	}
--	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, emsg);
-+	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, "%s", emsg);
- 	return HTTP_NOT_FOUND;
-     }
-     if (r->method_number != M_GET) {
diff --git a/www/apache/patches/patch-proxy-segv b/www/apache/patches/patch-proxy-segv
deleted file mode 100644
index 28e61ad136d..00000000000
--- a/www/apache/patches/patch-proxy-segv
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-proxy-segv,v 1.2 1998/12/05 05:00:00 tv Exp $
-
-This patch fixes a segmentation violation in mod_proxy when a
-response is non-cachable.  Problem reported by Doug Bloebaum.
-
-Index: modules/proxy/proxy_util.c
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
-retrieving revision 1.70
-diff -u -r1.70 proxy_util.c
---- src/modules/proxy/proxy_util.c	1998/08/31 19:51:59	1.70
-+++ src/modules/proxy/proxy_util.c	1998/10/09 16:21:14
-@@ -581,7 +581,7 @@
-                 ap_reset_timeout(r);
- 
-             if (w <= 0) {
--                if (c != NULL) {
-+                if (c != NULL && c->fp != NULL) {
-                     /* when a send failure occurs, we need to decide
-                      * whether to continue loading and caching the
-                      * document, or to abort the whole thing
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index f30b485ea59..a3913e85a7c 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,17 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 1999/02/12 04:15:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.8 1999/04/30 17:05:20 tv Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-etc/httpd/access.conf.default
-@exec if [ ! -f %D/etc/httpd/access.conf ]; then cp -p %D/etc/httpd/access.conf.default %D/etc/httpd/access.conf; fi
 etc/httpd/httpd.conf.default
 @exec if [ ! -f %D/etc/httpd/httpd.conf ]; then cp -p %D/etc/httpd/httpd.conf.default %D/etc/httpd/httpd.conf; fi
 etc/httpd/magic.default
 @exec if [ ! -f %D/etc/httpd/magic ]; then cp -p %D/etc/httpd/magic.default %D/etc/httpd/magic; fi
 etc/httpd/mime.types.default
 @exec if [ ! -f %D/etc/httpd/mime.types ]; then cp -p %D/etc/httpd/mime.types.default %D/etc/httpd/mime.types; fi
-etc/httpd/srm.conf.default
-@exec if [ ! -f %D/etc/httpd/srm.conf ]; then cp -p %D/etc/httpd/srm.conf.default %D/etc/httpd/srm.conf; fi
 include/httpd/alloc.h
 include/httpd/ap.h
 include/httpd/ap_compat.h
@@ -40,6 +36,7 @@ include/httpd/http_vhost.h
 include/httpd/httpd.h
 include/httpd/multithread.h
 include/httpd/os.h
+include/httpd/os-inline.c
 include/httpd/rfc1413.h
 include/httpd/scoreboard.h
 include/httpd/util_date.h
@@ -48,11 +45,12 @@ include/httpd/util_script.h
 include/httpd/util_uri.h
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
-man/man1/ab.1
-man/man1/apachectl.1
+lib/httpd/mod_proxy.so
 man/man1/dbmmanage.1
 man/man1/htdigest.1
 man/man1/htpasswd.1
+man/man8/ab.8
+man/man8/apachectl.8
 man/man8/apxs.8
 man/man8/httpd.8
 man/man8/logresolve.8
@@ -87,6 +85,7 @@ share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
 share/httpd/htdocs/manual/images/sub.gif
 share/httpd/htdocs/manual/index.html
 share/httpd/htdocs/manual/install.html
+share/httpd/htdocs/manual/install-tpf.html
 share/httpd/htdocs/manual/invoking.html
 share/httpd/htdocs/manual/keepalive.html
 share/httpd/htdocs/manual/location.html
@@ -167,10 +166,13 @@ share/httpd/htdocs/manual/new_features_1_1.html
 share/httpd/htdocs/manual/new_features_1_2.html
 share/httpd/htdocs/manual/new_features_1_3.html
 share/httpd/htdocs/manual/process-model.html
+share/httpd/htdocs/manual/readme-tpf.html
+share/httpd/htdocs/manual/search/manual-index.cgi
 share/httpd/htdocs/manual/sections.html
 share/httpd/htdocs/manual/sourcereorg.html
 share/httpd/htdocs/manual/stopping.html
 share/httpd/htdocs/manual/suexec.html
+share/httpd/htdocs/manual/suexec_1_2.html
 share/httpd/htdocs/manual/unixware.html
 share/httpd/htdocs/manual/upgrading_to_1_3.html
 share/httpd/htdocs/manual/vhosts/details.html
@@ -182,6 +184,7 @@ share/httpd/htdocs/manual/vhosts/header.html
 share/httpd/htdocs/manual/vhosts/host.html
 share/httpd/htdocs/manual/vhosts/index.html
 share/httpd/htdocs/manual/vhosts/ip-based.html
+share/httpd/htdocs/manual/vhosts/mass.html
 share/httpd/htdocs/manual/vhosts/name-based.html
 share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
 share/httpd/htdocs/manual/vhosts/virtual-host.html
@@ -249,6 +252,39 @@ share/httpd/icons/right.gif
 share/httpd/icons/screw1.gif
 share/httpd/icons/screw2.gif
 share/httpd/icons/script.gif
+share/httpd/icons/small/README.txt
+share/httpd/icons/small/back.gif
+share/httpd/icons/small/binary.gif
+share/httpd/icons/small/binhex.gif
+share/httpd/icons/small/blank.gif
+share/httpd/icons/small/broken.gif
+share/httpd/icons/small/burst.gif
+share/httpd/icons/small/comp1.gif
+share/httpd/icons/small/comp2.gif
+share/httpd/icons/small/compressed.gif
+share/httpd/icons/small/continued.gif
+share/httpd/icons/small/dir.gif
+share/httpd/icons/small/dir2.gif
+share/httpd/icons/small/doc.gif
+share/httpd/icons/small/forward.gif
+share/httpd/icons/small/generic.gif
+share/httpd/icons/small/generic2.gif
+share/httpd/icons/small/generic3.gif
+share/httpd/icons/small/image.gif
+share/httpd/icons/small/image2.gif
+share/httpd/icons/small/index.gif
+share/httpd/icons/small/key.gif
+share/httpd/icons/small/movie.gif
+share/httpd/icons/small/patch.gif
+share/httpd/icons/small/ps.gif
+share/httpd/icons/small/rainbow.gif
+share/httpd/icons/small/sound.gif
+share/httpd/icons/small/sound2.gif
+share/httpd/icons/small/tar.gif
+share/httpd/icons/small/text.gif
+share/httpd/icons/small/transfer.gif
+share/httpd/icons/small/unknown.gif
+share/httpd/icons/small/uu.gif
 share/httpd/icons/sound1.gif
 share/httpd/icons/sound2.gif
 share/httpd/icons/sphere1.gif
@@ -268,15 +304,17 @@ share/httpd/icons/world2.gif
 @dirrm etc/httpd/ssl.crt
 @dirrm etc/httpd/ssl.csr
 @dirrm etc/httpd/ssl.key
-@dirrm etc/httpd
+@unexec rmdir %D/etc/httpd 2>/dev/null || true
 @dirrm include/httpd
 @dirrm lib/httpd
 @dirrm libexec/cgi-bin
 @dirrm share/httpd/htdocs/manual/images
 @dirrm share/httpd/htdocs/manual/misc
 @dirrm share/httpd/htdocs/manual/mod
+@dirrm share/httpd/htdocs/manual/search
 @dirrm share/httpd/htdocs/manual/vhosts
 @dirrm share/httpd/htdocs/manual
 @dirrm share/httpd/htdocs
+@dirrm share/httpd/icons/small
 @dirrm share/httpd/icons
 @dirrm share/httpd