X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapr-util.git;a=blobdiff_plain;f=apr-util-db.patch;fp=apr-util-db.patch;h=0000000000000000000000000000000000000000;hp=72f5dcf710b7c4ee5e5e8f005104695c41ea0e31;hb=091e56ade9d07b634eb3dd44f23a6086f77659e3;hpb=6e3991cebace0b259a1416346a96453945827f79

diff --git a/apr-util-db.patch b/apr-util-db.patch
deleted file mode 100644
index 72f5dcf..0000000
--- a/apr-util-db.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c.orig	2008-11-21 09:22:35.000000000 +0100
-+++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c	2010-05-21 09:34:59.958939260 +0200
-@@ -37,7 +37,9 @@
-  * DB_185, DB2, DB3, and DB4.
-  */
- 
--#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
-+#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR > 4)
-+#define DB_VER 4
-+#elif   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
- /* We will treat anything greater than 4.1 as DB4.
-  * We can treat 4.0 as DB3.
-  */
---- apr-util-1.3.9/build/dbm.m4.orig	2008-11-21 07:32:58.000000000 +0100
-+++ apr-util-1.3.9/build/dbm.m4	2010-05-21 09:40:46.866935908 +0200
-@@ -112,7 +112,7 @@
-         changequote([,])
-         unset $cache_id
-         AC_CHECK_HEADER([$bdb_header], [
--          if test "$1" = "3" -o "$1" = "4"; then
-+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-             # We generate a separate cache variable for each prefix and libname
-             # we search under.  That way, we avoid caching information that
-             # changes if the user runs `configure' with a different set of
-@@ -522,6 +522,44 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB48: is DB4.8 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB48], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
-+    "$places",
-+    "db48/db.h db4/db.h db.h",
-+    "db-4.8 db4-4.8 db48 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
-+dnl
-+dnl APU_CHECK_DB50: is DB5.0 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB50], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "0", "-1",
-+    "$places",
-+    "db50/db.h db5/db.h db.h",
-+    "db-5.0 db5-5.0 db50 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -606,6 +644,18 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db48)
-+    APU_CHECK_DB48("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-+  db50)
-+    APU_CHECK_DB50("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -618,6 +668,10 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
-+  APU_CHECK_DB50("$all_places")
-+  if test "$apu_db_version" != "5"; then
-+  APU_CHECK_DB48("$all_places")
-+  if test "$apu_db_version" != "4"; then
-   APU_CHECK_DB47("$all_places")
-   if test "$apu_db_version" != "4"; then
-     APU_CHECK_DB46("$all_places")
-@@ -652,6 +706,8 @@
-       fi
-     fi
-   fi
-+  fi
-+  fi
-   AC_MSG_CHECKING(for Berkeley DB)
-   if test "$apu_have_db" = "1"; then
-     AC_MSG_RESULT(found db$apu_db_version)
-@@ -679,11 +735,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-   [
-     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, db44, db45, db46, db47])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47,db48,db50])
-     fi
-     requested="$withval"
-   ], [
-@@ -882,6 +938,14 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db48)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-+    db50)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -889,7 +953,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, db43, db44, db45, db46, db47])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-       ;;
-   esac
-