Update "apache" package to version 1.3.28. Changes since version 1.3.27:

- SECURITY: CAN-2003-0460 (cve.mitre.org)
  Fix the rotatelogs support program on Win32 and OS/2 to ignore
  special control characters received over the pipe.  Previously
  such characters could cause it to quit logging and exit.
  [André Malo]
- Prevent the server from crashing when entering infinite loops. The
  new LimitInternalRecursion directive configures limits of subsequent
  internal redirects and nested subrequests, after which the request
  will be aborted.  PR 19753 (and probably others).
  [William Rowe, Jeff Trawick, Jim Jagielski, André Malo]
- Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
  response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
- Removed BIND_NOSTART from HP/UX shl_load() logic for loadable
  Apache modules, so that statics are initialized when the module
  is loaded (especially critical for c++ modules on HPUX.)
  [William Rowe, Noah Arliss <narliss@netegrity.com>]
- Win32 build system changes; always recompile buildmark.c (used for
  Apache -v 'server built' messages) even when Apache is built from
  within the IDE; build test_char.h and uri_delims.h from within the
  ApacheCore.dsp project.  PR 12706.  [William Rowe]
- Introduce Win32 .pdb diagnostic symbols into the Apache 1.3 build
  (as created in Apache 2.0.45 and later.)  Makes debugging and
  analysis of crash dumps and Dr. Watson logs trivial.  Requires the
  Win32 binary builder to set aside the exact .pdb files that match
  the released binaries (.exe/.so files) for reference by users and
  developers.  [William Rowe]
- Make sure the accept mutex is released before calling child exit
  hooks and cleanups.  Otherwise, modules can segfault in such code
  and, with pthread mutexes, leave the server deadlocked.  Even if
  the module doesn't segfault, if it performs extensive processing
  it can temporarily prevent the server from accepting new
  connections.  [Jeff Trawick]
- Fix mod_rewrite's handling of absolute URIs. The escaping routines
  now work scheme dependent and the query string will only be
  appended if supported by the particular scheme.  [André Malo]
- Use appropriate language codes for Czech (cs) and Traditional Chinese
  (zh-tw) in default config files. PR 9427.  [André Malo]
- Don't block synchronous signals (e.g., SIGSEGV) while waiting for
  and holding a pthread accept mutex.  [Jeff Trawick]
- AIX: Change the default accept mechanism from pthread back to
  fcntl.  Idle child cleanup doesn't work when the child selected
  for termination by the parent is waiting on a pthread mutex, and
  because the AIX kernel's notion of hot process is apparently the
  same as Apache's, it is common for the Apache parent to continually
  select a child for termination that the kernel will leave waiting
  on the mutex for extended periods of time.  There are other
  concerns with pthread mutexes as well, such as the ability to
  deadlock the server if a child process segfaults while holding the
  mutex.  [Jeff Trawick]
- Fix a pair of potential buffer overflows in htdigest
  [Martin Schulze <joey@infodrom.org>, Thom May]
- A newly created child now has a start_time of 0, to prevent
  mod_status from displaying a bogus value for the "time to
  process most recent request" column for freshly-started children
  in a previously-used scoreboard slot. [Martin Kraemer]
- When using Redirect in directory context, append requested query
  string if there's no one supplied by configuration. PR 10961.
  [André Malo]
- Fix path handling of mod_rewrite, especially on non-unix systems.
  There was some confusion between local paths and URL paths.
  PR 12902.  [André Malo]
- backport from 2.x series: Prevent endless loops of internal redirects
  in mod_rewrite by aborting after exceeding a limit of internal redirects.
  The limit defaults to 10 and can be changed using the RewriteOptions
  directive. PR 17462.  [André Malo]
- Use the correct locations of srm.conf and access.conf when tailoring
  the httpd.conf during the install process. PR 9446.
  [Stanislav Brabec <utx@penguin.cz>]
- suexec: Be more pedantic when cleaning environment. Clean it
  immediately after startup. PR 2790, 10449.
  [Jeff Stewart <jws@purdue.edu>, André Malo]
- Fix apxs to insert LoadModule/AddModule directives only outside of
  sections. PR 8712, 9012.  [André Malo]
- Fix suexec compile error under SUNOS4, where strerror() doesn't
  exist. PR 5913, 9977.
  [Jonathan W Miner <Jonathan.W.Miner@lmco.com>]
- Unix build: Add support for environment variable
  EXTRA_LDFLAGS_SHLIB, which allows the user to add to the hard-coded
  ld flags specified for DSOs.  Compare with the existing LDFLAGS_SHLIB
  environment variable, which allows the user to completely replace the
  hard-coded ld flags specified for DSOs.  [Jeff Trawick]
