Pullup ticket #4088 - requested by tron www/apache22: security update Revisions pulled up: - www/apache22/Makefile 1.87 - www/apache22/PLIST 1.22 - www/apache22/distinfo 1.54 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Sun Mar 3 20:05:04 UTC 2013 Modified Files: pkgsrc/www/apache22: Makefile PLIST distinfo Log Message: Update "apache" package to version 2.2.24. Changes since 2.2.23: - SECURITY: CVE-2012-3499 (cve.mitre.org) Various XSS flaws due to unescaped hostnames and URIs HTML output in mod_info, mod_status, mod_imagemap, mod_ldap, and mod_proxy_ftp. [Jim Jagielski, Stefan Fritsch, Niels Heinen <heinenn google com>] - SECURITY: CVE-2012-4558 (cve.mitre.org) XSS in mod_proxy_balancer manager interface. [Jim Jagielski, Niels Heinen <heinenn google com>] - mod_rewrite: Stop merging RewriteBase down to subdirectories unless new option 'RewriteOptions MergeBase' is configured. Merging RewriteBase was unconditionally turned on in 2.2.23. Bug Report 53963. [Eric Covener] - mod_ssl: Send the error message for speaking http to an https port using HTTP/1.0 instead of HTTP/0.9, and omit the link that may be wrong when using SNI. Bug Report 50823. [Stefan Fritsch] - mod_ssl: log revoked certificates at level INFO instead of DEBUG. Bug Report 52162. [Stefan Fritsch] - mod_proxy_ajp: Support unknown HTTP methods. Bug Report 54416. [Rainer Jung] - mod_dir: Add support for the value 'disabled' in FallbackResource. [Vincent Deffontaines] - mod_ldap: Fix regression in handling "server unavailable" errors on Windows. Bug Report 54140. [Eric Covener] - mod_ssl: fix a regression with the string rendering of the "UID" RDN introduced in 2.2.15. Bug Report 54510. [Kaspar Brand] - ab: add TLS1.1/TLS1.2 options to -f switch, and adapt output to more accurately report the negotiated protocol. Bug Report 53916. [Nicol=E1s Pernas Maradei <nico emutex com>, Kaspar Brand] - mod_cache: Explicitly allow cache implementations to cache a 206 Partial Response if they so choose to do so. Previously an attempt to cache a 206 was arbitrarily allowed if the response contained an Expires or Cache-Control header, and arbitrarily denied if both headers were missing. Currently the disk and memory cache providers do not cache 206 Partial Responses. [Graham Leggett] - core: Remove unintentional APR dependency introduced with Apache 2.2.22. [Eric Covener] - core: Use a TLS 1.0 close_notify alert for internal dummy connection if the chosen listener is configured for https. [Joe Orton] - mod_ssl: Add new directive SSLCompression to disable TLS-level compression. Bug Report 53219. [Bj=F6rn Jacke <bjoern j3e de>, Stefan Fri= tsch] To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 pkgsrc/www/apache22/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/apache22/PLIST cvs rdiff -u -r1.53 -r1.54 pkgsrc/www/apache22/distinfodiff -r1.85 -r1.85.2.1 pkgsrc/www/apache22/Makefile
(spz)
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.85 2012/12/23 21:32:41 spz Exp $ | 1 | # $NetBSD: Makefile,v 1.85.2.1 2013/03/08 18:36:41 spz Exp $ | |
2 | 2 | |||
3 | DISTNAME= httpd-2.2.23 | 3 | DISTNAME= httpd-2.2.24 | |
4 | 4 | |||
5 | PKGNAME= ${DISTNAME:S/httpd/apache/} | 5 | PKGNAME= ${DISTNAME:S/httpd/apache/} | |
6 | PKGREVISION= 3 | |||
7 | CATEGORIES= www | 6 | CATEGORIES= www | |
8 | MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ | 7 | MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ | |
9 | http://archive.apache.org/dist/httpd/ \ | 8 | http://archive.apache.org/dist/httpd/ \ | |
10 | http://archive.eu.apache.org/dist/httpd/ | 9 | http://archive.eu.apache.org/dist/httpd/ | |
11 | EXTRACT_SUFX= .tar.bz2 | 10 | EXTRACT_SUFX= .tar.bz2 | |
12 | 11 | |||
13 | MAINTAINER= tron@NetBSD.org | 12 | MAINTAINER= tron@NetBSD.org | |
14 | HOMEPAGE= http://httpd.apache.org/ | 13 | HOMEPAGE= http://httpd.apache.org/ | |
15 | COMMENT= Apache HTTP (Web) server, version 2.2 | 14 | COMMENT= Apache HTTP (Web) server, version 2.2 | |
16 | LICENSE= apache-2.0 | 15 | LICENSE= apache-2.0 | |
17 | 16 | |||
18 | BUILD_DEFS+= IPV6_READY | 17 | BUILD_DEFS+= IPV6_READY | |
19 | BUILD_DEFS+= VARBASE | 18 | BUILD_DEFS+= VARBASE |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.21 2012/09/16 03:33:10 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.21.4.1 2013/03/08 18:36:42 spz Exp $ | |
2 | include/httpd/ap_compat.h | 2 | include/httpd/ap_compat.h | |
3 | include/httpd/ap_config.h | 3 | include/httpd/ap_config.h | |
4 | include/httpd/ap_config_auto.h | 4 | include/httpd/ap_config_auto.h | |
5 | include/httpd/ap_config_layout.h | 5 | include/httpd/ap_config_layout.h | |
6 | include/httpd/ap_listen.h | 6 | include/httpd/ap_listen.h | |
7 | include/httpd/ap_mmn.h | 7 | include/httpd/ap_mmn.h | |
8 | include/httpd/ap_mpm.h | 8 | include/httpd/ap_mpm.h | |
9 | include/httpd/ap_provider.h | 9 | include/httpd/ap_provider.h | |
10 | include/httpd/ap_regex.h | 10 | include/httpd/ap_regex.h | |
11 | include/httpd/ap_regkey.h | 11 | include/httpd/ap_regkey.h | |
12 | include/httpd/ap_release.h | 12 | include/httpd/ap_release.h | |
13 | include/httpd/http_config.h | 13 | include/httpd/http_config.h | |
14 | ${PLIST.worker}include/httpd/fdqueue.h | 14 | ${PLIST.worker}include/httpd/fdqueue.h | |
@@ -731,26 +731,27 @@ share/httpd/manual/mod/mod_authnz_ldap.h | @@ -731,26 +731,27 @@ share/httpd/manual/mod/mod_authnz_ldap.h | |||
731 | share/httpd/manual/mod/mod_authz_dbm.html | 731 | share/httpd/manual/mod/mod_authz_dbm.html | |
732 | share/httpd/manual/mod/mod_authz_dbm.html.en | 732 | share/httpd/manual/mod/mod_authz_dbm.html.en | |
733 | share/httpd/manual/mod/mod_authz_dbm.html.ko.euc-kr | 733 | share/httpd/manual/mod/mod_authz_dbm.html.ko.euc-kr | |
734 | share/httpd/manual/mod/mod_authz_default.html | 734 | share/httpd/manual/mod/mod_authz_default.html | |
735 | share/httpd/manual/mod/mod_authz_default.html.en | 735 | share/httpd/manual/mod/mod_authz_default.html.en | |
736 | share/httpd/manual/mod/mod_authz_default.html.ja.utf8 | 736 | share/httpd/manual/mod/mod_authz_default.html.ja.utf8 | |
737 | share/httpd/manual/mod/mod_authz_default.html.ko.euc-kr | 737 | share/httpd/manual/mod/mod_authz_default.html.ko.euc-kr | |
738 | share/httpd/manual/mod/mod_authz_groupfile.html | 738 | share/httpd/manual/mod/mod_authz_groupfile.html | |
739 | share/httpd/manual/mod/mod_authz_groupfile.html.en | 739 | share/httpd/manual/mod/mod_authz_groupfile.html.en | |
740 | share/httpd/manual/mod/mod_authz_groupfile.html.ja.utf8 | 740 | share/httpd/manual/mod/mod_authz_groupfile.html.ja.utf8 | |
741 | share/httpd/manual/mod/mod_authz_groupfile.html.ko.euc-kr | 741 | share/httpd/manual/mod/mod_authz_groupfile.html.ko.euc-kr | |
742 | share/httpd/manual/mod/mod_authz_host.html | 742 | share/httpd/manual/mod/mod_authz_host.html | |
743 | share/httpd/manual/mod/mod_authz_host.html.en | 743 | share/httpd/manual/mod/mod_authz_host.html.en | |
744 | share/httpd/manual/mod/mod_authz_host.html.fr | |||
744 | share/httpd/manual/mod/mod_authz_host.html.ja.utf8 | 745 | share/httpd/manual/mod/mod_authz_host.html.ja.utf8 | |
745 | share/httpd/manual/mod/mod_authz_host.html.ko.euc-kr | 746 | share/httpd/manual/mod/mod_authz_host.html.ko.euc-kr | |
746 | share/httpd/manual/mod/mod_authz_owner.html | 747 | share/httpd/manual/mod/mod_authz_owner.html | |
747 | share/httpd/manual/mod/mod_authz_owner.html.en | 748 | share/httpd/manual/mod/mod_authz_owner.html.en | |
748 | share/httpd/manual/mod/mod_authz_owner.html.ja.utf8 | 749 | share/httpd/manual/mod/mod_authz_owner.html.ja.utf8 | |
749 | share/httpd/manual/mod/mod_authz_owner.html.ko.euc-kr | 750 | share/httpd/manual/mod/mod_authz_owner.html.ko.euc-kr | |
750 | share/httpd/manual/mod/mod_authz_user.html | 751 | share/httpd/manual/mod/mod_authz_user.html | |
751 | share/httpd/manual/mod/mod_authz_user.html.en | 752 | share/httpd/manual/mod/mod_authz_user.html.en | |
752 | share/httpd/manual/mod/mod_authz_user.html.ja.utf8 | 753 | share/httpd/manual/mod/mod_authz_user.html.ja.utf8 | |
753 | share/httpd/manual/mod/mod_authz_user.html.ko.euc-kr | 754 | share/httpd/manual/mod/mod_authz_user.html.ko.euc-kr | |
754 | share/httpd/manual/mod/mod_autoindex.html | 755 | share/httpd/manual/mod/mod_autoindex.html | |
755 | share/httpd/manual/mod/mod_autoindex.html.en | 756 | share/httpd/manual/mod/mod_autoindex.html.en | |
756 | share/httpd/manual/mod/mod_autoindex.html.fr | 757 | share/httpd/manual/mod/mod_autoindex.html.fr |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.53 2012/12/23 21:32:42 spz Exp $ | 1 | $NetBSD: distinfo,v 1.53.2.1 2013/03/08 18:36:42 spz Exp $ | |
2 | 2 | |||
3 | SHA1 (httpd-2.2.23.tar.bz2) = 2776145201068045d4ed83157a0e2e1c28c4c453 | 3 | SHA1 (httpd-2.2.24.tar.bz2) = f73bce14832ec40c1aae68f4f8c367cab2266241 | |
4 | RMD160 (httpd-2.2.23.tar.bz2) = 16b15876d8296a2733d4d28a8a78362d0677792d | 4 | RMD160 (httpd-2.2.24.tar.bz2) = 4c31b23615236c407779a23cbfcc8e05ba011224 | |
5 | Size (httpd-2.2.23.tar.bz2) = 5485205 bytes | 5 | Size (httpd-2.2.24.tar.bz2) = 5490439 bytes | |
6 | SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7 | 6 | SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7 | |
7 | SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150 | 7 | SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150 | |
8 | SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad | 8 | SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad | |
9 | SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13 | 9 | SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13 | |
10 | SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913 | 10 | SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913 | |
11 | SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 | 11 | SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 | |
12 | SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 | 12 | SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 | |
13 | SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 | 13 | SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 | |
14 | SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 | 14 | SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 | |
15 | SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 | 15 | SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 | |
16 | SHA1 (patch-docs_man_apxs.8) = 70797ea73ae6379492971bec1106a8427ae7fdaa | 16 | SHA1 (patch-docs_man_apxs.8) = 70797ea73ae6379492971bec1106a8427ae7fdaa | |
17 | SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1 | 17 | SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1 | |
18 | SHA1 (patch-modules_ssl_ssl__engine__kernel.c) = fd6f425d18231f0daca9fc2553638891a7241a4a | 18 | SHA1 (patch-modules_ssl_ssl__engine__kernel.c) = fd6f425d18231f0daca9fc2553638891a7241a4a |