diff options
author | tron <tron@pkgsrc.org> | 2006-07-28 10:38:36 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2006-07-28 10:38:36 +0000 |
commit | 659d0b0b2ce9c336cf24d51f8b1ae4b6894f2d4f (patch) | |
tree | ec20df06c90622f7a643a67e00b990f87d53509e /www/apache2 | |
parent | 396d98cb5cf09fda8a83b8b472fdb2ccffb1cdde (diff) | |
download | pkgsrc-659d0b0b2ce9c336cf24d51f8b1ae4b6894f2d4f.tar.gz |
Update "apr" package to version 0.9.12.2.0.59 and "apache2" package
to version 2.0.59. Changes since *2.0.58:
- SECURITY: CVE-2006-3747 (cve.mitre.org)
mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling. For some RewriteRules this could lead to a pointer being
written out of bounds. Reported by Mark Dowd of McAfee.
Diffstat (limited to 'www/apache2')
-rw-r--r-- | www/apache2/Makefile | 28 | ||||
-rw-r--r-- | www/apache2/Makefile.common | 4 | ||||
-rw-r--r-- | www/apache2/distinfo | 8 | ||||
-rw-r--r-- | www/apache2/options.mk | 8 |
4 files changed, 24 insertions, 24 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 87d640e6dd8..017fc3f9765 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2006/07/10 08:29:33 rillig Exp $ +# $NetBSD: Makefile,v 1.103 2006/07/28 10:38:36 tron Exp $ .include "Makefile.common" @@ -12,7 +12,7 @@ CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]* BUILD_DEFS+= USE_INET6 -USE_TOOLS+= perl:run pkg-config +USE_TOOLS+= perl perl:run pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-layout=NetBSD @@ -159,24 +159,24 @@ SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g' # ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of # configure script options for ap_mod. # -_AP_DEPENDS.ssl= ../../security/openssl/buildlink3.mk -_AP_DEPENDS.deflate= ../../devel/zlib/buildlink3.mk +AP_DEPENDS.ssl= ../../security/openssl/buildlink3.mk +AP_DEPENDS.deflate= ../../devel/zlib/buildlink3.mk -_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} -_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} +AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} +AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} -.for _ap_mod in ${APACHE_MODULES} -. if defined(_AP_DEPENDS.${_ap_mod}) && !empty(_AP_DEPENDS.${_ap_mod}) -. for _ap_depend in ${_AP_DEPENDS.${_ap_mod}} -. if exists(${_ap_depend}) -. include "${_ap_depend}" +.for ap_mod in ${APACHE_MODULES} +. if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod}) +. for ap_depend in ${AP_DEPENDS.${ap_mod}} +. if exists(${ap_depend}) +. include "${ap_depend}" . else -DEPENDS+= ${_ap_depend} +DEPENDS+= ${ap_depend} . endif . endfor . endif -. if defined(_AP_CFG_ARGS.${_ap_mod}) && !empty(_AP_CFG_ARGS.${_ap_mod}) -CONFIGURE_ARGS+= ${_AP_CFG_ARGS.${_ap_mod}} +. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod}) +CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}} . endif .endfor diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common index b83955e84bb..276709391f7 100644 --- a/www/apache2/Makefile.common +++ b/www/apache2/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.20 2006/05/07 12:35:27 tron Exp $ +# $NetBSD: Makefile.common,v 1.21 2006/07/28 10:38:36 tron 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.58 +APACHE_VERSION= 2.0.59 APR_VERSION= 0.9.12 MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} \ diff --git a/www/apache2/distinfo b/www/apache2/distinfo index b6c1adce7b2..e075462c5c2 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.47 2006/05/07 12:35:27 tron Exp $ +$NetBSD: distinfo,v 1.48 2006/07/28 10:38:36 tron Exp $ -SHA1 (httpd-2.0.58.tar.bz2) = 697e1674f8efbbe05b9f6c1ba00cd28a37293229 -RMD160 (httpd-2.0.58.tar.bz2) = 2ff44b2254552db908f1defd09e3142527f9bf83 -Size (httpd-2.0.58.tar.bz2) = 4704318 bytes +SHA1 (httpd-2.0.59.tar.bz2) = 908209cd6e52f700d2a841a25de36e44d469c376 +RMD160 (httpd-2.0.59.tar.bz2) = 78b802354e338798a6978ece8b3568be97542174 +Size (httpd-2.0.59.tar.bz2) = 4743549 bytes SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23 SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad diff --git a/www/apache2/options.mk b/www/apache2/options.mk index 8953f8cd4e5..ccc93de01a5 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/18 19:10:01 adrianp Exp $ +# $NetBSD: options.mk,v 1.4 2006/07/28 10:38:36 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec @@ -12,9 +12,9 @@ APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log APACHE_SUEXEC_CONFIGURE_ARGS+= \ --with-suexec-bin=${PREFIX}/sbin/suexec \ --with-suexec-caller=${APACHE_USER} \ - --with-suexec-safepath='${APACHE_SUEXEC_PATH}' \ - --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT} \ - --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE} + --with-suexec-safepath='${APACHE_SUEXEC_PATH:Q}' \ + --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \ + --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q} APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} |