head 1.7; access; symbols pkgsrc-2014Q1:1.6.0.80 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.78 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.76 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.74 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.72 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.70 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.68 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.66 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.64 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.62 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.60 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.58 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.56 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.54 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.52 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.50 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.48 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.46 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.44 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.42 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.40 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.38 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.36 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.34 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.32 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.30 pkgsrc-2008Q1:1.6.0.28 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.26 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.24 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.22 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.20 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.18 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.16 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.14 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.12 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.10 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.5.0.16 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.14 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.12 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.10 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.6 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5; locks; strict; comment @# @; 1.7 date 2014.06.10.15.22.18; author joerg; state dead; branches; next 1.6; commitid djgMkPoOrhNxnZDx; 1.6 date 2004.10.29.13.48.31; author abs; state Exp; branches; next 1.5; 1.5 date 2000.09.12.14.17.32; author jlam; state Exp; branches 1.5.16.1; next 1.4; 1.4 date 99.04.30.17.05.20; author tv; state dead; branches; next 1.3; 1.3 date 98.12.03.17.23.52; author tv; state Exp; branches; next 1.2; 1.2 date 98.11.12.23.54.33; author frueauf; state Exp; branches; next 1.1; 1.1 date 98.10.05.19.55.27; author cjs; state Exp; branches; next ; 1.5.16.1 date 2004.12.01.00.25.56; author salo; state Exp; branches; next ; desc @@ 1.7 log @Retire Apache 1.3 and 2.0. @ text @$NetBSD: patch-ad,v 1.6 2004/10/29 13:48:31 abs Exp $ --- src/ap/ap_hook.c.orig 2004-10-29 14:44:35.000000000 +0100 +++ src/ap/ap_hook.c @@@@ -740,6 +740,15 @@@@ static int ap_hook_call_func(va_list ap, *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5); rc = (*((int *)v_rc) != he->he_modeval.v_int); } + else if (he->he_sig == AP_HOOK_SIG5(int, ptr, ptr, ptr, ptr)) { + /* Call: int func(ptr,ptr,ptr,ptr) */ + void *v1 = va_arg(ap, va_type(ptr)); + void *v2 = va_arg(ap, va_type(ptr)); + void *v3 = va_arg(ap, va_type(ptr)); + void *v4 = va_arg(ap, va_type(ptr)); + *((int *)v_rc) = ((int(*)(void *, void *, void *, void *))(hf->hf_ptr))(v1, v2, v3, v4); + rc = (*((int *)v_rc) != he->he_modeval.v_int); + } else if (he->he_sig == AP_HOOK_SIG6(int, ptr, ptr, ptr, ptr, int)) { /* Call: int func(ptr,ptr,ptr,ptr,int) */ void *v1 = va_arg(ap, va_type(ptr)); @ 1.6 log @Update apache to 1.3.33 The main security vulnerabilities addressed in 1.3.33 are: * CAN-2004-0940 (cve.mitre.org) Fix potential buffer overflow with escaped characters in SSI tag string. * CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. New features * Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. * Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. The following bugs were found in Apache 1.3.31 (or earlier) and have been fixed in Apache 1.3.33: * mod_rewrite: Fix query string handling for proxied URLs. PR 14518. * mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. * mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. * Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. * No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2000/09/12 14:17:32 jlam Exp $ @ 1.5 log @Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl. EAPI didn't change so no need to change Apache's version number. Also standardize package builds to have Apache listen on ports 80/443 regardless of UID of user that builds the package, and make MAINTAINER point to me. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/ap/ap_hook.c.orig Thu Sep 7 01:19:46 2000 d5 1 a5 1 @@@@ -740,6 +740,15 @@@@ @ 1.5.16.1 log @Pullup ticket 141 - requested by David Brownlee security fix for apache Module Name: pkgsrc Committed By: tron Date: Mon Oct 25 08:44:16 UTC 2004 Modified Files: pkgsrc/www/apache: Makefile PLIST distinfo Removed Files: pkgsrc/www/apache/patches: patch-ap Log Message: Update "apache" package to version 1.3.32. Changes since version 1.3.31: - mod_rewrite: Fix query string handling for proxied URLs. PR 14518. [michael teitler , Jan Kratochvil ] - mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. [André Malo] - mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. [Joe Orton] - Trigger an error when a LoadModule directive attempts to load a module which is built-in. This is a common error when switching from a DSO build to a static build. [Jeff Trawick, Geoffrey Young] - Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. [Will Slater ] - Fix memory leak in the cache handling of mod_rewrite. PR 27862. [chunyan sheng , André Malo] - mod_rewrite no longer confuses the RewriteMap caches if different maps defined in different virtual hosts use the same map name. PR 26462. [André Malo] - mod_setenvif: Remove "support" for Remote_User variable which never worked at all. PR 25725. [André Malo] - mod_usertrack: Escape the cookie name before pasting into the regexp. [André Malo] - Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. [Jeff Trawick] - SECURITY: CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. [Mark Cox] - Fix a bunch of cases where the return code of the regex compiler was not checked properly. This affects mod_usertrack and core. PR 28218. [André Malo] - No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. [Jim Jagielski, Rasmus Lerdorf] - COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. [Jim Jagielski] --- Module Name: pkgsrc Committed By: abs Date: Fri Oct 29 13:48:31 UTC 2004 Modified Files: pkgsrc/www/apache: Makefile distinfo pkgsrc/www/apache/patches: patch-aa patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak patch-am patch-ao Removed Files: pkgsrc/www/apache/patches: patch-al Log Message: Update apache to 1.3.33 The main security vulnerabilities addressed in 1.3.33 are: * CAN-2004-0940 (cve.mitre.org) Fix potential buffer overflow with escaped characters in SSI tag string. * CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. New features * Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. * Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. The following bugs were found in Apache 1.3.31 (or earlier) and have been fixed in Apache 1.3.33: * mod_rewrite: Fix query string handling for proxied URLs. PR 14518. * mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. * mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. * Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. * No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. --- Module Name: pkgsrc Committed By: salo Date: Mon Nov 15 19:13:41 UTC 2004 Modified Files: pkgsrc/www/apache/patches: patch-ai Log Message: Revert rev 1.9, do not expand @@INSTALL@@, it's done in post-patch. (hi abs!) --- Module Name: pkgsrc Committed By: tron Date: Tue Nov 16 08:23:45 UTC 2004 Modified Files: pkgsrc/www/apache: distinfo Log Message: Regen after "patch-ai" was changed. (hi salo!) @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2004/10/29 13:48:31 abs Exp $ d3 1 a3 1 --- src/ap/ap_hook.c.orig 2004-10-29 14:44:35.000000000 +0100 d5 1 a5 1 @@@@ -740,6 +740,15 @@@@ static int ap_hook_call_func(va_list ap, @ 1.4 log @Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl now makes use of OpenSSL. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 1998/12/03 17:23:52 tv Exp $ d3 18 a20 19 --- src/include/ap_config.h.orig Sat Oct 3 11:33:35 1998 +++ src/include/ap_config.h Wed Dec 2 11:18:59 1998 @@@@ -398,7 +398,7 @@@@ #define DEFAULT_USER_DIR "Library/Web Documents" #define DEFAULT_USER "nobody" #define DEFAULT_GROUP "nogroup" -#define DEFAULT_PATH "/bin:/usr/bin:/usr/local/bin" +#define DEFAULT_PATH "/bin:/usr/bin:@@@@PREFIX@@@@/bin:/usr/local/bin" #endif #elif defined(LINUX) @@@@ -592,6 +592,7 @@@@ #define HAVE_MMAP 1 #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES +#define USE_FLOCK_SERIALIZED_ACCEPT #endif #elif defined(UTS21) @ 1.3 log @Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Some pkglint nits and add missing rcs ids. @ text @d3 11 a13 5 This patch is necessary for listening on multiple ports safely. It has been submitted to the apache group, the gnats ID is os-netbsd/3120. --- src/include/ap_config.h~ Thu Sep 17 23:49:12 1998 +++ src/include/ap_config.h Mon Oct 5 09:41:28 1998 @ 1.1 log @Add patch to fix serialized accept. Also submitted to the Apache Group, gnats number os-netsd/3120. @ text @d1 1 a1 1 $Id$ @