packages: apache1/apache1.spec, apache1/apache1-db4.patch - updated db4 pat...

[qboosh]

Author: qboosh                       Date: Wed Feb  9 16:59:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated db4 patch: old content was obsolete, now it adds db5.0 support

---- Files affected:
packages/apache1:
   apache1.spec (1.216 -> 1.217) , apache1-db4.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/apache1/apache1.spec
diff -u packages/apache1/apache1.spec:1.216 packages/apache1/apache1.spec:1.217
--- packages/apache1/apache1.spec:1.216	Thu Dec 16 12:52:23 2010
+++ packages/apache1/apache1.spec	Wed Feb  9 17:59:43 2011
@@ -2496,6 +2496,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.217  2011/02/09 16:59:43  qboosh
+- updated db4 patch: old content was obsolete, now it adds db5.0 support
+
 Revision 1.216  2010/12/16 11:52:23  glen
 - release 4
 

================================================================
Index: packages/apache1/apache1-db4.patch
diff -u packages/apache1/apache1-db4.patch:1.1 packages/apache1/apache1-db4.patch:1.2
--- packages/apache1/apache1-db4.patch:1.1	Sat Feb 15 00:31:23 2003
+++ packages/apache1/apache1-db4.patch	Wed Feb  9 17:59:43 2011
@@ -1,24 +1,20 @@
---- apache_1.3.27/src/modules/standard/mod_auth_db.c.orig	Fri Feb 14 23:27:47 2003
-+++ apache_1.3.27/src/modules/standard/mod_auth_db.c	Fri Feb 14 23:32:14 2003
-@@ -107,6 +107,9 @@
+--- apache_1.3.42/src/modules/standard/mod_auth_db.c.orig	2011-02-09 16:58:54.748693904 +0100
++++ apache_1.3.42/src/modules/standard/mod_auth_db.c	2011-02-09 17:34:00.304686361 +0100
+@@ -63,7 +63,7 @@
+ #if (DB_VERSION_MAJOR == 3)
+ #define DB3
  #endif
- #if (DB_VERSION_MAJOR == 4)
+-#if (DB_VERSION_MAJOR == 4)
++#if (DB_VERSION_MAJOR == 4) || (DB_VERSION_MAJOR == 5)
  #define DB4
-+#if (DB_VERSION_MINOR >= 1)
-+#define DB4_1
-+#endif
  #endif
  #endif
+@@ -130,7 +130,7 @@
  
-@@ -170,7 +173,10 @@
-     q.data = user;
-     q.size = strlen(q.data);
- 
--#if defined(DB3) || defined(DB4)
-+#if defined(DB4_1)
-+    if (   db_create(&f, NULL, 0) != 0
-+	|| f->open(f, NULL, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
-+#elif defined(DB3) || defined(DB4)
+ #if defined(DB3) || defined(DB4)
      if (   db_create(&f, NULL, 0) != 0 
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0
++#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+         || f->open(f, NULL, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
+ #else
          || f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
- #elif defined(DB2)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1/apache1.spec?r1=1.216&r2=1.217&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1/apache1-db4.patch?r1=1.1&r2=1.2&f=u