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.

2 files changed, 6 insertions, 20 deletions

diff --git a/devel/apr-util/patches/patch-aa b/devel/apr-util/patches/patch-aa
index f2213ec635d..88f08e681d0 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.3 2010/10/13 19:21:16 tron 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)