head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2010Q3:1.5.0.20 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.18 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.16 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.14 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.12 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.10 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.8 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.6 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.4 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2; locks; strict; comment @# @; 1.6 date 2010.11.01.18.03.04; author adam; state dead; branches; next 1.5; 1.5 date 2008.08.09.20.33.38; author kefren; state Exp; branches; next 1.4; 1.4 date 2007.09.07.23.28.23; author tron; state dead; branches 1.4.8.1; next 1.3; 1.3 date 2007.06.28.01.49.04; author lkundrak; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2003.05.25.08.58.11; author epg; state dead; branches; next 1.1; 1.1 date 2003.04.03.08.29.01; author itojun; state Exp; branches; next ; 1.4.8.1 date 2008.08.10.11.57.39; author tron; state Exp; branches; next ; 1.3.2.1 date 2007.09.08.09.54.47; author ghen; state dead; branches; next ; desc @@ 1.6 log @Changes 2.0.64: * SECURITY: CVE-2010-1452 (cve.mitre.org) mod_dav: Fix Handling of requests without a path segment. * SECURITY: CVE-2009-1891 (cve.mitre.org) Fix a potential Denial-of-Service attack against mod_deflate or other modules, by forcing the server to consume CPU time in compressing a large file after a client disconnects. * SECURITY: CVE-2009-3095 (cve.mitre.org) mod_proxy_ftp: sanity check authn credentials. * SECURITY: CVE-2009-3094 (cve.mitre.org) mod_proxy_ftp: NULL pointer dereference on error paths. * SECURITY: CVE-2009-3555 (cve.mitre.org) mod_ssl: Comprehensive fix of the TLS renegotiation prefix injection attack when compiled against OpenSSL version 0.9.8m or later. Introduces the 'SSLInsecureRenegotiation' directive to reopen this vulnerability and offer unsafe legacy renegotiation with clients which do not yet support the new secure renegotiation protocol, RFC 5746. * SECURITY: CVE-2009-3555 (cve.mitre.org) mod_ssl: A partial fix for the TLS renegotiation prefix injection attack for OpenSSL versions prior to 0.9.8l; reject any client-initiated renegotiations. Forcibly disable keepalive for the connection if there is any buffered data readable. Any configuration which requires renegotiation for per-directory/location access control is still vulnerable, unless using openssl 0.9.8l or later. * SECURITY: CVE-2010-0434 (cve.mitre.org) Ensure each subrequest has a shallow copy of headers_in so that the parent request headers are not corrupted. Elimiates a problematic optimization in the case of no request body. * SECURITY: CVE-2008-2364 (cve.mitre.org) mod_proxy_http: Better handling of excessive interim responses from origin server to prevent potential denial of service and high memory usage. * SECURITY: CVE-2010-0425 (cve.mitre.org) mod_isapi: Do not unload an isapi .dll module until the request processing is completed, avoiding orphaned callback pointers. * SECURITY: CVE-2008-2939 (cve.mitre.org) mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of the FTP URL. Discovered by Marc Bevand of Rapid7. * Fix recursive ErrorDocument handling. * mod_ssl: Do not do overlapping memcpy. * Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass through on a 304 response. * apxs: Fix -A and -a options to ignore whitespace in httpd.conf @ text @$NetBSD: patch-aq,v 1.5 2008/08/09 20:33:38 kefren Exp $ --- modules/proxy/proxy_ftp.c.orig 2008-08-09 23:27:01.000000000 +0300 +++ modules/proxy/proxy_ftp.c 2008-08-09 23:27:30.000000000 +0300 @@@@ -382,6 +382,7 @@@@ c->bucket_alloc)); } if (wildcard != NULL) { + wildcard = ap_escape_html(p, wildcard); APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(wildcard, strlen(wildcard), p, c->bucket_alloc)); @ 1.5 log @CVE-2008-2939 bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Remove obsolete patch files. @ text @d1 11 a11 87 $NetBSD: patch-aq,v 1.3 2007/06/28 01:49:04 lkundrak Exp $ Fix for CVE-2007-1863 remote crash when mod_cache enabled. --- modules/experimental/cache_util.c.orig 2006-07-12 09:40:55.000000000 +0200 +++ modules/experimental/cache_util.c @@@@ -186,10 +186,12 @@@@ CACHE_DECLARE(int) ap_cache_check_freshn age = ap_cache_current_age(info, age_c, r->request_time); /* extract s-maxage */ - if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "s-maxage", &val)) { + if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "s-maxage", &val) + && val != NULL) { smaxage = apr_atoi64(val); } - else if (cc_ceresp && ap_cache_liststr(r->pool, cc_ceresp, "s-maxage", &val)) { + else if (cc_ceresp && ap_cache_liststr(r->pool, cc_ceresp, "s-maxage", &val) + && val != NULL) { smaxage = apr_atoi64(val); } else { @@@@ -197,7 +199,8 @@@@ CACHE_DECLARE(int) ap_cache_check_freshn } /* extract max-age from request */ - if (cc_req && ap_cache_liststr(r->pool, cc_req, "max-age", &val)) { + if (cc_req && ap_cache_liststr(r->pool, cc_req, "max-age", &val) + && val != NULL) { maxage_req = apr_atoi64(val); } else { @@@@ -205,10 +208,12 @@@@ CACHE_DECLARE(int) ap_cache_check_freshn } /* extract max-age from response */ - if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "max-age", &val)) { + if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "max-age", &val) + && val != NULL) { maxage_cresp = apr_atoi64(val); } - else if (cc_ceresp && ap_cache_liststr(r->pool, cc_ceresp, "max-age", &val)) { + else if (cc_ceresp && ap_cache_liststr(r->pool, cc_ceresp, "max-age", &val) + && val != NULL) { maxage_cresp = apr_atoi64(val); } else @@@@ -231,14 +236,28 @@@@ CACHE_DECLARE(int) ap_cache_check_freshn /* extract max-stale */ if (cc_req && ap_cache_liststr(r->pool, cc_req, "max-stale", &val)) { - maxstale = apr_atoi64(val); + if(val != NULL) { + maxstale = apr_atoi64(val); + } + else { + /* + * If no value is assigned to max-stale, then the client is willing + * to accept a stale response of any age (RFC2616 14.9.3). We will + * set it to one year in this case as this situation is somewhat + * similar to a "never expires" Expires header (RFC2616 14.21) + * which is set to a date one year from the time the response is + * sent in this case. + */ + maxstale = APR_INT64_C(86400*365); + } } else { maxstale = 0; } /* extract min-fresh */ - if (cc_req && ap_cache_liststr(r->pool, cc_req, "min-fresh", &val)) { + if (cc_req && ap_cache_liststr(r->pool, cc_req, "min-fresh", &val) + && val != NULL) { minfresh = apr_atoi64(val); } else { @@@@ -384,6 +403,9 @@@@ CACHE_DECLARE(int) ap_cache_liststr(apr_ next - val_start); } } + else { + *val = NULL; + } } return 1; } @ 1.4.8.1 log @Pullup ticket 2477 - requested by kefren Security patch for apache2 Revisions pulled up: - www/apache2/Makefile 1.126 - www/apache2/distinfo 1.54 - www/apache2/patches/patch-aq 1.5 --- Module Name: pkgsrc Committed By: kefren Date: Sat Aug 9 20:33:38 UTC 2008 Modified Files: pkgsrc/www/apache2: Makefile distinfo Added Files: pkgsrc/www/apache2/patches: patch-aq Log Message: CVE-2008-2939 bump PKGREVISION @ text @d1 87 a87 11 $NetBSD$ --- modules/proxy/proxy_ftp.c.orig 2008-08-09 23:27:01.000000000 +0300 +++ modules/proxy/proxy_ftp.c 2008-08-09 23:27:30.000000000 +0300 @@@@ -382,6 +382,7 @@@@ c->bucket_alloc)); } if (wildcard != NULL) { + wildcard = ap_escape_html(p, wildcard); APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(wildcard, strlen(wildcard), p, c->bucket_alloc)); @ 1.3 log @Fixes for security issues and PKGREVISION bump; CVE-2006-5752 XSS in mod_status with ExtendedStatus on CVE-2007-1863 remote crash when mod_cache enabled @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @Pullup ticket 2184 - requested by tron security update for apache2 - pkgsrc/devel/apr0/Makefile 1.3 - pkgsrc/devel/apr0/distinfo 1.2 - pkgsrc/www/apache2/Makefile 1.118 - pkgsrc/www/apache2/Makefile.commom 1.22 - pkgsrc/www/apache2/PLIST 1.35 - pkgsrc/www/apache2/distinfo 1.51 - pkgsrc/www/apache2/patches/patch-ap removed - pkgsrc/www/apache2/patches/patch-aq removed Module Name: pkgsrc Committed By: tron Date: Fri Sep 7 23:11:41 UTC 2007 Modified Files: pkgsrc/devel/apr0: Makefile distinfo pkgsrc/www/apache2: Makefile Makefile.common PLIST distinfo Log Message: 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. --- Module Name: pkgsrc Committed By: tron Date: Fri Sep 7 23:28:23 UTC 2007 Removed Files: pkgsrc/www/apache2/patches: patch-ap patch-aq Log Message: Remove obsolete patch files. @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.3 2007/06/28 01:49:04 lkundrak Exp $ @ 1.2 log @Split some stuff out into a new Makefile.common so that the new deve/apr package can use it. Depend on the new apr package. Approved by jlam@@netbsd.org. @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.1 2003/04/03 08:29:01 itojun Exp $ d3 85 a87 20 --- srclib/apr/config.layout.orig Thu Apr 3 17:14:54 2003 +++ srclib/apr/config.layout Thu Apr 3 17:14:01 2003 @@@@ -229,3 +229,17 @@@@ infodir: ${exec_prefix}/share/info libsuffix: -${APR_MAJOR_VERSION} + +# NetBSD (pkgsrc) layout + + prefix: /usr/pkg + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libexecdir: ${exec_prefix}/lib/httpd + mandir: ${prefix}/man + datadir: ${prefix}/share/httpd + includedir: ${prefix}/include/apr + localstatedir: /var + runtimedir: ${localstatedir}/run + @ 1.1 log @forgot to add @ text @d1 1 a1 1 $NetBSD$ @