r4836 - in trunk: BOOK BOOK/introduction/welcome BOOK/server/mail patches

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Fri Jul 29 18:27:40 PDT 2005


Author: bdubbs
Date: 2005-07-29 19:27:39 -0600 (Fri, 29 Jul 2005)
New Revision: 4836

Added:
   trunk/patches/exim-4.52-db43-1.patch
Removed:
   trunk/patches/exim-4.43-db43-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/server/mail/exim.xml
Log:
Updated to exim-4.52

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-07-29 22:03:32 UTC (rev 4835)
+++ trunk/BOOK/general.ent	2005-07-30 01:27:39 UTC (rev 4836)
@@ -279,7 +279,7 @@
 
 <!-- Chapter 22 -->
 <!ENTITY courier-version              "0.47">
-<!ENTITY exim-version                 "4.43">
+<!ENTITY exim-version                 "4.52">
 <!ENTITY postfix-version              "2.2.3">
 <!ENTITY qpopper-version              "4.0.5">
 <!ENTITY sendmail-version             "8.13.4">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-07-29 22:03:32 UTC (rev 4835)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-07-30 01:27:39 UTC (rev 4836)
@@ -25,6 +25,10 @@
   <itemizedlist>
   
     <listitem>
+      <para>July 29th 2005 [bdubbs]: Updated to exim-5.52.</para>
+    </listitem>
+    
+    <listitem>
       <para>July 29th 2005 [bdubbs]: Updated to iptables-1..3.3.</para>
     </listitem>
     

Modified: trunk/BOOK/server/mail/exim.xml
===================================================================
--- trunk/BOOK/server/mail/exim.xml	2005-07-29 22:03:32 UTC (rev 4835)
+++ trunk/BOOK/server/mail/exim.xml	2005-07-30 01:27:39 UTC (rev 4836)
@@ -6,10 +6,10 @@
 
   <!ENTITY exim-download-http "http://www.exim.org/ftp/exim4/exim-&exim-version;.tar.bz2">
   <!ENTITY exim-download-ftp "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-  <!ENTITY exim-md5sum "f8f646d4920660cb5579becd9265a3bf">
-  <!ENTITY exim-size "1.4 MB">
-  <!ENTITY exim-buildsize "14.9 MB">
-  <!ENTITY exim-time "0.14 SBU">
+  <!ENTITY exim-md5sum "89601650f3b854d469451f30b369622b">
+  <!ENTITY exim-size "1.5 MB">
+  <!ENTITY exim-buildsize "12.4 MB">
+  <!ENTITY exim-time "0.2 SBU">
 ]>
 
 <sect1 id="exim" xreflabel="Exim-&exim-version;">
@@ -102,10 +102,10 @@
     <para>Install <application>Exim</application> with the following
     commands:</para>
 
-<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' src/EDITME | \
-  sed -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' | \
-  sed -e 's,^EXIM_USER.*$,EXIM_USER=exim,' | \
-  sed -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' > Local/Makefile &&
+<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' \
+    -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
+    -e 's,^EXIM_USER.*$,EXIM_USER=exim,' \
+    -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &&
 make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

