[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/…

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Philip Hazel
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src ACKNOWLEDGMENTS exim/exim-src/src dbfn.c dbfunctions.h exim_dbmbuild.c exim_dbutil.c
ph10 2005/06/14 11:32:01 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src             ACKNOWLEDGMENTS 
    exim-src/src         dbfn.c dbfunctions.h exim_dbmbuild.c 
                         exim_dbutil.c 
  Log:
  Applied Alex Kiernan's patch for the API change in BDB 4.3.


  Revision  Changes    Path
  1.154     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.26      +2 -1      exim/exim-src/ACKNOWLEDGMENTS
  1.3       +8 -1      exim/exim-src/src/dbfn.c
  1.3       +6 -1      exim/exim-src/src/dbfunctions.h
  1.3       +7 -1      exim/exim-src/src/exim_dbmbuild.c
  1.5       +7 -1      exim/exim-src/src/exim_dbutil.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- ChangeLog    13 Jun 2005 13:37:39 -0000    1.153
  +++ ChangeLog    14 Jun 2005 10:32:01 -0000    1.154
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.153 2005/06/13 13:37:39 fanf2 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.154 2005/06/14 10:32:01 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -110,6 +110,9 @@

   TF/05 Fixed a ${extract error message typo reported by Jeremy Harris
         <jgh@???>
  +
  +PH/12 Applied Alex Kiernan's patch for the API change for the error callback
  +      function for BDB 4.3.



Exim version 4.51

  Index: ACKNOWLEDGMENTS
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ACKNOWLEDGMENTS    6 Jun 2005 19:30:18 -0000    1.25
  +++ ACKNOWLEDGMENTS    14 Jun 2005 10:32:01 -0000    1.26
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.25 2005/06/06 19:30:18 tom Exp $
  +$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.26 2005/06/14 10:32:01 ph10 Exp $


EXIM ACKNOWLEDGEMENTS

@@ -20,7 +20,7 @@
Philip Hazel

Lists created: 20 November 2002
-Last updated: 27 April 2005
+Last updated: 14 June 2005


   THE OLD LIST
  @@ -160,6 +160,7 @@
   Christian Kellner         Patch for LDAP dereferencing
   Alex Kiernan              Patch for libradius
                             Diagnosis of milliwait clock-backwards bug
  +                          Patch for BDB 4.3 API change
   Tom Kistner               SPA server code
                             Writing and maintaining the content scanning
                               extension (exiscan)


  Index: dbfn.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/dbfn.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dbfn.c    4 Jan 2005 10:00:42 -0000    1.2
  +++ dbfn.c    14 Jun 2005 10:32:01 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.3 2005/06/14 10:32:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -40,12 +40,19 @@


/* For Berkeley DB >= 2, we can define a function to be called in case of DB
errors. This should help with debugging strange DB problems, e.g. getting "File
-exists" when you try to open a db file. */
+exists" when you try to open a db file. The API for this function was changed
+at DB release 4.3. */

#if defined(USE_DB) && defined(DB_VERSION_STRING)
void
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+{
+dbenv = dbenv;
+#else
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
+#endif
pfx = pfx;
log_write(0, LOG_MAIN, "Berkeley DB error: %s", msg);
}

  Index: dbfunctions.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/dbfunctions.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dbfunctions.h    4 Jan 2005 10:00:42 -0000    1.2
  +++ dbfunctions.h    14 Jun 2005 10:32:01 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/dbfunctions.h,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/dbfunctions.h,v 1.3 2005/06/14 10:32:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -21,10 +21,15 @@


#define dbfn_read(a, b) dbfn_read_with_length(a, b, NULL)

-/* Berkeley DB uses a callback function to pass back error details. */
+/* Berkeley DB uses a callback function to pass back error details. Its API
+changed at release 4.3. */

   #if defined(USE_DB) && defined(DB_VERSION_STRING)
  +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
  +void     dbfn_bdb_error_callback(const DB_ENV *, const char *, const char *);
  +#else
   void     dbfn_bdb_error_callback(const char *, char *);
  +#endif
   #endif


/* End of dbfunctions.h */

  Index: exim_dbmbuild.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exim_dbmbuild.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- exim_dbmbuild.c    4 Jan 2005 10:00:42 -0000    1.2
  +++ exim_dbmbuild.c    14 Jun 2005 10:32:01 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/exim_dbmbuild.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/exim_dbmbuild.c,v 1.3 2005/06/14 10:32:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -58,12 +58,18 @@


/* For Berkeley DB >= 2, we can define a function to be called in case of DB
errors. This should help with debugging strange DB problems, e.g. getting "File
-exists" when you try to open a db file. */
+exists" when you try to open a db file. The API changed at release 4.3. */

#if defined(USE_DB) && defined(DB_VERSION_STRING)
void
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+{
+dbenv = dbenv;
+#else
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
+#endif
pfx = pfx;
printf("Berkeley DB error: %s\n", msg);
}

  Index: exim_dbutil.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exim_dbutil.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- exim_dbutil.c    23 May 2005 16:58:56 -0000    1.4
  +++ exim_dbutil.c    14 Jun 2005 10:32:01 -0000    1.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/exim_dbutil.c,v 1.4 2005/05/23 16:58:56 fanf2 Exp $ */
  +/* $Cambridge: exim/exim-src/src/exim_dbutil.c,v 1.5 2005/06/14 10:32:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -78,12 +78,18 @@


/* For Berkeley DB >= 2, we can define a function to be called in case of DB
errors. This should help with debugging strange DB problems, e.g. getting "File
-exists" when you try to open a db file. */
+exists" when you try to open a db file. The API changed at release 4.3. */

#if defined(USE_DB) && defined(DB_VERSION_STRING)
void
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+{
+dbenv = dbenv;
+#else
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
+#endif
pfx = pfx;
printf("Berkeley DB error: %s\n", msg);
}