From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 6/6] postfix: Fix build with db6
Date: Wed, 15 Jul 2015 15:41:01 +0200 [thread overview]
Message-ID: <1436967661-17353-7-git-send-email-michael.tremer@ipfire.org> (raw)
In-Reply-To: <1436967661-17353-1-git-send-email-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/postfix | 1 +
src/patches/postfix-2.10-db6.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 src/patches/postfix-2.10-db6.patch
diff --git a/lfs/postfix b/lfs/postfix
index fd332537a78c..3a10737806eb 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -102,6 +102,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/postfix-2.10-db6.patch
cd $(DIR_APP) && make -f Makefile.init makefiles \
DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/postfix-2.10-db6.patch b/src/patches/postfix-2.10-db6.patch
new file mode 100644
index 000000000000..2fb02b504817
--- /dev/null
+++ b/src/patches/postfix-2.10-db6.patch
@@ -0,0 +1,11 @@
+--- postfix-2.10.0/src/util/dict_db.c.orig 2015-07-09 09:56:06.888538301 +0000
++++ postfix-2.10.0/src/util/dict_db.c 2015-07-09 09:56:45.464802230 +0000
+@@ -693,7 +693,7 @@
+ msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
+ if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+ msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+-#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
++#if DB_VERSION_MAJOR == 6 || DB_VERSION_MAJOR == 5 || (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));
--
2.4.3
prev parent reply other threads:[~2015-07-15 13:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 13:40 [PATCH 0/6] Update for Berkeley DB Michael Tremer
2015-07-15 13:40 ` [PATCH 1/6] berkeley: Update berkeley database to version 6.1.26 Michael Tremer
2015-07-15 13:40 ` [PATCH 2/6] BerkeleyDB: Update berkely DB perl module to 0.55 Michael Tremer
2015-07-15 13:40 ` [PATCH 3/6] php: Fix build with db6 Michael Tremer
2015-07-15 13:40 ` [PATCH 4/6] squidguard: " Michael Tremer
2015-07-15 13:41 ` [PATCH 5/6] openldap: Update to 2.4.40 Michael Tremer
2015-07-15 13:41 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436967661-17353-7-git-send-email-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox