diff options
-rw-r--r-- | www/apache/Makefile | 8 | ||||
-rw-r--r-- | www/apache/files/md5 | 6 | ||||
-rw-r--r-- | www/apache/files/patch-sum | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-ab | 68 | ||||
-rw-r--r-- | www/apache/patches/patch-ak | 14 |
5 files changed, 53 insertions, 49 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 9746f3765e1..5087c49d2e1 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 1999/12/01 00:41:34 bad Exp $ +# $NetBSD: Makefile,v 1.41 2000/01/31 16:35:36 christos 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 @@ -7,8 +7,8 @@ # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). -DISTNAME= apache_1.3.9 -PKGNAME= apache-1.3.9p0 +DISTNAME= apache_1.3.11 +PKGNAME= apache-1.3.11 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.modssl.org/source/ \ @@ -22,7 +22,7 @@ HOMEPAGE= http://www.apache.org/ CONFLICTS= apache-*modssl-* apache6-* -SSL_DISTNAME= mod_ssl-2.4.8-1.3.9 +SSL_DISTNAME= mod_ssl-2.5.0-1.3.11 EXTRACT_ONLY= ${DISTFILES:N*.gif} HAS_CONFIGURE= YES diff --git a/www/apache/files/md5 b/www/apache/files/md5 index a16ad23842f..ca83d12153a 100644 --- a/www/apache/files/md5 +++ b/www/apache/files/md5 @@ -1,5 +1,5 @@ -$NetBSD: md5,v 1.12 1999/11/21 22:09:28 tron Exp $ +$NetBSD: md5,v 1.13 2000/01/31 16:35:36 christos Exp $ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 -MD5 (mod_ssl-2.4.8-1.3.9.tar.gz) = f764b961220b8c067e88ae3abc717785 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 +MD5 (mod_ssl-2.5.0-1.3.11.tar.gz) = 0d630dd536e2cdc6885368c79b45766f MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1 diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum index 6d4bebc2eb3..01e22b9d8da 100644 --- a/www/apache/files/patch-sum +++ b/www/apache/files/patch-sum @@ -1,12 +1,12 @@ -$NetBSD: patch-sum,v 1.3 1999/11/27 22:52:08 rh Exp $ +$NetBSD: patch-sum,v 1.4 2000/01/31 16:35:36 christos Exp $ MD5 (patch-aa) = bc5b9953696e7f125962e96bb68ef49c -MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc +MD5 (patch-ab) = e69e8ebe30b31b5f5846123dc7d8c035 MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069 MD5 (patch-af) = ef50e09f4691dd62b0671761f1a864c4 MD5 (patch-ah) = 84442daefda2e2afc68caf6c41daaffa MD5 (patch-aj) = c6131c00d8dd5b810a0e48c91839157c -MD5 (patch-ak) = 8f5c8212b6925fb05e3af6c32f990d87 +MD5 (patch-ak) = 856c246b3484e181f1f64b59113acaf6 MD5 (patch-al) = e5472cc7cfcf3f01b311204311870c21 MD5 (patch-am) = 1ecf62d9594b2ca51e291096443dfbb2 MD5 (patch-an) = 2fb334639042640cbb2bd1d13bbcce32 diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab index d39ff875340..f632938757a 100644 --- a/www/apache/patches/patch-ab +++ b/www/apache/patches/patch-ab @@ -1,34 +1,38 @@ -$NetBSD: patch-ab,v 1.5 1998/12/03 17:23:52 tv Exp $ +$NetBSD: patch-ab,v 1.6 2000/01/31 16:35:37 christos Exp $ ---- htdocs/index.html.orig Wed May 20 10:59:42 1998 -+++ htdocs/index.html Thu Dec 3 09:48:59 1998 -@@ -38,14 +38,26 @@ - <A - HREF="manual/index.html" - >documentation</A> -- has been included with this distribution. -+ has been included with this distribution.<BR> -+ If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the -+ <A -+ HREF="manual/mod/mod_ssl/index.html" -+ >SSL documentation</A> -+ carefully. - </P> - <P> -- The Webmaster of this site is free to use the image below on -- an Apache-powered Web server. Thanks for using Apache! -+ Information on the NetBSD multiplatform operating system can be found -+ at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net. -+ </P> -+ <P> -+ The Webmaster of this site is free to use the images below on -+ an Apache/NetBSD-powered Web server. Thanks for using <A HREF="http://www.apache.org/">Apache</A> on <A HREF="http://www.netbsd.org/">NetBSD</A>! - </P> - <DIV ALIGN="CENTER"> - <IMG SRC="apache_pb.gif" ALT=""> -+ <A HREF="http://www.netbsd.org/"> -+ <IMG SRC="sitedrivenby.gif" border=0 -+ ALT="Site driven by NetBSD - NetBSD rocks!"></A> - </DIV> - </BODY> +--- htdocs/index.html.en.orig Sat Nov 20 16:29:40 1999 ++++ htdocs/index.html.en Sun Jan 30 17:00:58 2000 +@@ -28,11 +28,29 @@ + + + <P> +-The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution. +- ++The Apache <A HREF="manual/index.html">documentation</A> ++has been included with this distribution.<BR> ++If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the ++<A ++ HREF="manual/mod/mod_ssl/index.html" ++>SSL documentation</A> ++carefully. ++</P> ++<P> ++Information on the NetBSD multiplatform operating system can be found ++at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net. ++</P> + <P> +-You are free to use the image below on an Apache-powered web server. Thanks for using Apache! ++The Webmaster of this site is free to use the images below on ++an Apache/NetBSD-powered Web server. Thanks for using ++<A HREF="http://www.apache.org/">Apache</A> on ++<A HREF="http://www.netbsd.org/">NetBSD</A>! ++</P> + +-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV> ++<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""> ++<A HREF="http://www.netbsd.org/"> ++<IMG SRC="sitedrivenby.gif" border=0 ++ ALT="Site driven by NetBSD - NetBSD rocks!"></A> ++</DIV> + </BODY> </HTML> diff --git a/www/apache/patches/patch-ak b/www/apache/patches/patch-ak index 82b80df1085..219a14864c4 100644 --- a/www/apache/patches/patch-ak +++ b/www/apache/patches/patch-ak @@ -1,14 +1,14 @@ -$NetBSD: patch-ak,v 1.2 1999/11/21 22:09:28 tron Exp $ +$NetBSD: patch-ak,v 1.3 2000/01/31 16:35:37 christos Exp $ ---- src/support/apxs.pl.orig Mon Sep 27 18:28:55 1999 -+++ src/support/apxs.pl Mon Sep 27 18:31:42 1999 -@@ -426,8 +426,7 @@ +--- src/support/apxs.pl.orig Sun Jan 30 17:04:24 2000 ++++ src/support/apxs.pl Sun Jan 30 17:05:33 2000 +@@ -424,8 +424,7 @@ my $t = $f; $t =~ s|^.+/([^/]+)$|$1|; if ($opt_i) { -- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); -- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); } # determine module symbolname and filename |