commit libapr-util1

31 May 2006

Hello community,

here is the log from the commit of package libapr-util1
checked in at Wed May 31 02:50:28 CEST 2006.

--------

--- libapr-util1/libapr-util1.changes	2006-01-25 21:37:22.000000000 +0100
+++ libapr-util1/libapr-util1.changes	2006-05-30 14:35:59.000000000 +0200
@@ -1,0 +2,19 @@
+Tue May 30 14:35:24 CEST 2006 - poeml@suse.de
+
+- fix BuildRequires for Fedora Core
+- ditch krb5 from BuildRequires, since it doesn't seem to be needed
+- use --with-berkeley-db
+
+-------------------------------------------------------------------
+Tue Apr 25 13:04:38 CEST 2006 - poeml@suse.de
+
+- upstream 1.2.7. relevant changes:
+  *) Fix apr_dbd_init to be safe to call multiple times
+  *) Stop trying to link against Berkeley DB by default.  
+     (use --with-berkeley-db)
+  *) Stop trying to link against GDBM by default. (use --with-gdbm)
+  *) Fix the escape implementations for the sqlite2 and sqlite3 dbd
+     back ends.
+  *) Add support for Berkeley DB 4.4 to the configure scripts.
+
+-------------------------------------------------------------------

Old:
----
  apr-util-1.2.2.tar.bz2

New:
----
  apr-util-1.2.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libapr-util1.spec ++++++
--- /var/tmp/diff_new_pack.0ouXwe/_old	2006-05-31 02:49:55.000000000 +0200
+++ /var/tmp/diff_new_pack.0ouXwe/_new	2006-05-31 02:49:55.000000000 +0200
@@ -1,22 +1,30 @@
 #
-# spec file for package libapr-util1 (Version 1.2.2)
+# spec file for package libapr-util1 (Version 1.2.7)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
 Name:         libapr-util1
-BuildRequires: db-devel doxygen expat krb5 libapr1-devel openldap2 openldap2-devel
+BuildRequires:  libapr1-devel
+#
+BuildRequires:  db-devel expat openldap2 openldap2-devel
+%if %{?suse_version:1}0
+BuildRequires:  doxygen
+%else
+BuildRequires:  expat-devel
+%endif
+#
 URL:          http://apr.apache.org/
 License:      Other uncritical OpenSource License, Apache
 Group:        Development/Libraries/Other
 Autoreqprov:  on
-Version:      1.2.2
+Version:        1.2.7
 Release:      1
 Summary:      Apache Portable Runtime (APR) Library
 Source:       http://www.apache.org/dist/apr/apr-util-%{version}.tar.bz2
@@ -60,15 +68,20 @@
 	--includedir=%{includedir} \
 	--with-apr=/usr/bin/apr-1-config \
 	--with-ldap \
+	--with-berkeley-db \
 	--without-gdbm
 make
 make check
+%if %{?suse_version:1}0
 make dox
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%if %{?suse_version:1}0
 mv docs/dox/html html
+%endif
 rm -f $RPM_BUILD_ROOT/%{_libdir}/aprutil.exp
 
 %clean
@@ -89,7 +102,9 @@
 
 %files devel
 %defattr(-,root,root)
+%if %{?suse_version:1}0
 %doc --parents html