Deleted: trunk/patches/exim-4.43-db43-1.patch
===================================================================
--- trunk/patches/exim-4.43-db43-1.patch	2005-07-29 22:03:32 UTC (rev 4835)
+++ trunk/patches/exim-4.43-db43-1.patch	2005-07-30 01:27:39 UTC (rev 4836)
@@ -1,54 +0,0 @@
-Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
-Date:                    2005-01-10
-Initial Package Version: 4.43
-Upstream Status:         Not submitted.
-Origin:                  http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
-Description:             Adds support for Berkeley DB-4.3.x.
-
-$LastChangedBy$
-$Date$
-
---- exim-4.43/src/exim_dbmbuild.c.orig	2005-01-10 15:16:40.841577000 +0000
-+++ exim-4.43/src/exim_dbmbuild.c	2005-01-10 15:16:56.367216744 +0000
-@@ -60,7 +60,7 @@
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
- void
--dbfn_bdb_error_callback(const char *pfx, char *msg)
-+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
- {
- pfx = pfx;
- printf("Berkeley DB error: %s\n", msg);
---- exim-4.43/src/exim_dbutil.c.orig	2005-01-10 15:16:49.594246392 +0000
-+++ exim-4.43/src/exim_dbutil.c	2005-01-10 15:16:56.368216592 +0000
-@@ -79,7 +79,7 @@
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
- void
--dbfn_bdb_error_callback(const char *pfx, char *msg)
-+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
- {
- pfx = pfx;
- printf("Berkeley DB error: %s\n", msg);
---- exim-4.43/src/dbfn.c.orig	2005-01-10 15:17:10.322095280 +0000
-+++ exim-4.43/src/dbfn.c	2005-01-10 15:17:14.602444568 +0000
-@@ -42,7 +42,7 @@
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
- void
--dbfn_bdb_error_callback(const char *pfx, char *msg)
-+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
- {
- pfx = pfx;
- log_write(0, LOG_MAIN, "Berkeley DB error: %s", msg);
---- exim-4.43/src/dbfunctions.h.orig	2005-01-10 15:17:21.159447752 +0000
-+++ exim-4.43/src/dbfunctions.h	2005-01-10 15:17:25.472792024 +0000
-@@ -22,7 +22,7 @@
- /* Berkeley DB uses a callback function to pass back error details. */
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
--void     dbfn_bdb_error_callback(const char *, char *);
-+void     dbfn_bdb_error_callback(const DB_ENV *, const char *, const char *);
- #endif
- 
- /* End of dbfunctions.h */

Added: trunk/patches/exim-4.52-db43-1.patch
===================================================================
--- trunk/patches/exim-4.52-db43-1.patch	2005-07-29 22:03:32 UTC (rev 4835)
+++ trunk/patches/exim-4.52-db43-1.patch	2005-07-30 01:27:39 UTC (rev 4836)
@@ -0,0 +1,60 @@
+Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
+Date:                    2005-01-10
+Initial Package Version: 4.43
+Upstream Status:         Not submitted.
+Origin:                  http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
+Description:             Adds support for Berkeley DB-4.3.x.
+Updated By:              Bruce Dubbs <bdubbs at linuxfromscratch.org>
+Current Package Version: 4.52
+
+$LastChangedBy$
+$Date$
+
+diff -Naur exim-4.52-orig/src/dbfn.c exim-4.52/src/dbfn.c
+--- exim-4.52-orig/src/dbfn.c	2005-07-01 06:09:15.000000000 -0500
++++ exim-4.52/src/dbfn.c	2005-07-29 18:36:25.000000000 -0500
+@@ -50,7 +50,7 @@
+ {
+ dbenv = dbenv;
+ #else
+-dbfn_bdb_error_callback(const char *pfx, char *msg)
++dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+ {
+ #endif
+ pfx = pfx;
+diff -Naur exim-4.52-orig/src/dbfunctions.h exim-4.52/src/dbfunctions.h
+--- exim-4.52-orig/src/dbfunctions.h	2005-07-01 06:09:15.000000000 -0500
++++ exim-4.52/src/dbfunctions.h	2005-07-29 18:36:25.000000000 -0500
+@@ -28,7 +28,7 @@
+ #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 *);
++void     dbfn_bdb_error_callback(const DB_ENV *, const char *, const char *);
+ #endif
+ #endif
+ 
+diff -Naur exim-4.52-orig/src/exim_dbmbuild.c exim-4.52/src/exim_dbmbuild.c
+--- exim-4.52-orig/src/exim_dbmbuild.c	2005-07-01 06:09:15.000000000 -0500
++++ exim-4.52/src/exim_dbmbuild.c	2005-07-29 18:36:25.000000000 -0500
+@@ -67,7 +67,7 @@
+ {
+ dbenv = dbenv;
+ #else
+-dbfn_bdb_error_callback(const char *pfx, char *msg)
++dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+ {
+ #endif
+ pfx = pfx;
+diff -Naur exim-4.52-orig/src/exim_dbutil.c exim-4.52/src/exim_dbutil.c
+--- exim-4.52-orig/src/exim_dbutil.c	2005-07-01 06:09:15.000000000 -0500
++++ exim-4.52/src/exim_dbutil.c	2005-07-29 18:36:25.000000000 -0500
+@@ -87,7 +87,7 @@
+ {
+ dbenv = dbenv;
+ #else
+-dbfn_bdb_error_callback(const char *pfx, char *msg)
++dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+ {
+ #endif
+ pfx = pfx;


Property changes on: trunk/patches/exim-4.52-db43-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate Author




More information about the blfs-book mailing list