pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q3]: pkgsrc Pullup ticket 838 - requested by Matthias Scheler
details: https://anonhg.NetBSD.org/pkgsrc/rev/fcf2e9727020
branches: pkgsrc-2005Q3
changeset: 499602:fcf2e9727020
user: seb <seb%pkgsrc.org@localhost>
date: Tue Oct 18 21:21:27 2005 +0000
description:
Pullup ticket 838 - requested by Matthias Scheler
sync devel/apr and www/apache2 with HEAD as precautionary/preventive step
Revisions pulled up:
- devel/apr/Makefile 1.37
- devel/apr/distinfo 1.16
- devel/apr/patches/patch-ao 1.3
- www/apache2/Makefile 1.84
- www/apache2/Makefile.common 1.19
- www/apache2/PLIST 1.31
- www/apache2/distinfo 1.43,1.44
- www/apache2/patches/patch-ac 1.6
- www/apache2/patches/patch-ae removed
- www/apache2/patches/patch-af removed
- www/apache2/patches/patch-ah removed
- www/apache2/patches/patch-aj removed
- www/apache2/patches/patch-ao 1.7
Module Name: pkgsrc
Committed By: joerg
Date: Tue Oct 11 20:10:35 UTC 2005
Modified Files:
pkgsrc/www/apache2: distinfo
Added Files:
pkgsrc/www/apache2/patches: patch-ao
Log Message:
Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from
Georg v. Zezschwitz on dev%httpd.apache.org@localhost.
---
Module Name: pkgsrc
Committed By: tron
Date: Mon Oct 17 10:28:46 UTC 2005
Modified Files:
pkgsrc/devel/apr: Makefile distinfo
pkgsrc/devel/apr/patches: patch-ao
pkgsrc/www/apache2: Makefile
Log Message:
Update "apr" package to version 0.9.7. Changes since version 0.9.6:
- Fix crash in apr_dir_make_recursive() for relative path
when the working directory has been deleted. [Joe Orton]
- Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
returning APR_EBUSY. [Ronen Mizrahi <ronen%tversity.com@localhost>]
- Fix apr_file_read() to catch write failures when flushing pending
writes for a buffered file. [Joe Orton]
- Fix apr_file_write() infinite loop on write failure for buffered
files. [Erik Huelsmann <ehuels gmail.com>]
- Fix error handling where apr_uid_* and apr_gid_* could segfault
or return APR_SUCCESS in failure cases. Bug 34053. [Joe Orton,
Paul Querna]
- Refactor Win32 condition variables code to address bugs 27654, 34336.
[Henry Jen <henryjen ztune.net>, E Holyat <eholyat yahoo.com>]
- Support APR_SO_SNDBUF and APR_SO_RCVBUF on Windows. Bug 32177.
[Sim <sgobbi datamanagement.it>, Jeff Trawick]
- Fix detection of rwlocks on Mac OS X. [Aaron Bannert]
- Fix issue with poll() followed by net I/O yielding EAGAIN on
Mac OS 10.4 (Darwin 8). [Wilfredo Sanchez]
Update based on patches supplied by Ben Collver. Addresses first part
of PR pkg/31817 by Zafer Aydogan.
---
Module Name: pkgsrc
Committed By: tron
Date: Mon Oct 17 10:37:11 UTC 2005
Modified Files:
pkgsrc/www/apache2: Makefile.common PLIST distinfo
pkgsrc/www/apache2/patches: patch-ac
Removed Files:
pkgsrc/www/apache2/patches: patch-ae patch-af patch-ah patch-aj
Log Message:
Update "apache2" package to version 2.0.55. Changes since version 2.0.54:
- worker MPM: Fix a memory leak which can occur after an aborted
connection in some limited circumstances. [Greg Ames]
- mod_ldap: Fix Bug 36563. Keep track of the number of attributes
retrieved from LDAP so that all of the values can be properly
cached even if the value is NULL.
[Brad Nicholes, Ondrej Sury <ondrej sury.org>]
- Added TraceEnable [on|off|extended] per-server directive to alter
the behavior of the TRACE method. This addresses a flaw in proxy
conformance to RFC 2616 - previously the proxy server would accept
a TRACE request body although the RFC prohibited it. The default
remains 'TraceEnable on'. [William Rowe]
- Add ap_log_cerror() for logging messages associated with particular
client connections. [Jeff Trawick]
- Correct mod_cgid's argv[0] so that the full path can be delved by the
invoked cgi application, to conform to the behavior of mod_cgi.
[Pradeep Kumar S <pradeep.smani gmail.com>]
- mod_include: Fix possible environment variable corruption when
using nested includes. Bug 12655. [Joe Orton]
- Support the suppress-error-charset setting, as with Apache 1.3.x.
Bug 31274. [Jeff Trawick]
- EBCDIC: Handle chunked input from client or, with proxy, origin
server. [Jeff Trawick]
- Fix bad globbing comparison which could result in getting
a directory listing when a file was requested. Bug 34512.
[sean <infamous41md hotmail.com>]
- Fix core dump if mod_auth_ldap's mod_auth_ldap_auth_checker()
was called even if mod_auth_ldap_check_user_id() was not
(or if it didn't succeed) for non-authoritative cases.
[Jim Jagielski]
- mod_proxy: Fix over-eager handling of '%' for reverse proxies.
Bug 15207. [Jim Jagielski]
- mod_ldap: Fix various shared memory cache handling bugs.
Bug 34209. [Joe Orton]
- Fix a file descriptor leak when starting piped loggers. Bug 33748.
[Joe Orton]
- mod_ldap: Avoid segfaults when opening connections if using a version
of OpenLDAP older than 2.2.21. Bug 34618. [Brad Nicholes]
- mod_ssl: Fix build with OpenSSL 0.9.8. Bug 35757. [William Rowe]
- proxy HTTP: If a response contains both Transfer-Encoding and a
Content-Length, remove the Content-Length and don't reuse the
connection, mitigating some HTTP Response Splitting attacks.
[Jeff Trawick]
- Prevent hangs of child processes when writing to piped loggers at
the time of graceful restart. Bug 26467. [Jeff Trawick]
- SECURITY: CAN-2005-1268 (cve.mitre.org)
mod_ssl: Fix off-by-one overflow whilst printing CRL information
at "LogLevel debug" which could be triggered if configured
to use a "malicious" CRL. Bug 35081. [Marc Stern <mstern csc.com>]
- mod_userdir: Fix possible memory corruption issue. Bug 34588.
[David Leonard <dleonard vintela.com>]
- worker mpm: don't take down the whole server for a transient
thread creation failure. Bug 34514 [Greg Ames]
- mod_rewrite: use buffered I/O to improve performance with large
RewriteMap txt: files. [Greg Ames]
- proxy HTTP: Rework the handling of request bodies to handle
chunked input and input filters which modify content length, and
avoid spooling arbitrary-sized request bodies in memory.
Bug 15859. [Jeff Trawick]
Patches supplied by Ben Collver. Addresses PR pkg/31817 by Zafer Aydogan.
diffstat:
devel/apr/Makefile | 3 +-
devel/apr/distinfo | 10 +-
devel/apr/patches/patch-ao | 6 +-
www/apache2/Makefile | 5 +-
www/apache2/Makefile.common | 6 +-
www/apache2/PLIST | 609 +------------------------------------------
www/apache2/distinfo | 15 +-
www/apache2/patches/patch-ac | 6 +-
www/apache2/patches/patch-ae | 24 -
www/apache2/patches/patch-af | 20 -
www/apache2/patches/patch-ah | 56 ---
www/apache2/patches/patch-aj | 82 -----
www/apache2/patches/patch-ao | 17 +
13 files changed, 48 insertions(+), 811 deletions(-)
diffs (truncated from 1566 to 300 lines):
diff -r 108630710be0 -r fcf2e9727020 devel/apr/Makefile
--- a/devel/apr/Makefile Sun Oct 16 22:36:47 2005 +0000
+++ b/devel/apr/Makefile Tue Oct 18 21:21:27 2005 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2005/09/21 00:01:01 tv Exp $
+# $NetBSD: Makefile,v 1.36.2.1 2005/10/18 21:21:27 seb Exp $
.include "../../www/apache2/Makefile.common"
PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION}
CATEGORIES= devel
-PKGREVISION= 2
HOMEPAGE= http://apr.apache.org/
COMMENT= Apache Portable Runtime
diff -r 108630710be0 -r fcf2e9727020 devel/apr/distinfo
--- a/devel/apr/distinfo Sun Oct 16 22:36:47 2005 +0000
+++ b/devel/apr/distinfo Tue Oct 18 21:21:27 2005 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2005/09/21 00:01:01 tv Exp $
+$NetBSD: distinfo,v 1.15.2.1 2005/10/18 21:21:27 seb Exp $
-SHA1 (httpd-2.0.54.tar.bz2) = 15b4fc3024cceea6562fb03383fd624e84e5e35a
-RMD160 (httpd-2.0.54.tar.bz2) = c511cb2fa396ba04caf77bfc6ca03413df48ea08
-Size (httpd-2.0.54.tar.bz2) = 5566979 bytes
+SHA1 (httpd-2.0.55.tar.bz2) = ab016aace57f34cb3eae5c9d48f2bcc5759d6c84
+RMD160 (httpd-2.0.55.tar.bz2) = 04749dcf9ea369152eddf9422e49bc0a77a443eb
+Size (httpd-2.0.55.tar.bz2) = 4745220 bytes
SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9
SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
-SHA1 (patch-ao) = d04d37445b7e8a50a74caa9bda3e6b10924e8322
+SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e
SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3
SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694
diff -r 108630710be0 -r fcf2e9727020 devel/apr/patches/patch-ao
--- a/devel/apr/patches/patch-ao Sun Oct 16 22:36:47 2005 +0000
+++ b/devel/apr/patches/patch-ao Tue Oct 18 21:21:27 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2005/04/25 09:13:02 adam Exp $
+$NetBSD: patch-ao,v 1.2.4.1 2005/10/18 21:21:27 seb Exp $
---- apr/configure.orig 2005-04-11 21:04:37.000000000 +0000
+--- apr/configure.orig 2005-10-09 18:34:19.000000000 -0700
+++ apr/configure
-@@ -40289,7 +40289,7 @@ fi;
+@@ -40851,7 +40851,7 @@ fi;
if test "$apr_devrandom" = "yes"; then
# /dev/random on OpenBSD doesn't provide random data, so
# prefer /dev/arandom, which does; see random(4).
diff -r 108630710be0 -r fcf2e9727020 www/apache2/Makefile
--- a/www/apache2/Makefile Sun Oct 16 22:36:47 2005 +0000
+++ b/www/apache2/Makefile Tue Oct 18 21:21:27 2005 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2005/09/02 11:40:56 tron Exp $
+# $NetBSD: Makefile,v 1.82.2.1 2005/10/18 21:21:27 seb Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
CATEGORIES= www
-PKGREVISION= 5
HOMEPAGE= http://httpd.apache.org/
COMMENT= Apache HTTP (Web) server, version 2
@@ -151,7 +150,7 @@
pre-install:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"
-
+
post-install:
@${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build
@cd ${EGDIR}; \
diff -r 108630710be0 -r fcf2e9727020 www/apache2/Makefile.common
--- a/www/apache2/Makefile.common Sun Oct 16 22:36:47 2005 +0000
+++ b/www/apache2/Makefile.common Tue Oct 18 21:21:27 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/21 03:49:52 reed Exp $
+# $NetBSD: Makefile.common,v 1.18.4.1 2005/10/18 21:21:27 seb Exp $
DISTNAME= httpd-${APACHE_VERSION}
EXTRACT_SUFX= .tar.bz2
# When updating this version be sure to update the checksum and remove
# any PKGREVISION for devel/apr also.
-APACHE_VERSION= 2.0.54
-APR_VERSION= 0.9.6
+APACHE_VERSION= 2.0.55
+APR_VERSION= 0.9.7
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/} \
http://www.NetBSD.org/images/logos/
diff -r 108630710be0 -r fcf2e9727020 www/apache2/PLIST
--- a/www/apache2/PLIST Sun Oct 16 22:36:47 2005 +0000
+++ b/www/apache2/PLIST Tue Oct 18 21:21:27 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2005/05/02 20:34:06 reed Exp $
+@comment $NetBSD: PLIST,v 1.30.4.1 2005/10/18 21:21:27 seb Exp $
include/httpd/ap_compat.h
include/httpd/ap_config.h
include/httpd/ap_config_auto.h
@@ -100,7 +100,6 @@
share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
-share/httpd/error/HTTP_NOT_ACCEPTABLE.html.var
share/httpd/error/HTTP_NOT_FOUND.html.var
share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
@@ -380,142 +379,72 @@
share/httpd/manual/bind.html.fr
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.es
-share/httpd/manual/bind.xml.fr
-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.de
share/httpd/manual/configuring.html.en
share/httpd/manual/configuring.html.fr
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.de
-share/httpd/manual/configuring.xml.fr
-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.fr
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.fr
-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.es
share/httpd/manual/custom-error.html.fr
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.es
-share/httpd/manual/custom-error.xml.fr
-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.es
share/httpd/manual/dns-caveats.html.fr
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.fr
-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.es
share/httpd/manual/dso.html.fr
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.es
-share/httpd/manual/dso.xml.fr
-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.es
share/httpd/manual/env.html.fr
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.fr
-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/error.html
share/httpd/manual/faq/error.html.en
share/httpd/manual/faq/error.html.ko.euc-kr
-share/httpd/manual/faq/error.xml
-share/httpd/manual/faq/error.xml.ko
-share/httpd/manual/faq/error.xml.meta
share/httpd/manual/faq/index.html
share/httpd/manual/faq/index.html.en
share/httpd/manual/faq/index.html.ko.euc-kr
-share/httpd/manual/faq/index.xml
-share/httpd/manual/faq/index.xml.ko
-share/httpd/manual/faq/index.xml.meta
share/httpd/manual/faq/support.html
share/httpd/manual/faq/support.html.en
share/httpd/manual/faq/support.html.ko.euc-kr
-share/httpd/manual/faq/support.xml
-share/httpd/manual/faq/support.xml.ko
-share/httpd/manual/faq/support.xml.meta
share/httpd/manual/filter.html
share/httpd/manual/filter.html.en
share/httpd/manual/filter.html.es
@@ -523,23 +452,11 @@
share/httpd/manual/filter.html.ja.euc-jp
share/httpd/manual/filter.html.ko.euc-kr
share/httpd/manual/filter.html.ru.koi8-r
-share/httpd/manual/filter.xml
-share/httpd/manual/filter.xml.es
-share/httpd/manual/filter.xml.fr
-share/httpd/manual/filter.xml.ja
-share/httpd/manual/filter.xml.ko
-share/httpd/manual/filter.xml.meta
-share/httpd/manual/filter.xml.ru
share/httpd/manual/glossary.html
share/httpd/manual/glossary.html.de
share/httpd/manual/glossary.html.en
share/httpd/manual/glossary.html.es
share/httpd/manual/glossary.html.ko.euc-kr
-share/httpd/manual/glossary.xml
-share/httpd/manual/glossary.xml.de
-share/httpd/manual/glossary.xml.es
-share/httpd/manual/glossary.xml.ko
-share/httpd/manual/glossary.xml.meta
share/httpd/manual/handler.html
share/httpd/manual/handler.html.en
share/httpd/manual/handler.html.es
@@ -547,61 +464,31 @@
share/httpd/manual/handler.html.ja.euc-jp
share/httpd/manual/handler.html.ko.euc-kr
share/httpd/manual/handler.html.ru.koi8-r
-share/httpd/manual/handler.xml
-share/httpd/manual/handler.xml.es
-share/httpd/manual/handler.xml.fr
-share/httpd/manual/handler.xml.ja
-share/httpd/manual/handler.xml.ko
-share/httpd/manual/handler.xml.meta
-share/httpd/manual/handler.xml.ru
share/httpd/manual/howto/auth.html
share/httpd/manual/howto/auth.html.en
+share/httpd/manual/howto/auth.html.es
share/httpd/manual/howto/auth.html.ja.euc-jp
share/httpd/manual/howto/auth.html.ko.euc-kr
-share/httpd/manual/howto/auth.xml
-share/httpd/manual/howto/auth.xml.ja
-share/httpd/manual/howto/auth.xml.ko
-share/httpd/manual/howto/auth.xml.meta
share/httpd/manual/howto/cgi.html
share/httpd/manual/howto/cgi.html.en
Home |
Main Index |
Thread Index |
Old Index