summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz>2010-10-15 07:06:49 +0000
committerspz <spz>2010-10-15 07:06:49 +0000
commitf7e9a1b7d11c91c2adfb8e8b269e4e8e2cf509d7 (patch)
tree453a90768eedc8320eed47ab1bcde3383bb54b28
parentfe77eee5951720ea5b1840886e845026ff1eb89f (diff)
downloadpkgsrc_2010Q2.tar.gz
Pullup ticket 3243 - requested by tronpkgsrc_2010Q2
security update Revisions pulled up: - pkgsrc/devel/apr-util/Makefile 1.17 - pkgsrc/devel/apr-util/distinfo 1.9 - pkgsrc/devel/apr-util/patches/patch-aa 1.3 Files removed: - pkgsrc/devel/apr-util/patches/patch-ab ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Wed Oct 13 19:21:16 UTC 2010 Modified Files: pkgsrc/devel/apr-util: Makefile distinfo pkgsrc/devel/apr-util/patches: patch-aa Removed Files: pkgsrc/devel/apr-util/patches: patch-ab Log Message: Update "apr-util" package to version 1.3.10. Changes since 1.3.9: - SECURITY: CVE-2010-1623 (cve.mitre.org) Fix a denial of service attack against apr_brigade_split_line(). [Stefan Fritsch] - SECURITY: CVE-2009-3560, CVE-2009-3720 (cve.mitre.org) Fix two buffer over-read flaws in the bundled copy of expat which could cause applications to crash while parsing specially-crafted XML documents. [Joe Orton] - Upgrade bundled copy of expat library to 1.95.7. [Joe Orton] - apr_thread_pool: Fix some potential deadlock situations. Bug 49709. [Joe Mudd <Joe.Mudd sas.com>] - apr_thread_pool_create: Fix pool corruption caused by multithreaded use of the pool when multiple initial threads are created. Bug 47843. [Alex Korobka <akorobka fxcm.com>] - apr_thread_pool_create(): Only set the output thread pool handle on success. [Paul Querna] - DBD ODBC support: Fix memory corruption using apr_dbd_datum_get() with several different data types, including APR_DBD_TYPE_TIME. Bug 49645. [<kappa psilambda.com>] - Add support for Berkeley DB 4.8 and 5.0. Bug 49866, Bug 49179. [Bernhard Rosenkraenzer <br blankpage.ch>, Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>] - Make bundled expat compatible with libtool 2.x. Bug 49053. [Rainer Jung] - Prefer libtool 1.x when searching for libtool in bundled expat release process. [Rainer Jung, Jim Jagielski] - Improve platform detection for bundled expat by updating config.guess and config.sub. [Rainer Jung] Patch supplied by Mihai Chelaru, approved by Alistair Crooks. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/apr-util/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/apr-util/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/apr-util/patches/patch-aa cvs rdiff -u -r1.2 -r0 pkgsrc/devel/apr-util/patches/patch-ab
-rw-r--r--devel/apr-util/Makefile5
-rw-r--r--devel/apr-util/distinfo11
-rw-r--r--devel/apr-util/patches/patch-aa13
-rw-r--r--devel/apr-util/patches/patch-ab13
4 files changed, 13 insertions, 29 deletions
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index 6d7fc5fb3b4..142598899fd 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2010/06/02 13:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2010/10/15 07:06:49 spz Exp $
-DISTNAME= apr-util-1.3.9
-PKGREVISION= 1
+DISTNAME= apr-util-1.3.10
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE:=apr/}
diff --git a/devel/apr-util/distinfo b/devel/apr-util/distinfo
index 86ff8d74612..90b245411a1 100644
--- a/devel/apr-util/distinfo
+++ b/devel/apr-util/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/08/07 10:39:23 tron Exp $
+$NetBSD: distinfo,v 1.8.8.1 2010/10/15 07:06:49 spz Exp $
-SHA1 (apr-util-1.3.9.tar.gz) = fd2a76352353e6bc2f7cc7da80e2ab3842795199
-RMD160 (apr-util-1.3.9.tar.gz) = f6180ba186e8ed73831b1da78de7ec57fc1cb162
-Size (apr-util-1.3.9.tar.gz) = 790952 bytes
-SHA1 (patch-aa) = 8266136e6211c3c98a1f2dee8a33cd2bac50fbce
-SHA1 (patch-ab) = 2eb58e941a54dc5f4531476b1017ac4f6ee1b4a6
+SHA1 (apr-util-1.3.10.tar.gz) = f5aaf15542209fee479679299dc4cb1ac0924a59
+RMD160 (apr-util-1.3.10.tar.gz) = 2ec11a87c8ddc9ee80850fae80fd754461117d1d
+Size (apr-util-1.3.10.tar.gz) = 768634 bytes
+SHA1 (patch-aa) = c778c6c5b9ea1d51aa6899fd885f00e4a5e9242b
diff --git a/devel/apr-util/patches/patch-aa b/devel/apr-util/patches/patch-aa
index f2213ec635d..6a48c4046d8 100644
--- a/devel/apr-util/patches/patch-aa
+++ b/devel/apr-util/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2008/11/02 15:05:11 cube Exp $
-
---- configure.in.orig 2005-05-05 12:24:29.000000000 -0700
-+++ configure.in
-@@ -164,7 +164,7 @@ dnl copy apr's rules.mk into our build d
+$NetBSD: patch-aa,v 1.2.14.1 2010/10/15 07:06:49 spz Exp $
+--- configure.orig 2010-10-01 14:56:47.000000000 +0300
++++ configure 2010-10-10 10:00:59.000000000 +0300
+@@ -33407,7 +33407,7 @@
if test ! -d ./build; then
$mkdir_p build
fi
-cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
+sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
- dnl
- dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
+ case "$host_alias" in
+ *bsdi* | BSD/OS)
diff --git a/devel/apr-util/patches/patch-ab b/devel/apr-util/patches/patch-ab
deleted file mode 100644
index 09cf93ff846..00000000000
--- a/devel/apr-util/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/11/02 15:05:11 cube Exp $
-
---- configure.orig 2006-11-29 03:48:46.000000000 -0800
-+++ configure
-@@ -39658,7 +39658,7 @@ APRUTIL_LIBNAME="aprutil${libsuffix}"
- if test ! -d ./build; then
- $mkdir_p build
- fi
--cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
-+sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
-
- case "$host_alias" in
- *bsdi* | BSD/OS)