diff --git a/postfix-db6.diff b/postfix-db6.diff new file mode 100644 index 0000000..359a00d --- /dev/null +++ b/postfix-db6.diff @@ -0,0 +1,23 @@ +From: Jan Engelhardt +Date: 2013-06-14 03:32:16.417459759 +0200 +X-Upstream: problem still present in postfix-2.11~20130608 + +src: allow compilation against libdb-6.0 + +--- + src/util/dict_db.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: postfix-2.9.6/src/util/dict_db.c +=================================================================== +--- postfix-2.9.6.orig/src/util/dict_db.c ++++ postfix-2.9.6/src/util/dict_db.c +@@ -699,7 +699,7 @@ static DICT *dict_db_open(const char *cl + if ((errno = db->upgrade(db,db_path,0)) != 0) + msg_fatal("upgrade of database %s: %m",db_path); + } +-#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) + if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) + FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags, + "open database %s: %m", db_path)); diff --git a/postfix.changes b/postfix.changes index 4c04235..6c8e636 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 14 01:33:52 UTC 2013 - jengelh@inai.de + +- Add postfix-db6.diff to fix compile abort with libdb-6.0 + ------------------------------------------------------------------- Mon Apr 22 11:51:37 UTC 2013 - idonmez@suse.com diff --git a/postfix.spec b/postfix.spec index 09ee136..5341632 100644 --- a/postfix.spec +++ b/postfix.spec @@ -23,6 +23,7 @@ Group: Productivity/Networking/Email/Servers Version: 2.9.6 Release: 0 Url: http://www.postfix.org/ + Source: http://www.artfiles.org/postfix.org/postfix-release/official/postfix-%{version}.tar.gz Source1: http://www.artfiles.org/postfix.org/postfix-release/official/postfix-%{version}.tar.gz.sig Source2: %{name}-SuSE.tar.gz @@ -39,6 +40,7 @@ Patch11: %{name}-master.cf.patch Patch12: %{name}-post-install.patch Patch20: %{name}-ssl-release-buffers.patch Patch100: %{name}-vda-v11-2.9.5.patch +Patch101: postfix-db6.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -160,6 +162,7 @@ PostgreSQL. %patch12 %patch20 %patch100 +%patch -P 101 -p1 # --------------------------------------------------------------------------- %build