[pkgsrc/trunk]: pkgsrc Update apache to 1.3.33

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7dcd18be41d1
branches:  trunk
changeset: 482535:7dcd18be41d1
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Oct 29 13:48:31 2004 +0000

description:
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.

diffstat:

 doc/CHANGES                 |   3 ++-
 www/apache/Makefile         |   4 ++--
 www/apache/distinfo         |  33 ++++++++++++++++-----------------
 www/apache/patches/patch-aa |   4 ++--
 www/apache/patches/patch-ab |   6 +++---
 www/apache/patches/patch-ac |   8 ++++----
 www/apache/patches/patch-ad |   6 +++---
 www/apache/patches/patch-ae |  27 ++++++++-------------------
 www/apache/patches/patch-af |   6 +++---
 www/apache/patches/patch-ag |   6 +++---
 www/apache/patches/patch-ah |   6 +++---
 www/apache/patches/patch-ai |   8 ++++----
 www/apache/patches/patch-aj |   8 ++++----
 www/apache/patches/patch-ak |   4 ++--
 www/apache/patches/patch-al |  19 -------------------
 www/apache/patches/patch-am |   8 ++++----
 www/apache/patches/patch-ao |   8 ++++----
 17 files changed, 67 insertions(+), 97 deletions(-)

diffs (truncated from 362 to 300 lines):

diff -r 69f2a6c80681 -r 7dcd18be41d1 doc/CHANGES
--- a/doc/CHANGES       Fri Oct 29 12:56:24 2004 +0000
+++ b/doc/CHANGES       Fri Oct 29 13:48:31 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7601 2004/10/29 13:04:19 abs Exp $
+$NetBSD: CHANGES,v 1.7602 2004/10/29 13:49:54 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -4965,4 +4965,5 @@
        Updated mkvtoolnix to 0.9.7 [salo 2004-10-29]
        Updated mmg to 0.9.7 [salo 2004-10-29]
        Updated setiathome to 3.08 [abs 2004-10-29]
+       Updated apache to 1.3.33 [abs 2004-10-29]
 
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/Makefile
--- a/www/apache/Makefile       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/Makefile       Fri Oct 29 13:48:31 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.154 2004/10/25 08:44:16 tron Exp $
+# $NetBSD: Makefile,v 1.155 2004/10/29 13:48:31 abs Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
-DISTNAME=              apache_1.3.32
+DISTNAME=              apache_1.3.33
 PKGNAME=               ${DISTNAME:S/_/-/}
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/distinfo
--- a/www/apache/distinfo       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/distinfo       Fri Oct 29 13:48:31 2004 +0000
@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.39 2004/10/25 08:44:16 tron Exp $
+$NetBSD: distinfo,v 1.40 2004/10/29 13:48:31 abs Exp $
 
-SHA1 (apache_1.3.32.tar.gz) = 815148a0a070fe6058a426026d77c45aefdf3d2a
-Size (apache_1.3.32.tar.gz) = 2472811 bytes
+SHA1 (apache_1.3.33.tar.gz) = 4cd49534d1abd04c81ab215f2457122d85855b0d
+Size (apache_1.3.33.tar.gz) = 2468567 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (mod_ssl-2.8.21-1.3.32.tar.gz) = 6bbf83d716254e157b2c6ba9fd13e6b3bfc43239
 Size (mod_ssl-2.8.21-1.3.32.tar.gz) = 754629 bytes
-SHA1 (patch-aa) = 3a655678f5e99769f27fca06a8279b14a8e8e8be
-SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
-SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
-SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
-SHA1 (patch-ae) = 037e24a3019025f031172af0102f043ddf2f0556
-SHA1 (patch-af) = 4b4450ceede5c803023eef41c63a2058e7577821
-SHA1 (patch-ag) = f1cc9b833afd87b42aac99431d696f3780762bab
-SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
-SHA1 (patch-ai) = 08a27cd408c409a9f94b9b8579aeec2c40ea86dc
-SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
-SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
-SHA1 (patch-al) = a27b9676998621229dc3a1d920ea44b8e622feb2
-SHA1 (patch-am) = d05f7c30b73c0e90daf17d9d1c4838be7fd73b02
-SHA1 (patch-ao) = 5930f9ea0f5080b260a6e0c66a37c6d1ad0df4d4
+SHA1 (patch-aa) = ae280b14dc0102ecfbe3675ca0b5d2b74ee790ca
+SHA1 (patch-ab) = 084d52bb2afbacf18b9d0793293d8ae333c67802
+SHA1 (patch-ac) = b961c90a58a94f48daff417af146df98d5ec428c
+SHA1 (patch-ad) = c02cd1af3c4b5e0d49aaa7f0eff20a8d76a633aa
+SHA1 (patch-ae) = 59318dd3376b10b84c0126d90f4b244a18268791
+SHA1 (patch-af) = 55b27779b63cd86d3aef5b700c13600f0d840554
+SHA1 (patch-ag) = 0c075960215e55525ffee15c381b82775614a2d2
+SHA1 (patch-ah) = 477e32b049f66a326364236f63e96759f2274df6
+SHA1 (patch-ai) = cb81536577b5b8bcf598d66eb345b8866cb089d5
+SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
+SHA1 (patch-ak) = a3790a19e06aa4aa02977f1f30c09697e46488c7
+SHA1 (patch-am) = d298b35feb177f0efcda1f9f5ebcba562ae46c29
+SHA1 (patch-ao) = 9ec5f32b2e9cf4c423b5d819fc76f652b27c6c29
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-aa
--- a/www/apache/patches/patch-aa       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-aa       Fri Oct 29 13:48:31 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.23 2004/05/13 21:21:27 abs Exp $
+$NetBSD: patch-aa,v 1.24 2004/10/29 13:48:31 abs Exp $
 
