rpms/exim/devel exim-4.67-open-macro.patch, NONE, 1.1 exim.spec, 1.41, 1.42

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26636

Modified Files:
	exim.spec 
Added Files:
	exim-4.67-open-macro.patch 
Log Message:
handle open checking

exim-4.67-open-macro.patch:

--- NEW FILE exim-4.67-open-macro.patch ---
--- exim-4.67/src/dbstuff.h~	2007-04-17 14:06:39.000000000 +0100
+++ exim-4.67/src/dbstuff.h	2007-08-22 18:10:52.000000000 +0100
@@ -135,7 +135,7 @@ API changed for DB 4.1. */
 #define EXIM_DBOPEN(name, flags, mode, dbpp) \
        if (db_create(dbpp, NULL, 0) != 0 || \
          ((*dbpp)->set_errcall(*dbpp, dbfn_bdb_error_callback), \
-         (*dbpp)->open(*dbpp, NULL, CS name, NULL, \
+	  ((*dbpp)->open)(*dbpp, NULL, CS name, NULL,		\
          ((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
          ((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
          mode)) != 0) *(dbpp) = NULL
@@ -143,7 +143,7 @@ API changed for DB 4.1. */
 #define EXIM_DBOPEN(name, flags, mode, dbpp) \
        if (db_create(dbpp, NULL, 0) != 0 || \
          ((*dbpp)->set_errcall(*dbpp, dbfn_bdb_error_callback), \
-         (*dbpp)->open(*dbpp, CS name, NULL, \
+	  ((*dbpp)->open)(*dbpp, CS name, NULL,			\
          ((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
          ((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
          mode)) != 0) *(dbpp) = NULL


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- exim.spec	22 Aug 2007 14:38:03 -0000	1.41
+++ exim.spec	22 Aug 2007 17:24:06 -0000	1.42
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.67
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -51,6 +51,7 @@
 Patch21: exim-4.63-localhost-is-local.patch
 Patch22: exim-4.66-greylist-conf.patch
 Patch23: exim-4.67-smarthost-config.patch
+Patch24: exim-4.67-open-macro.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -162,6 +163,7 @@
 %patch21 -p1 -b .localhost
 %patch22 -p1 -b .grey
 %patch23 -p1 -b .smarthost
+%patch24 -p1 -b .open
 
 %build
 %ifnarch s390 s390x
@@ -447,6 +449,9 @@
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> 4.67-5
+- Handle open() being a macro
+
 * Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> 4.67-4
 - Update licence