pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update "apr" package to version 0.9.12.2.0.59 and "apa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/53b7c812e81f
branches: trunk
changeset: 516806:53b7c812e81f
user: tron <tron%pkgsrc.org@localhost>
date: Fri Jul 28 10:38:36 2006 +0000
description:
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:
devel/apr/distinfo | 8 ++++----
www/apache2/Makefile | 28 ++++++++++++++--------------
www/apache2/Makefile.common | 4 ++--
www/apache2/distinfo | 8 ++++----
www/apache2/options.mk | 8 ++++----
5 files changed, 28 insertions(+), 28 deletions(-)
diffs (125 lines):
diff -r 0e7f9a9feffe -r 53b7c812e81f devel/apr/distinfo
--- a/devel/apr/distinfo Fri Jul 28 04:54:51 2006 +0000
+++ b/devel/apr/distinfo Fri Jul 28 10:38:36 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2006/05/07 12:35:27 tron Exp $
+$NetBSD: distinfo,v 1.18 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) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9
SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e
diff -r 0e7f9a9feffe -r 53b7c812e81f www/apache2/Makefile
--- a/www/apache2/Makefile Fri Jul 28 04:54:51 2006 +0000
+++ b/www/apache2/Makefile Fri Jul 28 10:38:36 2006 +0000
@@ -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 @@
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 @@
# 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 -r 0e7f9a9feffe -r 53b7c812e81f www/apache2/Makefile.common
--- a/www/apache2/Makefile.common Fri Jul 28 04:54:51 2006 +0000
+++ b/www/apache2/Makefile.common Fri Jul 28 10:38:36 2006 +0000
@@ -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 -r 0e7f9a9feffe -r 53b7c812e81f www/apache2/distinfo
--- a/www/apache2/distinfo Fri Jul 28 04:54:51 2006 +0000
+++ b/www/apache2/distinfo Fri Jul 28 10:38:36 2006 +0000
@@ -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 -r 0e7f9a9feffe -r 53b7c812e81f www/apache2/options.mk
--- a/www/apache2/options.mk Fri Jul 28 04:54:51 2006 +0000
+++ b/www/apache2/options.mk Fri Jul 28 10:38:36 2006 +0000
@@ -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_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-*}
Home |
Main Index |
Thread Index |
Old Index