---- Makefile.tmpl.orig 2004-05-13 22:18:11.000000000 +0100
+--- Makefile.tmpl.orig 2004-10-29 14:44:35.000000000 +0100
 +++ Makefile.tmpl
 @@ -56,6 +56,8 @@ INSTALL_DATA    = $(INSTALL) $(IFLAGS_DA
  PERL            = @PERL@
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ab
--- a/www/apache/patches/patch-ab       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ab       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2001/04/29 20:42:29 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2004/10/29 13:48:31 abs Exp $
 
---- conf/httpd.conf-dist.orig  Sun Mar  4 02:42:23 2001
+--- conf/httpd.conf-dist.orig  2004-10-29 14:44:35.000000000 +0100
 +++ conf/httpd.conf-dist
-@@ -197,7 +197,12 @@
+@@ -197,7 +197,12 @@ MaxRequestsPerChild 0
  # the order below without expert advice.
  #
  # Example:
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ac
--- a/www/apache/patches/patch-ac       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ac       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2001/06/09 06:36:43 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2004/10/29 13:48:31 abs Exp $
 
---- htdocs/index.html.en.orig  Thu May  3 20:00:38 2001
-+++ htdocs/index.html.en       Sat Jun  9 01:44:14 2001
-@@ -27,12 +27,26 @@
+--- htdocs/index.html.en.orig  2001-05-04 01:00:38.000000000 +0100
++++ htdocs/index.html.en
+@@ -27,12 +27,26 @@ issues.</p>
  
  <hr width="50%" size="8" />
  <p>The Apache <a href="manual/">documentation</a> has been included
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ad
--- a/www/apache/patches/patch-ad       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ad       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ad,v 1.6 2004/10/29 13:48:31 abs Exp $
 
---- src/ap/ap_hook.c.orig      Thu Sep  7 01:19:46 2000
+--- src/ap/ap_hook.c.orig      2004-10-29 14:44:35.000000000 +0100
 +++ src/ap/ap_hook.c
-@@ -740,6 +740,15 @@
+@@ -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);
      }
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ae
--- a/www/apache/patches/patch-ae       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ae       Fri Oct 29 13:48:31 2004 +0000
@@ -1,30 +1,19 @@
-$NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $
+$NetBSD: patch-ae,v 1.7 2004/10/29 13:48:31 abs Exp $
 
---- src/modules/standard/mod_include.c.orig    Thu Sep 20 23:51:54 2001
+--- src/modules/standard/mod_include.c.orig    2004-10-25 16:44:04.000000000 +0100
 +++ src/modules/standard/mod_include.c
-@@ -93,7 +93,11 @@
+@@ -50,7 +50,10 @@
  #include "http_log.h"
  #include "http_main.h"
  #include "util_script.h"
 +#include "ap_include_extern.h"
 +#include "ap_hook.h"
  #endif
-+#define get_tag ap_include_get_tag
 +#define parse_string ap_include_parse_string
  
  #define STARTING_SEQUENCE "<!--#"
  #define ENDING_SEQUENCE "-->"
-@@ -352,7 +356,8 @@
-  * the tag value is html decoded if dodecode is non-zero
-  */
- 
--static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
-+API_EXPORT(char *)
-+ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
- {
-     char *t = tag, *tag_val, c, term;
- 
-@@ -471,7 +476,8 @@
+@@ -447,7 +450,8 @@ static int get_directive(FILE *in, char 
  /*
   * Do variable substitution on strings
   */
@@ -34,7 +23,7 @@
                        size_t length, int leave_name)
  {
      char ch;
-@@ -669,7 +675,8 @@
+@@ -645,7 +649,8 @@ static int handle_include(FILE *in, requ
              parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
              if (tag[0] == 'f') {
                  /* be safe; only files in this directory or below allowed */
@@ -44,7 +33,7 @@
                      error_fmt = "unable to include file \"%s\" "
                          "in parsed file %s";
                  }
-@@ -1081,7 +1088,8 @@
+@@ -1057,7 +1062,8 @@ static int find_file(request_rec *r, con
                          "in parsed file %s";
          }
          else {
@@ -54,7 +43,7 @@
              rr = ap_sub_req_lookup_file(tag_val, r);
  
              if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2162,6 +2170,16 @@
+@@ -2140,6 +2146,16 @@ static int handle_printenv(FILE *in, req
      }
  }
  
@@ -71,7 +60,7 @@
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2300,6 +2318,13 @@
+@@ -2275,6 +2291,13 @@ static void send_parsed_content(FILE *f,
              }
  #endif
              else {
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-af
--- a/www/apache/patches/patch-af       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-af       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2002/02/01 16:04:39 jlam Exp $
+$NetBSD: patch-af,v 1.10 2004/10/29 13:48:31 abs Exp $
 
---- src/modules/standard/mod_so.c.orig Fri Feb  1 10:05:43 2002
+--- src/modules/standard/mod_so.c.orig 2004-10-29 14:44:35.000000000 +0100
 +++ src/modules/standard/mod_so.c
-@@ -324,7 +324,15 @@
+@@ -321,7 +321,15 @@ static const char *load_file(cmd_parms *
          return err;
      }
      
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ag
--- a/www/apache/patches/patch-ag       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ag       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2002/02/01 16:04:39 jlam Exp $
+$NetBSD: patch-ag,v 1.8 2004/10/29 13:48:31 abs Exp $
 
---- src/os/unix/os.c.orig      Mon Nov 12 12:36:38 2001
+--- src/os/unix/os.c.orig      2004-02-20 21:01:04.000000000 +0000
 +++ src/os/unix/os.c
-@@ -132,7 +132,12 @@
+@@ -153,7 +153,12 @@ void ap_os_dso_unload(void *handle)
  #elif defined(HAVE_DYLD)
      NSUnLinkModule(handle,FALSE);
  
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ah
--- a/www/apache/patches/patch-ah       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ah       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2000/09/12 14:17:33 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2004/10/29 13:48:31 abs Exp $
 
---- src/support/apachectl.orig Thu Sep  7 01:19:50 2000
+--- src/support/apachectl.orig 2004-10-29 14:44:35.000000000 +0100
 +++ src/support/apachectl
-@@ -27,6 +27,9 @@
+@@ -42,6 +42,9 @@ PIDFILE=/usr/local/apache/logs/httpd.pid
  # the path to your httpd binary, including options if necessary
  HTTPD='/usr/local/apache/src/httpd'
  #
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ai
--- a/www/apache/patches/patch-ai       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ai       Fri Oct 29 13:48:31 2004 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.8 2002/04/02 14:13:03 jlam Exp $
+$NetBSD: patch-ai,v 1.9 2004/10/29 13:48:31 abs Exp $
 
---- src/support/apxs.pl.orig   Tue Apr  2 02:15:23 2002
+--- src/support/apxs.pl.orig   2004-10-29 14:44:35.000000000 +0100
 +++ src/support/apxs.pl
-@@ -460,8 +460,7 @@
+@@ -423,8 +423,7 @@ if ($opt_i or $opt_e) {
          if ($^O ne "MSWin32") {
              $t =~ s|^.+/([^/]+)$|$1|;
              if ($opt_i) {
 -                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
 -                push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+                push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
++                push(@cmds, "/usr/bin/install -c -o root -g wheel $f $CFG_LIBEXECDIR/$t");
              }
          }
        else {
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-aj
--- a/www/apache/patches/patch-aj       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-aj       Fri Oct 29 13:48:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2001/10/17 19:17:00 jlam Exp $
+$NetBSD: patch-aj,v 1.8 2004/10/29 13:48:31 abs Exp $
 
---- htdocs/index.html.fr.orig  Wed Jun 27 08:38:39 2001
-+++ htdocs/index.html.fr       Tue Oct 16 22:29:50 2001
-@@ -36,12 +36,28 @@
+--- htdocs/index.html.fr.orig  2001-06-27 09:38:39.000000000 +0100
++++ htdocs/index.html.fr
+@@ -36,12 +36,28 @@ site et ne peut intervenir sur sa config
  <hr width="50%" size="8">
  
  <p>La <a href="manual/">documentation</a> Apache est incluse dans cette
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-ak
--- a/www/apache/patches/patch-ak       Fri Oct 29 12:56:24 2004 +0000
+++ b/www/apache/patches/patch-ak       Fri Oct 29 13:48:31 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.5 2001/10/16 04:11:06 jlam Exp $
+$NetBSD: patch-ak,v 1.6 2004/10/29 13:48:31 abs Exp $
 
---- src/Makefile.tmpl.orig     Sun Oct 14 22:14:29 2001
+--- src/Makefile.tmpl.orig     2004-10-29 14:44:35.000000000 +0100
 +++ src/Makefile.tmpl
 @@ -2,7 +2,7 @@
  CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
diff -r 69f2a6c80681 -r 7dcd18be41d1 www/apache/patches/patch-al