+%endif
 %dir %{includedir}
 %{includedir}/*.h
 %{_libdir}/libaprutil-%{apuver}.a
@@ -99,6 +114,19 @@
 %{_libdir}/pkgconfig/apr-util-%{apuver}.pc
 
 %changelog -n libapr-util1
+* Tue May 30 2006 - poeml@suse.de
+- fix BuildRequires for Fedora Core
+- ditch krb5 from BuildRequires, since it doesn't seem to be needed
+- use --with-berkeley-db
+* Tue Apr 25 2006 - poeml@suse.de
+- upstream 1.2.7. relevant changes:
+  *) Fix apr_dbd_init to be safe to call multiple times
+  *) Stop trying to link against Berkeley DB by default.
+  (use --with-berkeley-db)
+  *) Stop trying to link against GDBM by default. (use --with-gdbm)
+  *) Fix the escape implementations for the sqlite2 and sqlite3 dbd
+  back ends.
+  *) Add support for Berkeley DB 4.4 to the configure scripts.
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Wed Oct 12 2005 - poeml@suse.de

++++++ apr-util-1.2.2.tar.bz2 -> apr-util-1.2.7.tar.bz2 ++++++
++++   16092 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/CHANGES new/apr-util-1.2.7/CHANGES
--- old/apr-util-1.2.2/CHANGES	2005-09-20 00:47:05.000000000 +0200
+++ new/apr-util-1.2.7/CHANGES	2006-04-09 21:37:11.000000000 +0200
@@ -1,5 +1,45 @@
+Changes with APR-util 1.2.7
+
+  *) Fix apr_dbd_init to be safe to call multiple times
+     [Bojan Smojver <bojan rexursive com>, Nick Kew]
+
+  *) Win32 / Netware - add missing apu_version.c for apu_version_string()
+     to the Windows and Netware specific builds.  Unix platforms supported
+     this API since 0.9.1.  [William Rowe, Brad Nicholes].
+
+Changes with APR-util 1.2.6
+
+  *) Stop trying to link against Berkeley DB by default.  To enable use
+     of Berkeley DB users must now explicitly pass --with-berkeley-db to
+     configure, since Berkeley DB is released under a viral license that
+     requires distribution of source code for any program that uses it.
+     [Garrett Rooney]
+
+  *) Stop trying to link against GDBM by default.  To enable use of GDBM
+     users must now explicitly pass --with-gdbm to configure, since GDBM
+     is licensed under the GPL.
+     [Garrett Rooney]
+
+  *) Fix VPATH builds, and symlink builds where apr and apr-util
+     reside in parallel as symlinks to directories with more explicit
+     names, e.g. apr-1.x and apr-util-1.x.  This solves various breakage
+     on Solaris in particular with ./buildconf and ./configure.  Also
+     eliminated the nested ../apr-iconv/buildconf, given that apr-util
+     didn't bother with ../apr/buildconf, and this was inconsistant.
+     [William Rowe]
+
+  *) Fix the escape implementations for the sqlite2 and sqlite3 dbd
+     back ends.
+     [Ronen Mizrahi <ronen tversity.com>, Garrett Rooney]
+
+  *) Add support for Berkeley DB 4.4 to the configure scripts.
+     [Garrett Rooney]
+
+  *) Fix bug in test suite that cause testbuckets to write 8GB file
+     on Mac OS X.  [Justin Erenkrantz]
+
 Changes with APR-util 1.2.2
- 
+
   *) Teach configure how to find the Novell LDAP SDK. [Graham Leggett]
  
   *) Fix usage of ldapssl_init/ldap_sslinit on platforms that support
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/INSTALL.MySQL new/apr-util-1.2.7/INSTALL.MySQL
--- old/apr-util-1.2.2/INSTALL.MySQL	2005-02-25 20:49:02.000000000 +0100
+++ new/apr-util-1.2.7/INSTALL.MySQL	2006-01-26 06:11:08.000000000 +0100
@@ -2,7 +2,8 @@
 
 If you wish to build the driver, download apr_dbd_mysql.c from
 http://apache.webthing.com/database/
-and copy it into the dbd directory before running configure.
+and copy it into the dbd directory.
+Now run buildconf, followed by configure.
 
 It is distributed under the GPL to conform with MySQL License terms
 This means it cannot be distributed from apache.org, as that would
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/apr-util.spec new/apr-util-1.2.7/apr-util.spec
--- old/apr-util-1.2.2/apr-util.spec	2005-09-27 01:28:53.000000000 +0200
+++ new/apr-util-1.2.7/apr-util.spec	2006-04-09 22:37:43.000000000 +0200
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.2
+Version: 1.2.7
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/aprutil.dsp new/apr-util-1.2.7/aprutil.dsp
--- old/apr-util-1.2.2/aprutil.dsp	2005-07-08 11:44:00.000000000 +0200
+++ new/apr-util-1.2.7/aprutil.dsp	2006-04-03 03:47:32.000000000 +0200
@@ -64,8 +64,8 @@
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"LibD\aprutil_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"LibD\aprutil_src" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -254,6 +254,10 @@
 
 SOURCE=.\misc\apr_rmm.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\misc\apu_version.c
+# End Source File
 # End Group
 # Begin Group "sdbm"
 
@@ -490,33 +494,6 @@
 !ENDIF 
 
 # End Source File
-# Begin Source File
-
-SOURCE=.\uri\gen_uri_delims.exe
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-# Begin Custom Build - Generating uri_delims.h
-InputPath=.\uri\gen_uri_delims.exe
-
-".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-# Begin Custom Build - Generating uri_delims.h
-InputPath=.\uri\gen_uri_delims.exe
-
-".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
 # End Group
 # Begin Group "Public Header Files"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/aprutil.dsw new/apr-util-1.2.7/aprutil.dsw
--- old/apr-util-1.2.2/aprutil.dsw	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/aprutil.dsw	2006-03-09 21:32:49.000000000 +0100
@@ -42,9 +42,6 @@
     Project_Dep_Name apr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name gen_uri_delims
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name xml
     End Project Dependency
     Begin Project Dependency
@@ -129,9 +126,6 @@
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name gen_uri_delims
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name xml
     End Project Dependency
     Begin Project Dependency
@@ -141,18 +135,6 @@
 
 ###############################################################################
 
-Project: "gen_uri_delims"=".\uri\gen_uri_delims.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "xml"=".\xml\expat\lib\xml.dsp" - Package Owner=<4>
 
 Package=<5>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/apr_common.m4 new/apr-util-1.2.7/build/apr_common.m4
--- old/apr-util-1.2.2/build/apr_common.m4	2005-09-27 01:28:39.000000000 +0200
+++ new/apr-util-1.2.7/build/apr_common.m4	2006-01-31 16:44:46.000000000 +0100
@@ -471,40 +471,29 @@
 
 dnl
 dnl APR_TRY_COMPILE_NO_WARNING(INCLUDES, FUNCTION-BODY,
-dnl             [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl             [ACTIONS-IF-NO-WARNINGS], [ACTIONS-IF-WARNINGS])
 dnl
 dnl Tries a compile test with warnings activated so that the result
-dnl is false if the code doesn't compile cleanly.
-dnl
-AC_DEFUN(APR_TRY_COMPILE_NO_WARNING,
-[if test "x$CFLAGS_WARN" = "x"; then
-  apr_tcnw_flags=""
-else
-  apr_tcnw_flags=$CFLAGS_WARN
-fi
-if test "$ac_cv_prog_gcc" = "yes"; then 
-  apr_tcnw_flags="$apr_tcnw_flags -Werror"
-fi
-changequote(', ')
-cat > conftest.$ac_ext <<EOTEST
-#include "confdefs.h"
-'$1'
-int main(int argc, const char * const argv[]) {
-'$2'
-; return 0; }
-EOTEST
-changequote([, ])
-if ${CC-cc} -c $CFLAGS $CPPFLAGS $apr_tcnw_flags conftest.$ac_ext 2>&AC_FD_CC ; then
-  ifelse([$3], , :, [rm -rf conftest*
-  $3])
-else
-  echo "configure: failed or warning program:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-  ifelse([$4], , , [rm -rf conftest*
-  $4])
-fi
-rm -f conftest*
-])dnl
+dnl is false if the code doesn't compile cleanly.  For compilers
+dnl where it is not known how to activate a "fail-on-error" mode,
+dnl it is undefined which of the sets of actions will be run.
+dnl
+AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
+[apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_prog_gcc" = "yes"; then 
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ AC_COMPILE_IFELSE(
+  [#include "confdefs.h"
+  ]
+  [[$1]]
+  [int main(int argc, const char *const *argv) {]
+  [[$2]]
+  [   return 0; }],
+  [$3], [$4])
+ CFLAGS=$apr_save_CFLAGS
+])
 
 dnl
 dnl APR_CHECK_STRERROR_R_RC
@@ -731,6 +720,13 @@
     echo "** Error: Cannot use undefined layout '$LAYOUT'"
     exit 1
   fi
+  # Catch layout names including a slash which will otherwise
+  # confuse the heck out of the sed script.
+  case $2 in
+  */*) 
+    echo "** Error: $2 is not a valid layout name"
+    exit 1 ;;
+  esac
   pldconf=./config.pld
   changequote({,})
   sed -e "1s/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*//;1t" \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/apu-conf.m4 new/apr-util-1.2.7/build/apu-conf.m4
