handle open checking

This commit is contained in:
David Woodhouse 2007-08-22 17:24:06 +00:00
parent 19d3445e3d
commit f0ddfa51ef
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,20 @@
--- 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

View File

@ -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 @@ Patch20: exim-4.63-allow-filter.patch
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 @@ cp exim_monitor/EDITME Local/eximon.conf
%patch21 -p1 -b .localhost
%patch22 -p1 -b .grey
%patch23 -p1 -b .smarthost
%patch24 -p1 -b .open
%build
%ifnarch s390 s390x
@ -447,6 +449,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
* Wed Aug 22 2007 David Woodhouse <dwmw2@infradead.org> 4.67-5
- Handle open() being a macro
* Wed Aug 22 2007 David Woodhouse <dwmw2@infradead.org> 4.67-4
- Update licence