From dc93c7ec32d67c5bd54406d2a164dd4273aaf698 Mon Sep 17 00:00:00 2001
From: bojan <bojan@fedoraproject.org>
Date: Aug 06 2009 00:28:48 +0000
Subject: Bump up to 1.3.9.


---

diff --git a/apr-util-1.3.7.tar.bz2.asc b/apr-util-1.3.7.tar.bz2.asc
deleted file mode 100644
index d2e7586..0000000
--- a/apr-util-1.3.7.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iQIcBAABAgAGBQJKJqCqAAoJEIFUZ7bLm57FOOkP/0Fj2veY0Vlai34BCGrJeFPV
-X13u0Q+rtMMejO58z+ZEE8Su5bmkpfQE+oZNMsM30KTzUh18g614/0O2dR23PW7H
-eHGNp2m9mcHH+9PQNM+/Q5RYLX23bIWpLHQI2oR/cM0YbgHaozLeM/wGBVdnfAWw
-pfR1LML4V/2PwkD60STyTcDwW1NR1axQhCsbhuHSCWiLteRbWACPQ6CeukIzONFh
-gM1dBJtLAlGEewDETJ3hHvGfh2Fzf7BIo9ETrgX7uFoM6FpmPii5WAryDsKbB3AF
-u6XrHCnvF0Z/iBJOEmShpZ3388DmsSaTsKKx9NFzpVEoU+nS+px7OHjEo4q/8GpX
-Pm4f3ou79rL0A4VEPE0zmiMQjK19X6KlZ7yYudXfksFMaa7+Zri+L1/oklUsyaQw
-G3oJYRoGAR/I/p+aGb5Qx3fohylrIhBeR4mZzkGIQw9ErK1d7fJoIe3BMHLy3PzX
-zse+KQPCyNRfi6IABAxH+bPIj48RlW6E6cicwM0n/83OS/A+0VUVfOJFp0UL02QK
-viODptk50wMbyF3FNxOdGiHNWt1yoqztjiLAmeIefTOSeuk4LkvlFo4Srga2lw1K
-KNyRJyZ34Qof33Gc1S0wPiASevnmYSgd0/UlAK3B2dBVFcIoRLroTJ91zW3dm1Ym
-BO5qa8TwrJlAcGPHkSoM
-=jEyS
------END PGP SIGNATURE-----
diff --git a/apr-util-1.3.9.tar.bz2.asc b/apr-util-1.3.9.tar.bz2.asc
new file mode 100644
index 0000000..f126c11
--- /dev/null
+++ b/apr-util-1.3.9.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAABAgAGBQJKeKMTAAoJEKNIuYR/chSnLwsQAJVeM3J873BwSOiVOOX4cWKl
+V2GV0Pi4dopAxXCllLF3lE2NRSCzGE6T7NfKV0MTyyFSuZ8r8sAdA/LI03TS8HCq
+m08Yrq2cJdKKSeq4d+uES+BgtV+pVYX8/2tSTvfQ9v5jfGrxv+mNW1EXTFI2Sw3v
+CSEkzqZeb2XSCjNfqQR0Jz6wTT3YQmf/hIQ068Bte4LqlW6RkSpT41vIpHHYndji
+y8S7iDdx/Pzdgf2dB6g1ifAL9n526I/Ajfe5workKqblKYc4G5QMW9sE5sLIYAdI
+hEZZoCvUPFvb6XtMtHUnDIaWLndnBlVv4h1re6MvPKqS7XpgTEDGOFcs6UIUTo1D
+aUHyEMeSf/TipUD9VdCNeOETVr8NTXoiqiqgZqz0XZxAL4Wzh3ntqjCtIT6zjsTD
+cwOT01xDXpd0pNadbQdF9sKSP/9v/qnwLCFnYXMNIGn7QyzRhOTjMTeAph4vLZ6d
+/YriQr2oGIY/w+0zS0Xqtpgcx0jgwh8IZYg2s8yNwBq+Yz6d28pgLL2Dw+AJSEYy
+RwuGe8BoRhZxkUlKa2gQfWite2VRtC3SbitzTlJ8Ks76ar+5ANSKuLvnwvf6T2gG
+A6dvP2qkc7rVwmcA1MXEzxKwwmWN1yQ9CDguFc+vH4bwMbYO+uLx5VsR95+jLK7/
+NQdRuYPRt1h6A4w9pFb9
+=9TqS
+-----END PGP SIGNATURE-----
diff --git a/apr-util.spec b/apr-util.spec
index 2bfedd8..5b851e0 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -3,13 +3,14 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.3.7
+Version: 1.3.9
 Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
+Patch2: apr-util-1.3.7-nodbmdso.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: db4-devel, expat-devel, e2fsprogs-devel
@@ -94,9 +95,7 @@ This package provides the LDAP support for the apr-util.
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
-
-# Our apr.h file is arch specific
-sed -i -e 's,apr_h=\(.*\)/apr.h",apr_h=\1/apr-%{_arch}.h",' build/dso.m4
+%patch2 -p1 -b .nodbmdso
 
 %build
 autoheader && autoconf
@@ -153,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
-%{_libdir}/apr-util-%{apuver}/apr_dbm*
 %dir %{_libdir}/apr-util-%{apuver}
 
 %files pgsql
@@ -190,6 +188,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan@rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+- CVE-2009-2412
+- allocator alignment fixes
+- disable DBM-drivers-as-DSO support
+
 * Mon Jun  8 2009 Bojan Smojver <bojan@rexursive.com> - 1.3.7-1
 - bump up to 1.3.7
 - CVE-2009-0023
diff --git a/sources b/sources
index 8efe8c2..c7286ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ed3ae6734290296faa193e1177d50e6  apr-util-1.3.7.tar.bz2
+29dd557f7bd891fc2bfdffcfa081db59  apr-util-1.3.9.tar.bz2