Update "apr" package to version 0.9.16.2.0.61 and "apache2" package

to version 2.0.61.

This update is a bug and security fix release. The following security
problem hasn't been fixed in "pkgsrc" before:
- CVE-2007-3847: mod_proxy: Prevent reading past the end of a buffer when
  parsing date-related headers.

6 files changed, 17 insertions, 20 deletions

diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 6a5efb81906..cf04a931fce 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/11 16:05:51 tv Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/07 23:11:40 tron Exp $
 
 .include "../../www/apache2/Makefile.common"
 
 PKGNAME=	apr-${APR_VERSION}.${APACHE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	devel
 
 HOMEPAGE=	http://apr.apache.org/
diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo
index 5f38a206808..b8445f86773 100644
--- a/devel/apr0/distinfo
+++ b/devel/apr0/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
+$NetBSD: distinfo,v 1.2 2007/09/07 23:11:41 tron Exp $
 
-SHA1 (httpd-2.0.59.tar.bz2) = 908209cd6e52f700d2a841a25de36e44d469c376
-RMD160 (httpd-2.0.59.tar.bz2) = 78b802354e338798a6978ece8b3568be97542174
-Size (httpd-2.0.59.tar.bz2) = 4743549 bytes
+SHA1 (httpd-2.0.61.tar.bz2) = 665017829022d287ffe3cec749e2b5b61252d7b4
+RMD160 (httpd-2.0.61.tar.bz2) = a2c2c90976a967112a9129b9716d880d71261882
+Size (httpd-2.0.61.tar.bz2) = 4580339 bytes
 SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9
 SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
 SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 7ff956481d3..a194a6ca47e 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2007/09/07 22:12:23 jlam Exp $
+# $NetBSD: Makefile,v 1.118 2007/09/07 23:11:40 tron Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 276709391f7..982a8c3fb7b 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.21 2006/07/28 10:38:36 tron Exp $
+# $NetBSD: Makefile.common,v 1.22 2007/09/07 23:11:40 tron Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 EXTRACT_SUFX=		.tar.bz2
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
-APACHE_VERSION=		2.0.59
-APR_VERSION=		0.9.12
+APACHE_VERSION=		2.0.61
+APR_VERSION=		0.9.16
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
 			http://www.NetBSD.org/images/logos/
-MAINTAINER=		tron@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 32664e21255..749cf6a4ef3 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2006/07/28 13:35:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.35 2007/09/07 23:11:40 tron Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -154,6 +154,7 @@ share/httpd/htdocs/index.html.var
 share/httpd/htdocs/index.html.zh-cn.gb2312
 share/httpd/htdocs/index.html.zh-tw.big5
 share/httpd/icons/README
+share/httpd/icons/README.html
 share/httpd/icons/a.gif
 share/httpd/icons/a.png
 share/httpd/icons/alert.black.gif
@@ -281,7 +282,6 @@ share/httpd/icons/screw2.gif
 share/httpd/icons/screw2.png
 share/httpd/icons/script.gif
 share/httpd/icons/script.png
-share/httpd/icons/small/README.txt
 share/httpd/icons/small/back.gif
 share/httpd/icons/small/back.png
 share/httpd/icons/small/binary.gif
@@ -721,6 +721,7 @@ share/httpd/manual/mod/mod_logio.html.ja.euc-jp
 share/httpd/manual/mod/mod_logio.html.ko.euc-kr
 share/httpd/manual/mod/mod_mem_cache.html
 share/httpd/manual/mod/mod_mem_cache.html.en
+share/httpd/manual/mod/mod_mem_cache.html.ja.euc-jp
 share/httpd/manual/mod/mod_mem_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_mime.html
 share/httpd/manual/mod/mod_mime.html.en
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index db7f2a34ac8..4a7eb95c370 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50 2007/06/28 01:49:04 lkundrak Exp $
+$NetBSD: distinfo,v 1.51 2007/09/07 23:11:40 tron Exp $
 
-SHA1 (httpd-2.0.59.tar.bz2) = 908209cd6e52f700d2a841a25de36e44d469c376
-RMD160 (httpd-2.0.59.tar.bz2) = 78b802354e338798a6978ece8b3568be97542174
-Size (httpd-2.0.59.tar.bz2) = 4743549 bytes
+SHA1 (httpd-2.0.61.tar.bz2) = 665017829022d287ffe3cec749e2b5b61252d7b4
+RMD160 (httpd-2.0.61.tar.bz2) = a2c2c90976a967112a9129b9716d880d71261882
+Size (httpd-2.0.61.tar.bz2) = 4580339 bytes
 SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
 SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
@@ -13,5 +13,3 @@ SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
 SHA1 (patch-ao) = c629a7563d0e555922526e26b266251144a14ff6
-SHA1 (patch-ap) = 3f9dbd6dbbadb54f5255dfdb15decc6cc7e8eccc
-SHA1 (patch-aq) = d1e0243b28c9e224746fa5cac1321f55c5c0927e