- mod_auth_digest no longer tries to guess AuthDigestDomain, if it's
  not specified. Now it assumes "/" as already documented. PR 16937.
  [André Malo]
- In configure always assume suexec-umask to be an octal value by
  prepending a "0". PR 16984.  [André Malo]
- Fix typo in suexec -V output. PR 9034.
  [Youichirou Koga <y-koga@apache.or.jp>]
- Fix bug where 'Satisfy Any' without an AuthType resulted in an
  "Internal Server Error" response. PR 9076.  [André Malo]
- mod_rewrite: Allow "RewriteEngine Off" even if no
  "Options FollowSymlinks" (or SymlinksIfOwnermatch) is set.
  PR 12395.  [André Malo]
- Change the log messages for setsockopt(TCP_NODELAY) and
  getsockname() failures to log the client IP address and to
  change the log level to debug.  [Jeff Trawick]
- Correction to mod_negotation for Win32, OS2, Netware etc, where
  case insensitive requests such as the HEADER or README search
  from autoindex would fail to match HEADER.html (because the
  system internally looked for the case-sensitive header.* pattern.)
  PR 7300 [William Rowe]
- Correction to mod_autoindex so that only text/* files (prefering
  /html, then /plain, then some other flavor) can be recovered
  from a multiview-based HEADER or README subrequest.
  [William Rowe]
- Improvements to mod_usertrack that allows for a regular (verbose)
  as well as "compact" version of the tracking cookie (the new
  'CookieFormat' directive), and the ability to prepend a string
  to the cookie via the 'CookiePrefix' directive.
  [Pål Løberg <pallo@initio.no>, with cleanup by Jim Jagielski]
- Certain 3rd party modules would bypass the Apache API and not
  invoke ap_cleanup_for_exec() before creating sub-processes.
  To such a child process, Apache's file descriptors (lock
  fd's, log files, sockets) were accessible, allowing them
  direct access to Apache log file etc.  Where the OS allows,
  we now add proactive close functions to prevent these file
  descriptors from leaking to the child processes.
  [Jim Jagielski, Martin Kraemer]
- Prevent obscenely large values of precision in ap_vformatter
  from clobbering a buffer. [Sander Striker, Jim Jagielski]
- NetWare: implemented ap_os_default_port() to resolve the
  correct default port based on the request method. This fixes
  a URL reconstruction problem on a redirect.
  [Pavel Novy (novy@feld.cvut.cz)]
- Added new ap_register_cleanup_ex() API function which allows
  for a "magic" cleanup function to be run at register time
  rather than at cleanup time. Also added the
  ap_note_cleanups_for_(socket|fd|file)_ex() API functions
  which allows for control over whether that magic cleanup
  should be called or not. This does not change the default
  behavior of the non-"ex" function (eg: ap_register_cleanup).
  [Jim Jagielski, concept by Ben Laurie]
- PORT: Take advantage of OpenBSD's arc4random() function for the
  initial secret [Henning Brauer <hb-apache-dev at bsws.de>]
- If Listen directive is not a port, but just an IP, emit an
  error condition as this case is ambiguous.
  [Rich Bowen, Justin Erenkrantz, Cliff Woolley]
- Update timeout algorithm in free_proc_chain. If a subprocess
  did not exit immediately, the thread would sleep for 3 seconds
  before checking the subprocess exit status again. In a very
  common case when the subprocess was an HTTP server CGI script,
  the CGI script actually exited a fraction of a second into the 3
  second sleep, which effectively limited the server to serving one
  CGI request every 3 seconds across a persistent connection.
  PRs 6961, 8664 [Bill Stoddard]
- mod_setenvif: Add SERVER_ADDR special keyword to allow
  envariable setting according to the server IP address
  which received the request.  [Ken Coar]
- PORT: Enable SINGLE_LISTEN_UNSERIALIZED_ACCEPT for AIX 4.3.2
  and above.  Update AIX configure logic to allow higher AIX
  release numbers without having to change Apache.
  [Jeff Trawick]

3 files changed, 18 insertions, 13 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index e1deddbff2c..53537c0f5d6 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.131 2003/07/17 22:55:28 grant Exp $
+# $NetBSD: Makefile,v 1.132 2003/07/19 12:31:05 tron 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_${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
-PKGREVISION=		4
-APACHE_VERSION=		1.3.27
+APACHE_VERSION=		1.3.28
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
@@ -19,7 +18,7 @@ COMMENT=		Apache HTTP (Web) server
 NETBSD_LOGO=		sitedrivenby.gif
 SITES_${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
 
-MODSSL_VERSION=		2.8.14
+MODSSL_VERSION=		2.8.15
 MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-${APACHE_VERSION}
 MODSSL_DIST=		${MODSSL_DISTNAME}.tar.gz
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
diff --git a/www/apache/PLIST b/www/apache/PLIST
index dac0437b3f0..087901510f5 100644
--- a/www/apache/PLIST
+++ b/www/apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/10/04 19:14:03 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/07/19 12:31:06 tron Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -102,7 +102,6 @@ share/httpd/htdocs/index.html.ru.ucs2
 share/httpd/htdocs/index.html.ru.ucs4
 share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
-share/httpd/htdocs/index.html.zh
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html.en
 share/httpd/htdocs/manual/bind.html.fr
@@ -116,7 +115,9 @@ share/httpd/htdocs/manual/configuring.html.en
 share/httpd/htdocs/manual/configuring.html.fr
 share/httpd/htdocs/manual/configuring.html.html
 share/httpd/htdocs/manual/configuring.html.ja.jis
-share/httpd/htdocs/manual/content-negotiation.html
+share/httpd/htdocs/manual/content-negotiation.html.en
+share/httpd/htdocs/manual/content-negotiation.html.html
+share/httpd/htdocs/manual/content-negotiation.html.ja.jis
 share/httpd/htdocs/manual/custom-error.html.en
 share/httpd/htdocs/manual/custom-error.html.fr
 share/httpd/htdocs/manual/custom-error.html.html
@@ -201,6 +202,7 @@ share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html.en
 share/httpd/htdocs/manual/mod/core.html.fr
 share/httpd/htdocs/manual/mod/core.html.html
+share/httpd/htdocs/manual/mod/core.html.ja.jis
 share/httpd/htdocs/manual/mod/directive-dict.html.en
 share/httpd/htdocs/manual/mod/directive-dict.html.fr
 share/httpd/htdocs/manual/mod/directive-dict.html.html
@@ -227,11 +229,13 @@ share/httpd/htdocs/manual/mod/mod_actions.html.en
 share/httpd/htdocs/manual/mod/mod_actions.html.html
 share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_alias.html.en
+share/httpd/htdocs/manual/mod/mod_alias.html.html
 share/httpd/htdocs/manual/mod/mod_alias.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_asis.html.en
 share/httpd/htdocs/manual/mod/mod_asis.html.html
 share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_auth.html.en
+share/httpd/htdocs/manual/mod/mod_auth.html.html
 share/httpd/htdocs/manual/mod/mod_auth.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_auth_anon.html
 share/httpd/htdocs/manual/mod/mod_auth_db.html
@@ -264,7 +268,9 @@ share/httpd/htdocs/manual/mod/mod_info.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_isapi.html
 share/httpd/htdocs/manual/mod/mod_log_agent.html
 share/httpd/htdocs/manual/mod/mod_log_common.html
-share/httpd/htdocs/manual/mod/mod_log_config.html
+share/httpd/htdocs/manual/mod/mod_log_config.html.en
+share/httpd/htdocs/manual/mod/mod_log_config.html.html
+share/httpd/htdocs/manual/mod/mod_log_config.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_log_referer.html
 share/httpd/htdocs/manual/mod/mod_mime.html.en
 share/httpd/htdocs/manual/mod/mod_mime.html.html
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 06446788385..0cff9f52f2c 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2003/04/10 08:25:21 wiz Exp $
+$NetBSD: distinfo,v 1.27 2003/07/19 12:31:06 tron Exp $
 
-SHA1 (apache_1.3.27.tar.gz) = 2e3a2c8acd546d84f0c4a42de2b1f69dca6828f8
-Size (apache_1.3.27.tar.gz) = 2306052 bytes
+SHA1 (apache_1.3.28.tar.gz) = a4d0a9c57a53cb641928c882a9d3b6fd645e4e3e
+Size (apache_1.3.28.tar.gz) = 2388111 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.14-1.3.27.tar.gz) = 9a9d783d096fd7312481c03421db56ee73b49546
-Size (mod_ssl-2.8.14-1.3.27.tar.gz) = 754179 bytes
+SHA1 (mod_ssl-2.8.15-1.3.28.tar.gz) = 019fa874e5557617471f445b2f48513a19b774f0
+Size (mod_ssl-2.8.15-1.3.28.tar.gz) = 754203 bytes
 SHA1 (patch-aa) = 6b6d52025ac8625421f209c42da866557719b282
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd