From b2ee1a6e4c6ed4db5201a60173626c0ca43977c1 Mon Sep 17 00:00:00 2001
From: christos
Date: Mon, 31 Jan 2000 16:35:36 +0000
Subject: update for 1.3.11
---
www/apache/Makefile | 8 +++---
www/apache/files/md5 | 6 ++--
www/apache/files/patch-sum | 6 ++--
www/apache/patches/patch-ab | 68 ++++++++++++++++++++++++---------------------
www/apache/patches/patch-ak | 14 +++++-----
5 files changed, 53 insertions(+), 49 deletions(-)
(limited to 'www/apache')
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 @@
- documentation
-- has been included with this distribution.
-+ has been included with this distribution.
-+ If the mod_ssl SSL extension has been installed, read the
-+ SSL documentation
-+ carefully.
-
-
-- 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 NetBSD's homepage on the net.
-+
-+
-+ The Webmaster of this site is free to use the images below on
-+ an Apache/NetBSD-powered Web server. Thanks for using Apache on NetBSD!
-
-
-