Update "apache22" package to version 2.2.25. Changes since 2.2.24:

- SECURITY: CVE-2013-1862 (cve.mitre.org)
  mod_rewrite: Ensure that client data written to the RewriteLog is
  escaped to prevent terminal escape sequences from entering the
  log file.  [Eric Covener, Jeff Trawick, Joe Orton]
- core: Limit ap_pregsub() to 64MB and add ap_pregsub_ex() for longer
  strings.  The default limit for ap_pregsub() can be adjusted at compile
   time by defining AP_PREGSUB_MAXLEN.  [Stefan Fritsch, Jeff Trawick]
- core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
  on Linux kernel versions 3.x and above.  Bug#55121.  [Bradley Heilbrun
  <apache heilbrun.org>]
- mod_setenvif: Log error on substitution overflow.
  [Stefan Fritsch]
- mod_ssl/proxy: enable the SNI extension for backend TLS connections
  [Kaspar Brand]
- mod_proxy: Use the the same hostname for SNI as for the HTTP request when
  forwarding to SSL backends. Bug#53134.
  [Michael Weiser <michael weiser.dinsnail.net>, Ruediger Pluem]
- mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
  in the error log to debug level.  [William Rowe]
- mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs
  with SSLProxyMachineCertificateFile/Path directives. Bug#52212, Bug#54698.
  [Keith Burdis <keith burdis.org>, Joe Orton, Kaspar Brand]
- mod_proxy_balancer: Added balancer parameter failontimeout to allow server
  admin to configure an IO timeout as an error in the balancer.
  [Daniel Ruggeri]
- mod_authnz_ldap: Allow using exec: calls to obtain LDAP bind
  password.  [Daniel Ruggeri]
- htdigest: Fix buffer overflow when reading digest password file
  with very long lines. Bug#54893. [Rainer Jung]
- mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
  the source href (sent as part of the request body as XML) pointing to a
  URI that is not configured for DAV will trigger a segfault. [Ben Reser
  <ben reser.org>]
- mod_dav: Ensure URI is correctly uriencoded on return. Bug#54611
  [Timothy Wood <tjw omnigroup.com>]
- mod_dav: Make sure that when we prepare an If URL for Etag comparison,
  we compare unencoded paths. Bug#53910 [Timothy Wood <tjw omnigroup.com>]
- mod_dav: Sending an If or If-Match header with an invalid ETag doesn't
  result in a 412 Precondition Failed for a COPY operation. PR54610
  [Timothy Wood <tjw omnigroup.com>]
- mod_dav: When a PROPPATCH attempts to remove a non-existent dead
  property on a resource for which there is no dead property in the same
  namespace httpd segfaults. Bug#52559 [Diego Santa Cruz
  <diego.santaCruz spinetix.com>]
- mod_dav: Do not fail PROPPATCH when prop namespace is not known.
  Bug#52559 [Diego Santa Cruz <diego.santaCruz spinetix.com>]
- mod_dav: Do not segfault on PROPFIND with a zero length DBM.
  Bug#52559 [Diego Santa Cruz <diego.santaCruz spinetix.com>]

1 files changed, 2 insertions, 3 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 5aff47d7715..4237f876ba8 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2013/07/12 10:45:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.92 2013/07/15 18:15:49 tron Exp $
 
-DISTNAME=	httpd-2.2.24
+DISTNAME=	httpd-2.2.25
 PKGNAME=	${DISTNAME:S/httpd/apache/}
-PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \