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.

5 files changed, 40 insertions, 145 deletions

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