diff options
author | reed <reed@pkgsrc.org> | 2004-10-02 15:47:02 +0000 |
---|---|---|
committer | reed <reed@pkgsrc.org> | 2004-10-02 15:47:02 +0000 |
commit | dd02b781a28ac455022d99e0c427772c88aa8706 (patch) | |
tree | 512214e8505fb394532aecbe86acb023d2c41d38 /www | |
parent | a69e07cf1994b47dbecdd6ca46b3680307c75c4c (diff) | |
download | pkgsrc-dd02b781a28ac455022d99e0c427772c88aa8706.tar.gz |
Update apache to apache-2.0.52.
Also added comment to www/apache2/Makefile.common to remind to
update checksum in devel/apr also.
No actual devel/apr changes seen.
Also removed www/apache2/patches/patch-ab because it is identical to
fix for security in new version.
Changes with Apache 2.0.52
*) Use HTML 2.0 <hr> for error pages. PR 30732 [André Malo]
*) Fix the global mutex crash when the global mutex is never allocated
due to disabled/empty caches. [Jess Holle <jessh ptc.com>]
*) Fix a segfault in the LDAP cache when it is configured switched
off. [Jess Holle <jessh ptc.com>]
*) SECURITY: CAN-2004-0811 (cve.mitre.org)
Fix merging of the Satisfy directive, which was applied to
the surrounding context and could allow access despite configured
authentication. PR 31315. [Rici Lake <rici ricilake.net>]
*) Fix the handling of URIs containing %2F when AllowEncodedSlashes
is enabled. Previously, such urls would still be rejected.
[Jeff Trawick, Bill Stoddard]
*) mod_mem_cache: Fixed race condition causing segfault because of memory being
freed twice, or reused after being freed.
[J. Clar, W. Stoddard, G. Ames]
*) Add -l option to rotatelogs to let it use local time rather than
UTC. PR 24417. [Ken Coar, Uli Zappe <uli ritual.org>]
*) mod_log_config: Fix a bug which prevented request completion time
from being logged for I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
processing. PR 29696. [Alois Treindl <alois astro.ch>]
Diffstat (limited to 'www')
-rw-r--r-- | www/apache2/Makefile | 3 | ||||
-rw-r--r-- | www/apache2/Makefile.common | 3 | ||||
-rw-r--r-- | www/apache2/distinfo | 7 | ||||
-rw-r--r-- | www/apache2/patches/patch-ab | 29 |
4 files changed, 6 insertions, 36 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index e50a3ecd548..703d6d2f251 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2004/09/28 17:59:55 erh Exp $ +# $NetBSD: Makefile,v 1.47 2004/10/02 15:47:02 reed Exp $ PKGNAME= apache-${APACHE_VERSION} -PKGREVISION= 1 CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common index fd37e6dd7cc..0bd029d771f 100644 --- a/www/apache2/Makefile.common +++ b/www/apache2/Makefile.common @@ -1,5 +1,6 @@ DISTNAME= httpd-${APACHE_VERSION} -APACHE_VERSION= 2.0.51 +# when updating this version be sure to update the checksum in devel/apr also +APACHE_VERSION= 2.0.52 APR_VERSION= 0.9.5 MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} \ diff --git a/www/apache2/distinfo b/www/apache2/distinfo index a803c60db2a..b84257937d0 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.29 2004/09/23 22:51:52 grant Exp $ +$NetBSD: distinfo,v 1.30 2004/10/02 15:47:02 reed Exp $ -SHA1 (httpd-2.0.51.tar.gz) = 68ce1da942226c0a6276c9c313d21fe794a95222 -Size (httpd-2.0.51.tar.gz) = 6735558 bytes +SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7 +Size (httpd-2.0.52.tar.gz) = 6918995 bytes SHA1 (patch-aa) = 341d546fa758ae65023ff13422a3a002a7f1686b -SHA1 (patch-ab) = aee81f0adc8c23bfd7fd3cacbcf9a4aed67d6ec2 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215 diff --git a/www/apache2/patches/patch-ab b/www/apache2/patches/patch-ab deleted file mode 100644 index 19aaeada36c..00000000000 --- a/www/apache2/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2004/09/23 21:07:25 reed Exp $ - -http://www.apache.org/dist/httpd/patches/apply_to_2.0.51/CAN-2004-0811.patch - -SECURITY: CAN-2004-0811 (cve.mitre.org) - -Fix merging of the Satisfy directive, which was applied to -the surrounding context and could allow access despite configured -authentication. (a regression in 2.0.51) - -Apache PR: 31315 -Submitted by: Rici Lake <rici ricilake.net> - ---- server/core.c 2004/08/31 08:16:56 1.225.2.27 -+++ server/core.c 2004/09/21 13:21:16 1.225.2.28 -@@ -351,9 +351,13 @@ - /* Otherwise we simply use the base->sec_file array - */ - -+ /* use a separate ->satisfy[] array either way */ -+ conf->satisfy = apr_palloc(a, sizeof(*conf->satisfy) * METHODS); - for (i = 0; i < METHODS; ++i) { - if (new->satisfy[i] != SATISFY_NOSPEC) { - conf->satisfy[i] = new->satisfy[i]; -+ } else { -+ conf->satisfy[i] = base->satisfy[i]; - } - } - |