--- old/apr-util-1.2.2/build/apu-conf.m4	2005-09-20 15:27:50.000000000 +0200
+++ new/apr-util-1.2.7/build/apu-conf.m4	2006-02-04 03:24:20.000000000 +0100
@@ -142,11 +142,17 @@
 AC_DEFUN([APU_FIND_EXPAT], [
 
 AC_ARG_WITH([expat],
-[  --with-expat=DIR        specify Expat location], [
+[  --with-expat=DIR        specify Expat location or 'builtin'], [
   if test "$withval" = "yes"; then
     AC_MSG_ERROR([a directory must be specified for --with-expat])
   elif test "$withval" = "no"; then
     AC_MSG_ERROR([Expat cannot be disabled (at this time)])
+  elif test "$withval" = "builtin"; then
+    abs_expatdir="`cd $srcdir/xml/expat && pwd`"
+    if test -d $abs_expatdir/. -a ! -d xml/expat/.; then
+      $mkdir_p xml/expat
+    fi
+    APU_TEST_EXPAT($abs_expatdir, xml/expat)
   else
     abs_expatdir="`cd $withval && pwd`"
     APU_TEST_EXPAT($abs_expatdir, $withval)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/dbm.m4 new/apr-util-1.2.7/build/dbm.m4
--- old/apr-util-1.2.2/build/dbm.m4	2005-02-24 11:23:34.000000000 +0100
+++ new/apr-util-1.2.7/build/dbm.m4	2006-02-09 05:17:38.000000000 +0100
@@ -445,6 +445,25 @@
     apu_db_version=4
   fi
 ])
+dnl
+dnl APU_CHECK_DB44: is DB4.4 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB44], [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.4 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "4", "-1",
+    "$places",
+    "db44/db.h db4/db.h db.h",
+    "db-4.4 db4-4.4 db44 db4 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
 
 
 AC_DEFUN([APU_CHECK_DB], [
@@ -506,6 +525,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db44)
+    APU_CHECK_DB44("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -518,21 +543,24 @@
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
  
-  APU_CHECK_DB43("$all_places")
+  APU_CHECK_DB44("$all_places")
   if test "$apu_db_version" != "4"; then
-    APU_CHECK_DB42("$all_places")
+    APU_CHECK_DB43("$all_places")
     if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB41("$all_places")
+      APU_CHECK_DB42("$all_places")
       if test "$apu_db_version" != "4"; then
-        APU_CHECK_DB4("$all_places")
+        APU_CHECK_DB41("$all_places")
         if test "$apu_db_version" != "4"; then
-          APU_CHECK_DB3("$all_places")
-          if test "$apu_db_version" != "3"; then
-            APU_CHECK_DB2("$all_places")
-            if test "$apu_db_version" != "2"; then
-              APU_CHECK_DB1("$all_places")
-              if test "$apu_db_version" != "1"; then
-                APU_CHECK_DB185("$all_places")
+          APU_CHECK_DB4("$all_places")
+          if test "$apu_db_version" != "4"; then
+            APU_CHECK_DB3("$all_places")
+            if test "$apu_db_version" != "3"; then
+              APU_CHECK_DB2("$all_places")
+              if test "$apu_db_version" != "2"; then
+                APU_CHECK_DB1("$all_places")
+                if test "$apu_db_version" != "1"; then
+                  APU_CHECK_DB185("$all_places")
+                fi
               fi
             fi
           fi
@@ -568,17 +596,18 @@
 
   AC_ARG_WITH(dbm, [
     --with-dbm=DBM          choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43}
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44}
   ], [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
     fi
     requested="$withval"
   ], [
     requested=default
   ])
 
+  dnl We don't pull in GDBM unless the user asks for it, since it's GPL
   AC_ARG_WITH([gdbm], [
     --with-gdbm=DIR          specify GDBM location
   ], [
@@ -598,9 +627,6 @@
         APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
       fi
     fi
-  ], [
-    apu_have_gdbm=0
-    AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
   ])
 
   AC_ARG_WITH([ndbm], [
@@ -673,6 +699,10 @@
   fi
 
   dnl We're going to try to find the highest version of Berkeley DB supported.
+  dnl
+  dnl Note that we only do this if the user requested it, since the Sleepycat
+  dnl license is viral and requires distribution of source along with programs
+  dnl that use it.
   AC_ARG_WITH([berkeley-db], [
     --with-berkeley-db=PATH
       Find the Berkeley DB header and library in \`PATH/include' and
@@ -697,8 +727,6 @@
         AC_ERROR(Berkeley DB not found.)
       fi
     fi 
-  ],[
-    APU_CHECK_DB($requested, "")
   ])
 
   if test -n "$apu_db_xtra_libs"; then
@@ -754,6 +782,10 @@
       apu_use_db=1
       apu_default_dbm=db4
       ;;
+    db44)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -761,7 +793,7 @@
       ;;
     *)
       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
       ;;
   esac
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/build/get-version.sh new/apr-util-1.2.7/build/get-version.sh
--- old/apr-util-1.2.2/build/get-version.sh	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/build/get-version.sh	2004-11-25 00:07:58.000000000 +0100
@@ -12,14 +12,14 @@
 #
 
 if test $# != 3; then
-  echo "USAGE: $0 CMD INCLUDEDIR PREFIX"
-  echo "  where CMD is one of: all, major"
+  echo "USAGE: $0 CMD VERSION_HEADER PREFIX"
+  echo "  where CMD is one of: all, major, libtool"
   exit 1
 fi
 
-major_sed="/#define.*$3_MAJOR_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
-minor_sed="/#define.*$3_MINOR_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
-patch_sed="/#define.*$3_PATCH_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
+major_sed="/#define.*$3_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+minor_sed="/#define.*$3_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+patch_sed="/#define.*$3_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
 major="`sed -n $major_sed $2`"
 minor="`sed -n $minor_sed $2`"
 patch="`sed -n $patch_sed $2`"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/buildconf new/apr-util-1.2.7/buildconf
--- old/apr-util-1.2.2/buildconf	2005-06-14 16:15:16.000000000 +0200
+++ new/apr-util-1.2.7/buildconf	2006-03-25 21:30:07.000000000 +0100
@@ -38,8 +38,8 @@
   shift
 done
 
-if test -d "$apr_src_dir"
-then
+if [ -f "$apr_src_dir/build/apr_common.m4" ]; then
+  apr_src_dir=`cd $apr_src_dir; pwd`
   echo ""
   echo "Looking for apr source in $apr_src_dir"
 else
@@ -54,10 +54,11 @@
 
 # Remove some files, then copy them from apr source tree
 rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
-      build/config.guess build/config.sub
-cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
-   $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess  \
-   $apr_src_dir/build/config.sub build
+      build/config.guess build/config.sub build/get-version.sh
+cp -p $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
+      $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
+      $apr_src_dir/build/config.sub $apr_src_dir/build/get-version.sh \
+      build/
 
 # Remove aclocal.m4 as it'll break some builds...
 rm -rf aclocal.m4 autom4te*.cache
@@ -84,17 +85,9 @@
 $apr_src_dir/build/gen-build.py make
 
 #
-# If apr-iconv, then go and configure it.
-#
-if test -d ../apr-iconv; then
-  echo "Invoking ../apr-iconv/buildconf.sh ..."
-  (cd ../apr-iconv; ./buildconf)
-fi
-
-#
 # If Expat has been bundled, then go and configure the thing
 #
-if test -d xml/expat; then
+if [ -f xml/expat/buildconf.sh ]; then
   echo "Invoking xml/expat/buildconf.sh ..."
   (cd xml/expat; ./buildconf.sh)
 fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd.c new/apr-util-1.2.7/dbd/apr_dbd.c
--- old/apr-util-1.2.2/dbd/apr_dbd.c	2005-08-11 16:06:26.000000000 +0200
+++ new/apr-util-1.2.7/dbd/apr_dbd.c	2006-04-09 21:37:11.000000000 +0200
@@ -27,6 +27,7 @@
 
 static apr_hash_t *drivers = NULL;
 
+#define CLEANUP_CAST (apr_status_t (*)(void*))
 
 /* Once the autofoo supports building it for dynamic load, we can use
  * #define APR_DSO_BUILD APR_HAS_DSO
@@ -47,21 +48,36 @@
     }
 #endif
 
+static apr_status_t apr_dbd_term(void *ptr)
+{
+    /* set drivers to NULL so init can work again */
+    drivers = NULL;
+
+    /* Everything else we need is handled by cleanups registered
+     * when we created mutexes and loaded DSOs
+     */
+    return APR_SUCCESS;
+}
+
 APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool)
 {
-    apr_status_t ret;
+    apr_status_t ret = APR_SUCCESS;
+
+    if (drivers != NULL) {
+        return APR_SUCCESS;
+    }
     drivers = apr_hash_make(pool);
+    apr_pool_cleanup_register(pool, NULL, apr_dbd_term,
+                              apr_pool_cleanup_null);
 
 #if APR_DSO_BUILD
 
 #if APR_HAS_THREADS
     ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool);
-    apr_pool_cleanup_register(pool, mutex, (void*)apr_thread_mutex_destroy,
-                              apr_pool_cleanup_null);
+    /* This already registers a pool cleanup */
 #endif
 
 #else
-    ret = APR_SUCCESS;
 
 #if APU_HAVE_MYSQL
     DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
@@ -143,12 +159,13 @@
                                        apr_pool_t *pool, const char *params,
                                        apr_dbd_t **handle)
 {
-
+    apr_status_t rv;
     *handle = driver->open(pool, params);
     if (*handle == NULL) {
         return APR_EGENERAL;
     }
-    if (apr_dbd_check_conn(driver, pool, *handle) != APR_SUCCESS) {
+    rv = apr_dbd_check_conn(driver, pool, *handle);
+    if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) {
         apr_dbd_close(driver, *handle);
         return APR_EGENERAL;
     }
@@ -160,7 +177,8 @@
 {
     int ret = driver->start_transaction(pool, handle, trans);
     if (*trans) {
-        apr_pool_cleanup_register(pool, *trans, (void*)driver->end_transaction,
+        apr_pool_cleanup_register(pool, *trans,
+                                  CLEANUP_CAST driver->end_transaction,
                                   apr_pool_cleanup_null);
     }
     return ret;
@@ -169,7 +187,7 @@
                                          apr_pool_t *pool,
                                          apr_dbd_transaction_t *trans)
 {
-    apr_pool_cleanup_kill(pool, trans, (void*)driver->end_transaction);
+    apr_pool_cleanup_kill(pool, trans, CLEANUP_CAST driver->end_transaction);
     return driver->end_transaction(trans);
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd_pgsql.c new/apr-util-1.2.7/dbd/apr_dbd_pgsql.c
--- old/apr-util-1.2.2/dbd/apr_dbd_pgsql.c	2005-08-11 10:51:16.000000000 +0200
+++ new/apr-util-1.2.7/dbd/apr_dbd_pgsql.c	2006-01-26 06:08:39.000000000 +0100
@@ -247,8 +247,13 @@
     }
     /* Translate from apr_dbd to native query format */
     for (sqlptr = (char*)query; *sqlptr; ++sqlptr) {
-        if ((sqlptr[0] == '%') && isalpha(sqlptr[1])) {
-            ++nargs;
+        if (sqlptr[0] == '%') {
+            if (isalpha(sqlptr[1])) {
+                ++nargs;
+            }
+            else if (sqlptr[1] == '%') {
+                ++sqlptr;
+            }
         }
     }
     length = strlen(query) + 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd_sqlite2.c new/apr-util-1.2.7/dbd/apr_dbd_sqlite2.c
--- old/apr-util-1.2.2/dbd/apr_dbd_sqlite2.c	2005-08-11 10:51:16.000000000 +0200
+++ new/apr-util-1.2.7/dbd/apr_dbd_sqlite2.c	2006-03-15 07:04:54.000000000 +0100
@@ -168,6 +168,10 @@
 
 static const char *dbd_sqlite_get_entry(const apr_dbd_row_t * row, int n)
 {
+    if ((n < 0) || (n >= row->res->sz)) {
+      return NULL;
+    }
+
     return row->data[n];
 }
 
@@ -211,7 +215,7 @@
 static const char *dbd_sqlite_escape(apr_pool_t * pool, const char *arg,
                                      apr_dbd_t * sql)
 {
-    char *ret = sqlite_mprintf(arg);
+    char *ret = sqlite_mprintf("%q", arg);
     apr_pool_cleanup_register(pool, ret, (void *) sqlite_freemem,
                               apr_pool_cleanup_null);
     return ret;
@@ -308,7 +312,7 @@
 
     perm = strstr(params, ":");
     if (perm) {
-        *(perm++) = '\x00';     // split the filename and permissions
+        *(perm++) = '\x00';     /* split the filename and permissions */
 
         if (strlen(perm) > 0)
             iperms = atoi(perm);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/dbd/apr_dbd_sqlite3.c new/apr-util-1.2.7/dbd/apr_dbd_sqlite3.c
--- old/apr-util-1.2.2/dbd/apr_dbd_sqlite3.c	2005-08-11 10:51:16.000000000 +0200
+++ new/apr-util-1.2.7/dbd/apr_dbd_sqlite3.c	2006-03-15 07:04:54.000000000 +0100
@@ -65,6 +65,7 @@
     apr_dbd_row_t *next_row;
     size_t sz;
     int tuples;
+    char **col_names;
 };
 
 struct apr_dbd_prepared_t {
@@ -109,6 +110,8 @@
         (*results)->random = seek;
         (*results)->next_row = 0;
         (*results)->tuples = 0;
+        (*results)->col_names = apr_pcalloc(pool,
+                                            column_count * sizeof(char *));
         do {
             ret = sqlite3_step((*results)->stmt);
             if (ret == SQLITE_BUSY) {
@@ -117,6 +120,7 @@
                 } else {
                     apr_thread_mutex_unlock(sql->mutex);
                     apr_sleep(MAX_RETRY_SLEEP);
+                    apr_thread_mutex_lock(sql->mutex);
                 }
             } else if (ret == SQLITE_ROW) {
                 int length;
@@ -131,13 +135,18 @@
                 for (i = 0; i < (*results)->sz; i++) {
                     column = apr_palloc(pool, sizeof(apr_dbd_column_t));
                     row->columns[i] = column;
-                    column->name = (char *) sqlite3_column_name((*results)->stmt, i);
+                    /* copy column name once only */
+                    if ((*results)->col_names[i] == NULL) {
+                      (*results)->col_names[i] =
+                          apr_pstrdup(pool,
+                                      sqlite3_column_name((*results)->stmt, i));
+                    }
+                    column->name = (*results)->col_names[i];
                     column->size = sqlite3_column_bytes((*results)->stmt, i);
                     column->type = sqlite3_column_type((*results)->stmt, i);
+                    column->value = NULL;
                     switch (column->type) {
-
                     case SQLITE_FLOAT:
-                        break;
                     case SQLITE_INTEGER:
                     case SQLITE_TEXT:
                         hold = NULL;
@@ -209,7 +218,7 @@
 {
     apr_dbd_column_t *column;
     const char *value;
-    if ((n + 1) > row->columnCount) {
+    if ((n < 0) || (n >= row->columnCount)) {
         return NULL;
     }
     column = row->columns[n];
@@ -226,19 +235,12 @@
 {
     sqlite3_stmt *stmt = NULL;
     const char *tail = NULL;
-    int ret, length = 0;
-    apr_status_t res;
-    apr_pool_t *pool;
+    int ret = -1, length = 0;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-    res = apr_pool_create(&pool, sql->pool);
-    if (res != APR_SUCCESS) {
-        sql->trans->errnum = res;
-        return SQLITE_ERROR;
-    }
     length = strlen(query);
     apr_thread_mutex_lock(sql->mutex);
 
@@ -248,7 +250,6 @@
             sqlite3_finalize(stmt);
             break;
         }
-
         ret = sqlite3_step(stmt);
         *nrows = sqlite3_changes(sql->conn);
         sqlite3_finalize(stmt);
@@ -257,20 +258,19 @@
     } while (length > 0);
 
     if (dbd_sqlite3_is_success(ret)) {
-        res = 0;
+        ret =  0;
     }
     apr_thread_mutex_unlock(sql->mutex);
-    apr_pool_destroy(pool);
     if (sql->trans) {
-        sql->trans->errnum = res;
+        sql->trans->errnum = ret;
     }
-    return res;
+    return ret;
 }
 
 static const char *dbd_sqlite3_escape(apr_pool_t *pool, const char *arg,
                                       apr_dbd_t *sql)
 {
-    char *ret = sqlite3_mprintf(arg);
+    char *ret = sqlite3_mprintf("%q", arg);
     apr_pool_cleanup_register(pool, ret, (void *) sqlite3_free,
                               apr_pool_cleanup_null);
     return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/include/apr_dbd.h new/apr-util-1.2.7/include/apr_dbd.h
--- old/apr-util-1.2.2/include/apr_dbd.h	2005-08-11 16:06:26.000000000 +0200
+++ new/apr-util-1.2.7/include/apr_dbd.h	2006-02-10 19:57:22.000000000 +0100
@@ -25,6 +25,16 @@
 extern "C" {
 #endif
 
+/**
+ * @file apr_dbd.h
+ * @brief APR-UTIL DBD library
+ */
+/**
+ * @defgroup APR_Util_DBD DBD routines
+ * @ingroup APR_Util
+ * @{
+ */
+
 /* These are opaque structs.  Instantiation is up to each backend */
 typedef struct apr_dbd_driver_t apr_dbd_driver_t;
 typedef struct apr_dbd_t apr_dbd_t;
@@ -314,6 +324,8 @@
                                   apr_dbd_prepared_t *statement, int random,
                                   ...);
 
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/include/apr_uri.h new/apr-util-1.2.7/include/apr_uri.h
--- old/apr-util-1.2.2/include/apr_uri.h	2005-05-25 07:54:58.000000000 +0200
+++ new/apr-util-1.2.7/include/apr_uri.h	2006-01-26 06:10:16.000000000 +0100
@@ -154,21 +154,21 @@
  * @param p The pool to allocate out of
  * @param uri The uri to parse
  * @param uptr The apr_uri_t to fill out
- * @return 0 for success or error code
+ * @return APR_SUCCESS for success or error code
  */
-APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri, 
-                               apr_uri_t *uptr);
+APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, 
+                                        apr_uri_t *uptr);
 
 /**
  * Special case for CONNECT parsing: it comes with the hostinfo part only
  * @param p The pool to allocate out of
  * @param hostinfo The hostinfo string to parse
  * @param uptr The apr_uri_t to fill out
- * @return 0 for success or error code
+ * @return APR_SUCCESS for success or error code
  */
-APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p, 
-                                        const char *hostinfo, 
-                                        apr_uri_t *uptr);
+APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, 
+                                                 const char *hostinfo, 
+                                                 apr_uri_t *uptr);
 
 /** @} */
 #ifdef __cplusplus
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/include/apu_version.h new/apr-util-1.2.7/include/apu_version.h
--- old/apr-util-1.2.2/include/apu_version.h	2005-09-27 01:24:03.000000000 +0200
+++ new/apr-util-1.2.7/include/apu_version.h	2006-04-09 21:50:49.000000000 +0200
@@ -59,14 +59,14 @@
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APU_PATCH_VERSION       2
+#define APU_PATCH_VERSION       7
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,
  * "development" copies of APU.  It is undefined for released versions
  * of APU.
  */
-/* #define APU_IS_DEV_VERSION */
+#undef APU_IS_DEV_VERSION
 
 
 #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/libaprutil.dsp new/apr-util-1.2.7/libaprutil.dsp
--- old/apr-util-1.2.2/libaprutil.dsp	2005-07-08 11:44:00.000000000 +0200
+++ new/apr-util-1.2.7/libaprutil.dsp	2006-04-03 03:47:32.000000000 +0200
@@ -68,8 +68,8 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libaprutil_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libaprutil_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -260,6 +260,10 @@
 
 SOURCE=.\misc\apr_rmm.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\misc\apu_version.c
+# End Source File
 # End Group
 # Begin Group "sdbm"
 
@@ -496,33 +500,6 @@
 !ENDIF 
 
 # End Source File
-# Begin Source File
-
-SOURCE=.\uri\gen_uri_delims.exe
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-# Begin Custom Build - Generating uri_delims.h
-InputPath=.\uri\gen_uri_delims.exe
-
-".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-# Begin Custom Build - Generating uri_delims.h
-InputPath=.\uri\gen_uri_delims.exe
-
-".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
 # End Group
 # Begin Group "Public Header Files"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/libaprutil.rc new/apr-util-1.2.7/libaprutil.rc
--- old/apr-util-1.2.2/libaprutil.rc	2005-03-16 05:23:10.000000000 +0100
+++ new/apr-util-1.2.7/libaprutil.rc	2005-12-02 14:51:58.000000000 +0100
@@ -1,54 +1,54 @@
-#include "apu_version.h"
-
-#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
-                      "Foundation or its licensors, as applicable."
-
-#define APU_LICENSE "Licensed under the Apache License, Version 2.0 " \
-                    "(the ""License""); you may not use this file except " \
-                    "in compliance with the License.  You may obtain a " \
-                    "copy of the License at\r\n\r\n" \
-                    "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
-                    "Unless required by applicable law or agreed to in " \
-                    "writing, software distributed under the License is " \
-                    "distributed on an ""AS IS"" BASIS, WITHOUT " \
-                    "WARRANTIES OR CONDITIONS OF ANY KIND, either " \
-                    "express or implied.  See the License for the " \
-                    "specific language governing permissions and " \
-                    "limitations under the License."
-
-#define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION)
-
-
-1 VERSIONINFO
- FILEVERSION APU_VERSION_STRING_CSV,0
- PRODUCTVERSION APU_VERSION_STRING_CSV,0
- FILEFLAGSMASK 0x3fL
-#if defined(_DEBUG)
- FILEFLAGS 0x01L
-#else
- FILEFLAGS 0x00L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904b0"
-    BEGIN
-    VALUE "Comments", APU_LICENSE "\0"
-      VALUE "CompanyName", "Apache Software Foundation\0"
-      VALUE "FileDescription", "Apache Portable Runtime Library\0"
-      VALUE "FileVersion", APU_VERSION_STRING "\0"
-      VALUE "InternalName", APU_DLL_BASENAME "\0"
-      VALUE "LegalCopyright", APU_COPYRIGHT "\0"
-      VALUE "OriginalFilename", APU_DLL_BASENAME ".dll\0"
-      VALUE "ProductName", "Apache Portable Runtime Project\0"
-      VALUE "ProductVersion", APU_VERSION_STRING "\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1200
-  END
-END
+#include "apu_version.h"
+
+#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+                      "Foundation or its licensors, as applicable."
+
+#define APU_LICENSE "Licensed under the Apache License, Version 2.0 " \
+                    "(the ""License""); you may not use this file except " \
+                    "in compliance with the License.  You may obtain a " \
+                    "copy of the License at\r\n\r\n" \
+                    "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
+                    "Unless required by applicable law or agreed to in " \
+                    "writing, software distributed under the License is " \
+                    "distributed on an ""AS IS"" BASIS, WITHOUT " \
+                    "WARRANTIES OR CONDITIONS OF ANY KIND, either " \
+                    "express or implied.  See the License for the " \
+                    "specific language governing permissions and " \
+                    "limitations under the License."
+
+#define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION)
+
+
+1 VERSIONINFO
+ FILEVERSION APU_VERSION_STRING_CSV,0
+ PRODUCTVERSION APU_VERSION_STRING_CSV,0
+ FILEFLAGSMASK 0x3fL
+#if defined(_DEBUG)
+ FILEFLAGS 0x01L
+#else
+ FILEFLAGS 0x00L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904b0"
+    BEGIN
+    VALUE "Comments", APU_LICENSE "\0"
+      VALUE "CompanyName", "Apache Software Foundation\0"
+      VALUE "FileDescription", "Apache Portable Runtime Library\0"
+      VALUE "FileVersion", APU_VERSION_STRING "\0"
+      VALUE "InternalName", APU_DLL_BASENAME "\0"
+      VALUE "LegalCopyright", APU_COPYRIGHT "\0"
+      VALUE "OriginalFilename", APU_DLL_BASENAME ".dll\0"
+      VALUE "ProductName", "Apache Portable Runtime Project\0"
+      VALUE "ProductVersion", APU_VERSION_STRING "\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1200
+  END
+END
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/test/testbuckets.c new/apr-util-1.2.7/test/testbuckets.c
--- old/apr-util-1.2.2/test/testbuckets.c	2005-09-21 12:53:18.000000000 +0200
+++ new/apr-util-1.2.7/test/testbuckets.c	2006-01-26 06:04:09.000000000 +0100
@@ -344,8 +344,16 @@
     }
 
     ABTS_ASSERT(tc, "total size of buckets incorrect", count == bignum);
-    
+
     apr_brigade_destroy(bb);
+
+    /* Truncate the file to zero size before close() so that we don't
+     * actually write out the large file if we are on a non-sparse file
+     * system - like Mac OS X's HFS.  Otherwise, pity the poor user who
+     * has to wait for the 8GB file to be written to disk.
+     */
+    apr_file_trunc(f, 0);
+
     apr_file_close(f);
     apr_bucket_alloc_destroy(ba);
     apr_file_remove(TIF_FNAME, p);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/test/testdbd.c new/apr-util-1.2.7/test/testdbd.c
--- old/apr-util-1.2.2/test/testdbd.c	2005-09-21 15:47:15.000000000 +0200
+++ new/apr-util-1.2.7/test/testdbd.c	2006-01-27 05:30:56.000000000 +0100
@@ -136,6 +136,14 @@
     ABTS_ASSERT(tc, "If we overseek, get_row should return -1", rv == -1);
 }
 
+static void test_escape(abts_case *tc, apr_dbd_t *handle,
+                        const apr_dbd_driver_t *driver)
+{
+  const char *escaped = apr_dbd_escape(driver, p, "foo'bar", handle);
+
+  ABTS_STR_EQUAL(tc, "foo''bar", escaped);
+}
+
 static void test_dbd_generic(abts_case *tc, apr_dbd_t* handle, 
                              const apr_dbd_driver_t* driver)
 {
@@ -156,6 +164,8 @@
     select_rows(tc, handle, driver, 0);
     drop_table(tc, handle, driver);
 
+    test_escape(tc, handle, driver);
+
     rv = apr_dbd_close(driver, handle);
     ABTS_ASSERT(tc, "failed to close database", rv == APR_SUCCESS);
 }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/uri/apr_uri.c new/apr-util-1.2.7/uri/apr_uri.c
--- old/apr-util-1.2.2/uri/apr_uri.c	2005-02-04 21:45:35.000000000 +0100
+++ new/apr-util-1.2.7/uri/apr_uri.c	2006-01-26 06:10:16.000000000 +0100
@@ -253,8 +253,8 @@
  *  - fills in fields of uri_components *uptr
  *  - none on any of the r->* fields
  */
-APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri, 
-                               apr_uri_t *uptr)
+APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, 
+                                        apr_uri_t *uptr)
 {
     const char *s;
     const char *s1;
@@ -413,9 +413,9 @@
  * currently at http://www.mcom.com/newsref/std/tunneling_ssl.html
  * for the format of the "CONNECT host:port HTTP/1.0" request
  */
-APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p, 
-                                        const char *hostinfo, 
-                                        apr_uri_t *uptr)
+APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, 
+                                                 const char *hostinfo, 
+                                                 apr_uri_t *uptr)
 {
     const char *s;
     char *endstr;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/uri/gen_uri_delims.c new/apr-util-1.2.7/uri/gen_uri_delims.c
--- old/apr-util-1.2.2/uri/gen_uri_delims.c	2005-02-04 21:45:35.000000000 +0100
+++ new/apr-util-1.2.7/uri/gen_uri_delims.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-
-/* generate a apr_table_t of 256 values, where certain characters are
- * marked "interesting"... for the uri parsing process.
- */
-
-int main(int argc, char *argv[])
-{
-    int i;
-    char *value;
-
-    printf("/* this file is automatically generated by "
-	    "gen_uri_delims, do not edit */\n");
-    printf("static const unsigned char uri_delims[256] = {");
-    for (i = 0; i < 256; ++i) {
-	if (i % 20 == 0)
-	    printf("\n    ");
-	switch (i) {
-	case ':': 	value = "T_COLON";	break;
-	case '/': 	value = "T_SLASH";	break;
-	case '?': 	value = "T_QUESTION";	break;
-	case '#': 	value = "T_HASH";	break;
-	case '\0': 	value = "T_NUL";	break;
-	default:	value = "0";		break;
-	}
-	printf("%s%c", value, (i < 255) ? ',' : ' ');
-    }
-    printf("\n};\n");
-
-    return 0;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/uri/gen_uri_delims.dsp new/apr-util-1.2.7/uri/gen_uri_delims.dsp
--- old/apr-util-1.2.2/uri/gen_uri_delims.dsp	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/uri/gen_uri_delims.dsp	1970-01-01 01:00:00.000000000 +0100
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gen_uri_delims" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gen_uri_delims - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gen_uri_delims.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gen_uri_delims.mak" CFG="gen_uri_delims - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gen_uri_delims - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gen_uri_delims - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gen_uri_delims - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Release\gen_uri_delims" /FD /c
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\gen_uri_delims.pdb" /machine:I386
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:"Release\gen_uri_delims.pdb" /machine:I386
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "gen_uri_delims - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\gen_uri_delims" /FD /c
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /debug /machine:I386
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"Debug\gen_uri_delims.pdb" /debug /machine:I386
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gen_uri_delims - Win32 Release"
-# Name "gen_uri_delims - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\gen_uri_delims.c
-# End Source File
-# End Target
-# End Project
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/README new/apr-util-1.2.7/xml/expat/README
--- old/apr-util-1.2.2/xml/expat/README	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/xml/expat/README	2006-03-22 06:43:53.000000000 +0100
@@ -1,64 +1,72 @@
 
-			Expat, Release 1.95.1
+			Expat, Release 1.95.2
 
-This is expat, the C library for parsing XML, written by James Clark. Expat
-is a stream oriented XML parser. This means that you register handlers with
-the parser prior to starting the parse. These handlers are called when
-the parser discovers the associated structures in the document being parsed.
-A start tag is an example of the kind of structures for which you may
-register handlers.
-
-Expat is free software. You may copy, distribute, and modify it under the
-terms of the License contained in the file, COPYING, distributed with this
-package. This license is the same as the MIT/X Consortium license.
-
-Versions of expat that have an odd minor version (the middle number in the
-release above), are development releases and should be considered as
-beta software. Releases with even minor version numbers are intended to be
-production grade software.
+This is expat, a C library for parsing XML, written by James Clark.
+Expat is a stream-oriented XML parser.  This means that you register
+handlers with the parser before starting the parse.  These handlers
+are called when the parser discovers the associated structures in the
+document being parsed.  A start tag is an example of the kind of
+structures for which you may register handlers.
+
+Windows users should use the expat_win32bin package, which includes
+both precompiled libraries and executalbes, and source code for
+developers.
+
+Expat is free software.  You may copy, distribute, and modify it under
+the terms of the License contained in the file COPYING distributed
+with this package.  This license is the same as the MIT/X Consortium
+license.
+
+Versions of expat that have an odd minor version (the middle number in
+the release above), are development releases and should be considered
+as beta software.  Releases with even minor version numbers are
+intended to be production grade software.
 
-To build expat, you first run the configuration shell script in the top
-level distribution directory:
+To build expat, you first run the configuration shell script in the
+top level distribution directory:
 
 	./configure
 
-There are many options which you may provide to configure (which you can
-discover by running configure with the --help option.) But the one of most
-interest is the one that sets the installation directory. By default,
-the configure script will set things up to install libexpat into
-/usr/local/lib and expat.h into /usr/local/include. If, for example, you'd
-prefer to install into /home/me/mystuff/lib and /home/me/mystuff/include,
-you can tell configure about that with:
+There are many options which you may provide to configure (which you
+can discover by running configure with the --help option).  But the
+one of most interest is the one that sets the installation directory.
+By default, the configure script will set things up to install
+libexpat into /usr/local/lib, expat.h into /usr/local/include, and
+xmlwf into /usr/local/bin.  If, for example, you'd prefer to install
+into /home/me/mystuff/lib, /home/me/mystuff/include, and
+/home/me/mystuff/bin, you can tell configure about that with:
 
 	./configure --prefix=/home/me/mystuff
 
-After running the configure script, the "make" command will build things and
-"make install" will install things into their proper location. Note that
-you need to have write permission into the directories into which things
-will be installed.
+After running the configure script, the "make" command will build
+things and "make install" will install things into their proper
+location.  Note that you need to have write permission into the
+directories into which things will be installed.
+
+When building for use with C++, you may need to add additional
+compiler flags to support proper interaction with exceptions.  This
+can be done by setting the CFLAGS environment variable.  For example,
+when using GCC, you can use:
+
+	CFLAGS=-fexceptions ./configure
 
 Note for Solaris users:  The "ar" command is usually located in
 "/usr/ccs/bin", which is not in the default PATH.  You will need to
-add this to your path for the "make" command.  If you're using ksh or
-bash, use this command to build:
+add this to your path for the "make" command, and probably also switch
+to GNU make (the "make" found in /usr/ccs/bin does not seem to work
+properly -- appearantly it does not understand .PHONY directives).  If
+you're using ksh or bash, use this command to build:
 
 	PATH=/usr/ccs/bin:$PATH make
 
-Alternatively, on Win32 systems with Microsoft's Developer's Studio installed,
-you can simply double-click on lib/expat.dsp from Windows Explorer and build
-and install in the usual way from with DevStudio.
-
-As a third alternative you may choose to download expat_win32bin which has
-a pre-compiled dll in it.
-
-A reference manual is available in the doc/reference.html in this
+A reference manual is available in the file doc/reference.html in this
 distribution.
 
-The homepage for this project is http://expat.sourceforge.net. There are
-links there to connect you to the bug reports page. If you need to report
-a bug when you don't have access to a browser, you may also send a bug
-report by email to expat-bugs@lists.sourceforge.net.
-
-Discussion related to the direction of future expat development takes place
-on expat-discuss@lists.sourceforge.net. Archives of this list may be found
-at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.
+The homepage for this project is http://expat.sourceforge.net/.  There
+are links there to connect you to the bug reports page.  If you need
+to report a bug when you don't have access to a browser, you may also
+send a bug report by email to expat-bugs@lists.sourceforge.net.
+
+Discussion related to the direction of future expat development takes
+place on expat-discuss@lists.sourceforge.net.  Archives of this list
+may be found at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/buildconf.sh new/apr-util-1.2.7/xml/expat/buildconf.sh
--- old/apr-util-1.2.2/xml/expat/buildconf.sh	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/xml/expat/buildconf.sh	2006-03-25 22:09:43.000000000 +0100
@@ -19,10 +19,11 @@
 # want to ensure is used.
 echo "Copying libtool helper files ..."
 
-# Remove any libtool files so one can switch between libtool 1.3
-# and libtool 1.4 by simply rerunning the buildconf script.
+# Remove any m4 cache and libtool files so one can switch between
+# autoconf and libtool versions by simply rerunning the buildconf script.
+#
 (cd conftools ; rm -f ltconfig ltmain.sh)
-rm -f aclocal.m4 libtool.m4 ltsugar.m4
+rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
 
 $libtoolize --copy --automake
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/lib/expat.dsp new/apr-util-1.2.7/xml/expat/lib/expat.dsp
--- old/apr-util-1.2.2/xml/expat/lib/expat.dsp	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/xml/expat/lib/expat.dsp	2006-03-22 07:55:04.000000000 +0100
@@ -41,8 +41,8 @@
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /EHsc /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -67,8 +67,8 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /EHsc /Zi /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -95,11 +95,11 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.1\"
+# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -110,11 +110,11 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -125,11 +125,11 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -140,12 +140,12 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
 # PROP Exclude_From_Build 1
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -156,12 +156,12 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
 # PROP Exclude_From_Build 1
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/lib/expat.h.in new/apr-util-1.2.7/xml/expat/lib/expat.h.in
--- old/apr-util-1.2.2/xml/expat/lib/expat.h.in	2004-11-25 00:41:24.000000000 +0100
+++ new/apr-util-1.2.7/xml/expat/lib/expat.h.in	2006-03-22 07:55:04.000000000 +0100
@@ -726,13 +726,13 @@
 XML_ExpatVersionInfo(void);
 
 #ifndef XML_MAJOR_VERSION
-#define XML_MAJOR_VERSION @EXPAT_MAJOR_VERSION@
+#define XML_MAJOR_VERSION 1
 #endif
 #ifndef XML_MINOR_VERSION
-#define XML_MINOR_VERSION @EXPAT_MINOR_VERSION@
+#define XML_MINOR_VERSION 95
 #endif
 #ifndef XML_MICRO_VERSION
-#define XML_MICRO_VERSION @EXPAT_EDIT@
+#define XML_MICRO_VERSION 2
 #endif
 
 #ifdef __cplusplus
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/apr-util-1.2.2/xml/expat/lib/xml.dsp new/apr-util-1.2.7/xml/expat/lib/xml.dsp
--- old/apr-util-1.2.2/xml/expat/lib/xml.dsp	2005-05-16 14:50:51.000000000 +0200
+++ new/apr-util-1.2.7/xml/expat/lib/xml.dsp	2006-03-22 07:55:04.000000000 +0100
@@ -41,7 +41,7 @@
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fd"LibR\xml_src" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fd"LibR\xml_src" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -64,8 +64,8 @@
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fd"LibD\xml_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fd"LibD\xml_src" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)