[pkgsrc/pkgsrc-2004Q3]: pkgsrc Pullup ticket 119 - requested by Jeremy C. Reed

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/413acbde84fd
branches:  pkgsrc-2004Q3
changeset: 480753:413acbde84fd
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Nov 26 19:59:05 2004 +0000

description:
Pullup ticket 119 - requested by Jeremy C. Reed
security fix for apache2

Module Name:    pkgsrc
Committed By:   reed
Date:           Sat Oct  2 15:47:03 UTC 2004

Modified Files:
        pkgsrc/devel/apr: distinfo
        pkgsrc/www/apache2: Makefile Makefile.common distinfo
Removed Files:
        pkgsrc/www/apache2/patches: patch-ab

Log Message:
Update apache to apache-2.0.52.

Also added comment to www/apache2/Makefile.common to remind to
update checksum in devel/apr also.

No actual devel/apr changes seen.

Also removed www/apache2/patches/patch-ab because it is identical to
fix for security in new version.

Changes with Apache 2.0.52
  *) Use HTML 2.0 <hr> for error pages. PR 30732 [André Malo]
  *) Fix the global mutex crash when the global mutex is never allocated
     due to disabled/empty caches. [Jess Holle <jessh ptc.com>]
  *) Fix a segfault in the LDAP cache when it is configured switched
     off. [Jess Holle <jessh ptc.com>]
  *) SECURITY: CAN-2004-0811 (cve.mitre.org)
     Fix merging of the Satisfy directive, which was applied to
     the surrounding context and could allow access despite configured
     authentication.  PR 31315.  [Rici Lake <rici ricilake.net>]
  *) Fix the handling of URIs containing %2F when AllowEncodedSlashes
     is enabled.  Previously, such urls would still be rejected.
     [Jeff Trawick, Bill Stoddard]
  *) mod_mem_cache: Fixed race condition causing segfault because of memory being
     freed twice, or reused after being freed.
     [J. Clar, W. Stoddard, G. Ames]
  *) Add -l option to rotatelogs to let it use local time rather than
     UTC.  PR 24417.  [Ken Coar, Uli Zappe <uli ritual.org>]
  *) mod_log_config: Fix a bug which prevented request completion time
     from being logged for I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
     processing.  PR 29696.  [Alois Treindl <alois astro.ch>]
---
Module Name:    pkgsrc
Committed By:   reed
Date:           Sat Oct  2 16:38:38 UTC 2004

Modified Files:
        pkgsrc/www/apache2: Makefile PLIST

Log Message:
Sort the share/httpd/manual entries in the PLIST.

Added 35 share/httpd/manual entries to PLIST. Most are .ko.euc-kr,
.ko, ja.euc-jp, and .ja files.

I don't know when these were added.

Bump PKGREVISION because now package has several more files.

diffstat:

 devel/apr/distinfo           |     6 +-
 www/apache2/Makefile         |     2 +-
 www/apache2/Makefile.common  |     3 +-
 www/apache2/PLIST            |  2121 +++++++++++++++++++++--------------------
 www/apache2/distinfo         |     7 +-
 www/apache2/patches/patch-ab |    29 -
 6 files changed, 1087 insertions(+), 1081 deletions(-)

diffs (truncated from 2319 to 300 lines):

diff -r 62a7a0a0e073 -r 413acbde84fd devel/apr/distinfo
--- a/devel/apr/distinfo        Thu Nov 25 18:08:46 2004 +0000
+++ b/devel/apr/distinfo        Fri Nov 26 19:59:05 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2004/09/20 17:13:06 adrianp Exp $
+$NetBSD: distinfo,v 1.9.2.1 2004/11/26 19:59:05 snj Exp $
 
-SHA1 (httpd-2.0.51.tar.gz) = 68ce1da942226c0a6276c9c313d21fe794a95222
-Size (httpd-2.0.51.tar.gz) = 6735558 bytes
+SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
+Size (httpd-2.0.52.tar.gz) = 6918995 bytes
 SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
 SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120
 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
diff -r 62a7a0a0e073 -r 413acbde84fd www/apache2/Makefile
--- a/www/apache2/Makefile      Thu Nov 25 18:08:46 2004 +0000
+++ b/www/apache2/Makefile      Fri Nov 26 19:59:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44.2.1 2004/11/02 10:47:01 agc Exp $
+# $NetBSD: Makefile,v 1.44.2.2 2004/11/26 19:59:05 snj Exp $
 
 PKGNAME=               apache-${APACHE_VERSION}
 PKGREVISION=           1
diff -r 62a7a0a0e073 -r 413acbde84fd www/apache2/Makefile.common
--- a/www/apache2/Makefile.common       Thu Nov 25 18:08:46 2004 +0000
+++ b/www/apache2/Makefile.common       Fri Nov 26 19:59:05 2004 +0000
@@ -1,5 +1,6 @@
 DISTNAME=              httpd-${APACHE_VERSION}
-APACHE_VERSION=                2.0.51
+# when updating this version be sure to update the checksum in devel/apr also
+APACHE_VERSION=                2.0.52
 APR_VERSION=            0.9.5
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/} \
diff -r 62a7a0a0e073 -r 413acbde84fd www/apache2/PLIST
--- a/www/apache2/PLIST Thu Nov 25 18:08:46 2004 +0000
+++ b/www/apache2/PLIST Fri Nov 26 19:59:05 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/09/20 17:19:34 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.23.2.1 2004/11/26 19:59:05 snj Exp $
 include/httpd/ap_compat.h
 include/httpd/util_time.h
 include/httpd/util_script.h
@@ -369,675 +369,1043 @@
 share/httpd/icons/a.gif
 share/httpd/icons/world2.png
 share/httpd/icons/README
+share/httpd/manual/LICENSE
+share/httpd/manual/bind.html
+share/httpd/manual/bind.html.en
+share/httpd/manual/bind.html.ja.euc-jp
+share/httpd/manual/bind.html.ko.euc-kr
+share/httpd/manual/bind.xml
+share/httpd/manual/bind.xml.ja
+share/httpd/manual/bind.xml.ko
+share/httpd/manual/bind.xml.meta
+share/httpd/manual/configuring.html
+share/httpd/manual/configuring.html.en
+share/httpd/manual/configuring.html.ja.euc-jp
+share/httpd/manual/configuring.html.ko.euc-kr
+share/httpd/manual/configuring.xml
+share/httpd/manual/configuring.xml.ja
+share/httpd/manual/configuring.xml.ko
+share/httpd/manual/configuring.xml.meta
+share/httpd/manual/content-negotiation.html
+share/httpd/manual/content-negotiation.html.en
+share/httpd/manual/content-negotiation.html.ja.euc-jp
+share/httpd/manual/content-negotiation.html.ko.euc-kr
+share/httpd/manual/content-negotiation.xml
+share/httpd/manual/content-negotiation.xml.ja
+share/httpd/manual/content-negotiation.xml.ko
+share/httpd/manual/content-negotiation.xml.meta
+share/httpd/manual/custom-error.html
+share/httpd/manual/custom-error.html.en
+share/httpd/manual/custom-error.html.ja.euc-jp
+share/httpd/manual/custom-error.html.ko.euc-kr
+share/httpd/manual/custom-error.xml
+share/httpd/manual/custom-error.xml.ja
+share/httpd/manual/custom-error.xml.ko
+share/httpd/manual/custom-error.xml.meta
+share/httpd/manual/developer/API.html
+share/httpd/manual/developer/API.html.en
+share/httpd/manual/developer/API.xml
+share/httpd/manual/developer/API.xml.meta
+share/httpd/manual/developer/debugging.html
+share/httpd/manual/developer/debugging.html.en
+share/httpd/manual/developer/debugging.xml
+share/httpd/manual/developer/debugging.xml.meta
+share/httpd/manual/developer/documenting.html
+share/httpd/manual/developer/documenting.html.en
+share/httpd/manual/developer/documenting.xml
+share/httpd/manual/developer/documenting.xml.meta
+share/httpd/manual/developer/filters.html
+share/httpd/manual/developer/filters.html.en
+share/httpd/manual/developer/filters.xml
+share/httpd/manual/developer/filters.xml.meta
+share/httpd/manual/developer/hooks.html
+share/httpd/manual/developer/hooks.html.en
+share/httpd/manual/developer/hooks.xml
+share/httpd/manual/developer/hooks.xml.meta
+share/httpd/manual/developer/index.html
+share/httpd/manual/developer/index.html.en
+share/httpd/manual/developer/index.xml
+share/httpd/manual/developer/index.xml.meta
+share/httpd/manual/developer/modules.html
+share/httpd/manual/developer/modules.html.en
+share/httpd/manual/developer/modules.html.ja.euc-jp
+share/httpd/manual/developer/modules.xml
+share/httpd/manual/developer/modules.xml.ja
+share/httpd/manual/developer/modules.xml.meta
+share/httpd/manual/developer/request.html
+share/httpd/manual/developer/request.html.en
+share/httpd/manual/developer/request.xml
+share/httpd/manual/developer/request.xml.meta
+share/httpd/manual/developer/thread_safety.html
+share/httpd/manual/developer/thread_safety.html.en
+share/httpd/manual/developer/thread_safety.xml
+share/httpd/manual/developer/thread_safety.xml.meta
+share/httpd/manual/dns-caveats.html
+share/httpd/manual/dns-caveats.html.en
+share/httpd/manual/dns-caveats.html.ja.euc-jp
+share/httpd/manual/dns-caveats.html.ko.euc-kr
+share/httpd/manual/dns-caveats.xml
+share/httpd/manual/dns-caveats.xml.ja
+share/httpd/manual/dns-caveats.xml.ko
+share/httpd/manual/dns-caveats.xml.meta
+share/httpd/manual/dso.html
+share/httpd/manual/dso.html.en
+share/httpd/manual/dso.html.ja.euc-jp
+share/httpd/manual/dso.html.ko.euc-kr
+share/httpd/manual/dso.xml
+share/httpd/manual/dso.xml.ja
+share/httpd/manual/dso.xml.ko
+share/httpd/manual/dso.xml.meta
+share/httpd/manual/env.html
+share/httpd/manual/env.html.en
+share/httpd/manual/env.html.ja.euc-jp
+share/httpd/manual/env.html.ko.euc-kr
+share/httpd/manual/env.xml
+share/httpd/manual/env.xml.ja
+share/httpd/manual/env.xml.ko
+share/httpd/manual/env.xml.meta
+share/httpd/manual/faq/all_in_one.html
+share/httpd/manual/faq/all_in_one.html.en
 share/httpd/manual/faq/all_in_one.html.ko.euc-kr
+share/httpd/manual/faq/all_in_one.xml
+share/httpd/manual/faq/all_in_one.xml.ko
+share/httpd/manual/faq/all_in_one.xml.meta
+share/httpd/manual/faq/categories.xml
 share/httpd/manual/faq/categories.xml.ko
-share/httpd/manual/faq/support.xml.meta
-share/httpd/manual/faq/support.html.en
-share/httpd/manual/faq/support.xml.ko
 share/httpd/manual/faq/error.html
-share/httpd/manual/faq/support.html.ko.euc-kr
-share/httpd/manual/faq/all_in_one.html.en
-share/httpd/manual/faq/support.xml
-share/httpd/manual/faq/support.html
-share/httpd/manual/faq/all_in_one.xml.ko
+share/httpd/manual/faq/error.html.en
 share/httpd/manual/faq/error.html.ko.euc-kr
-share/httpd/manual/faq/index.html
-share/httpd/manual/faq/error.xml.meta
-share/httpd/manual/faq/all_in_one.html
-share/httpd/manual/faq/index.html.ko.euc-kr
-share/httpd/manual/faq/all_in_one.xml.meta
-share/httpd/manual/faq/index.html.en
-share/httpd/manual/faq/index.xml.meta
-share/httpd/manual/faq/index.xml
-share/httpd/manual/faq/error.html.en
-share/httpd/manual/faq/all_in_one.xml
 share/httpd/manual/faq/error.xml
