- merged mod_ssl 2.8.25-1.3.34 updates from HEAD

[packages/apache.git] / apache-db3.patch

diff --git a/apache-db3.patch b/apache-db3.patch
index 31ac749050b36753ba42e361c6cf1b2d1f9ea43f..40440e85f97b6030d245443593878aca276c4923 100644 (file)
--- a/apache-db3.patch
+++ b/apache-db3.patch
@@ -1,34 +1,39 @@
-diff -urN apache_1.3.17.org/src/modules/standard/mod_auth_dbm.c apache_1.3.17/src/modules/standard/mod_auth_dbm.c
---- apache_1.3.17.org/src/modules/standard/mod_auth_dbm.c      Fri Feb  2 15:29:26 2001
-+++ apache_1.3.17/src/modules/standard/mod_auth_dbm.c  Fri Feb  2 15:29:38 2001
-@@ -81,8 +81,12 @@
+diff -Nur apache_1.3.17.orig/src/modules/standard/mod_auth_dbm.c apache_1.3.17/src/modules/standard/mod_auth_dbm.c
+--- apache_1.3.17.orig/src/modules/standard/mod_auth_dbm.c     Wed Feb  7 23:10:02 2001
++++ apache_1.3.17/src/modules/standard/mod_auth_dbm.c  Wed Feb  7 23:14:06 2001
+@@ -81,7 +81,8 @@
  #define dbm_fetch sdbm_fetch
  #define dbm_close sdbm_close
- #elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
--    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
-+    && __GLIBC__ >= 2 && __GLIBC_MINOR__ == 1
- #include <db1/ndbm.h>
-+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
-+    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 2
+ #else
+-#include <ndbm.h>
 +#define DB_DBM_HSEARCH 1
 +#include <db.h>
- #else
- #include <ndbm.h>
  #endif
-diff -urN apache_1.3.17.org/src/modules/standard/mod_rewrite.h apache_1.3.17/src/modules/standard/mod_rewrite.h
---- apache_1.3.17.org/src/modules/standard/mod_rewrite.h       Fri Feb  2 15:29:26 2001
-+++ apache_1.3.17/src/modules/standard/mod_rewrite.h   Fri Feb  2 15:31:21 2001
-@@ -131,8 +131,12 @@
+ 
+ /*
+diff -Nur apache_1.3.17.orig/src/modules/standard/mod_rewrite.h apache_1.3.17/src/modules/standard/mod_rewrite.h
+--- apache_1.3.17.orig/src/modules/standard/mod_rewrite.h      Thu Jan 18 23:31:44 2001
++++ apache_1.3.17/src/modules/standard/mod_rewrite.h   Wed Feb  7 23:15:22 2001
+@@ -130,7 +130,8 @@
+      * so we also need to know the file extension
       */
  #ifndef NO_DBM_REWRITEMAP
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
--    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
-+    && __GLIBC__ >= 2 && __GLIBC_MINOR__ == 1
- #include <db1/ndbm.h>
-+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
-+    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 2
+-#include <ndbm.h>
 +#define DB_DBM_HSEARCH 1
 +#include <db.h>
- #else
- #include <ndbm.h>
- #endif
+ #if defined(DBM_SUFFIX)
+ #define NDBM_FILE_SUFFIX DBM_SUFFIX
+ #elif defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM))
+--- apache_1.3.23/src/helpers/find-dbm-lib.orig        Tue Jan 22 08:39:15 2002
++++ apache_1.3.23/src/helpers/find-dbm-lib     Wed Feb  6 21:34:50 2002
+@@ -13,7 +13,9 @@
+           *-linux*)
+               # many systems don't have -ldbm
+               DBM_LIB=""
+-              if ./helpers/TestCompile lib ndbm dbm_open; then
++              if ./helpers/TestCompile lib db __db_ndbm_open; then
++                  DBM_LIB="-ldb"
++              elif ./helpers/TestCompile lib ndbm dbm_open; then
+                   DBM_LIB="-lndbm"
+                   if ./helpers/TestCompile lib db1 dbm_open; then
+                       # Red Hat needs this; ndbm.h lives in db1