-share/httpd/manual/faq/categories.xml
-share/httpd/manual/faq/index.xml.ko
 share/httpd/manual/faq/error.xml.ko
-share/httpd/manual/mod/mod_suexec.html.en
-share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
-share/httpd/manual/mod/mod_proxy.xml.meta
-share/httpd/manual/mod/mod_cache.xml
-share/httpd/manual/mod/mod_isapi.html.en
-share/httpd/manual/mod/quickreference.xml.meta
-share/httpd/manual/mod/module-dict.html.ko.euc-kr
-share/httpd/manual/mod/mod_file_cache.xml
-share/httpd/manual/mod/mod_proxy.html.en
-share/httpd/manual/mod/prefork.html
-share/httpd/manual/mod/core.xml.de
-share/httpd/manual/mod/mod_so.xml
-share/httpd/manual/mod/core.xml.meta
-share/httpd/manual/mod/mod_so.xml.ja
-share/httpd/manual/mod/mod_so.xml.ko
-share/httpd/manual/mod/beos.html.de
-share/httpd/manual/mod/beos.html.en
-share/httpd/manual/mod/beos.html.es
-share/httpd/manual/mod/mod_autoindex.html.ja.euc-jp
-share/httpd/manual/mod/mod_file_cache.xml.ko
-share/httpd/manual/mod/mod_setenvif.xml
-share/httpd/manual/mod/module-dict.html.ja.euc-jp
-share/httpd/manual/mod/mod_so.html.ko.euc-kr
-share/httpd/manual/mod/mod_cgi.html
-share/httpd/manual/mod/mod_env.html.en
-share/httpd/manual/mod/mod_dir.html
-share/httpd/manual/mod/quickreference.xml
-share/httpd/manual/mod/mod_rewrite.xml
-share/httpd/manual/mod/mod_actions.html.ko.euc-kr
-share/httpd/manual/mod/mod_negotiation.xml.meta
-share/httpd/manual/mod/mod_echo.xml.ja
-share/httpd/manual/mod/mod_echo.xml.ko
-share/httpd/manual/mod/mod_setenvif.xml.ja
-share/httpd/manual/mod/mod_setenvif.xml.ko
-share/httpd/manual/mod/mod_log_config.html.en
-share/httpd/manual/mod/mod_isapi.xml
-share/httpd/manual/mod/mod_logio.xml
-share/httpd/manual/mod/mod_cern_meta.xml
-share/httpd/manual/mod/mod_autoindex.html.en
-share/httpd/manual/mod/mod_cern_meta.html.en
-share/httpd/manual/mod/mod_dav.html.ko.euc-kr
-share/httpd/manual/mod/mod_dav.html.en
-share/httpd/manual/mod/mod_echo.html
-share/httpd/manual/mod/mod_example.xml.meta
-share/httpd/manual/mod/mod_cache.html
-share/httpd/manual/mod/mod_auth.html.ja.euc-jp
-share/httpd/manual/mod/mod_headers.html
-share/httpd/manual/mod/worker.html
-share/httpd/manual/mod/mod_expires.xml
-share/httpd/manual/mod/mod_auth_anon.html.en
-share/httpd/manual/mod/mpm_common.xml
-share/httpd/manual/mod/mod_auth.xml
-share/httpd/manual/mod/mod_ldap.html.en
-share/httpd/manual/mod/mod_cgid.xml
-share/httpd/manual/mod/mod_setenvif.html.ja.euc-jp
-share/httpd/manual/mod/mod_setenvif.html.ko.euc-kr
-share/httpd/manual/mod/mod_mem_cache.xml.meta
-share/httpd/manual/mod/mod_ext_filter.xml.ko
-share/httpd/manual/mod/mod_so.html.ja.euc-jp
-share/httpd/manual/mod/mpmt_os2.html
-share/httpd/manual/mod/mod_expires.xml.ko
-share/httpd/manual/mod/mpm_winnt.xml
-share/httpd/manual/mod/mpm_netware.xml
-share/httpd/manual/mod/mod_actions.html.ja.euc-jp
-share/httpd/manual/mod/mod_negotiation.html.en
-share/httpd/manual/mod/mod_userdir.xml.meta
-share/httpd/manual/mod/beos.xml.meta
-share/httpd/manual/mod/mod_deflate.html
-share/httpd/manual/mod/mod_auth_anon.html
-share/httpd/manual/mod/mod_suexec.xml.meta
-share/httpd/manual/mod/mod_dav.html.ja.euc-jp
-share/httpd/manual/mod/mod_cache.html.en
-share/httpd/manual/mod/mpmt_os2.xml.meta
-share/httpd/manual/mod/mod_auth_dbm.xml
-share/httpd/manual/mod/mod_access.html.en
-share/httpd/manual/mod/mod_cgi.xml
-share/httpd/manual/mod/mod_headers.xml
-share/httpd/manual/mod/mod_cern_meta.html.ko.euc-kr
-share/httpd/manual/mod/directive-dict.xml.es
-share/httpd/manual/mod/directive-dict.xml.ja
-share/httpd/manual/mod/directive-dict.xml.ko
-share/httpd/manual/mod/mod_logio.xml.meta
-share/httpd/manual/mod/mod_unique_id.html.en
-share/httpd/manual/mod/mod_ext_filter.html.en
-share/httpd/manual/mod/mod_suexec.xml
-share/httpd/manual/mod/mod_imap.xml.meta
-share/httpd/manual/mod/mod_include.xml
-share/httpd/manual/mod/mod_dav_fs.html
-share/httpd/manual/mod/mod_dav.xml
-share/httpd/manual/mod/mod_file_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_speling.xml.meta
-share/httpd/manual/mod/mod_disk_cache.xml
-share/httpd/manual/mod/mod_log_config.xml
-share/httpd/manual/mod/mod_alias.xml
-share/httpd/manual/mod/mod_access.html
-share/httpd/manual/mod/mod_example.html.ko.euc-kr
-share/httpd/manual/mod/mod_ext_filter.xml
-share/httpd/manual/mod/mod_asis.xml.ja
-share/httpd/manual/mod/mod_asis.xml.ko
-share/httpd/manual/mod/mod_disk_cache.html.en
-share/httpd/manual/mod/mod_deflate.xml.ja
-share/httpd/manual/mod/mod_deflate.xml.ko
-share/httpd/manual/mod/mod_expires.html
-share/httpd/manual/mod/module-dict.xml.meta
-share/httpd/manual/mod/mod_env.xml.meta
-share/httpd/manual/mod/mod_dav_fs.html.ko.euc-kr
-share/httpd/manual/mod/mod_suexec.html
-share/httpd/manual/mod/directives.html
-share/httpd/manual/mod/mod_rewrite.xml.meta
-share/httpd/manual/mod/mod_mime_magic.xml.meta
-share/httpd/manual/mod/mod_charset_lite.xml.ko
-share/httpd/manual/mod/mod_ssl.xml.meta
-share/httpd/manual/mod/mod_expires.html.en
-share/httpd/manual/mod/perchild.html.en
-share/httpd/manual/mod/mod_disk_cache.xml.meta
-share/httpd/manual/mod/mpm_common.html
-share/httpd/manual/mod/prefork.xml.de
-share/httpd/manual/mod/prefork.xml.es
-share/httpd/manual/mod/prefork.xml.ja
-share/httpd/manual/mod/mod_deflate.xml
-share/httpd/manual/mod/prefork.html.ja.euc-jp
-share/httpd/manual/mod/threadpool.xml.meta
-share/httpd/manual/mod/mod_env.xml.ja
-share/httpd/manual/mod/mod_env.xml.ko
-share/httpd/manual/mod/mod_env.html