From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 6/6] postfix: Fix build with db6 Date: Wed, 15 Jul 2015 15:41:01 +0200 Message-ID: <1436967661-17353-7-git-send-email-michael.tremer@ipfire.org> In-Reply-To: <1436967661-17353-1-git-send-email-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7885498351354059596==" List-Id: --===============7885498351354059596== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- 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=3D"" OPT=3D"$(CFLAGS) -fno-strict-aliasing" CCARGS=3D"$(CCARGS)" AUX= LIBS=3D"$(AUXLIBS)" cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/postfix-2.10-db6.patch b/src/patches/postfix-2.10-db= 6.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 +00= 00 ++++ 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 =3D=3D DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) !=3D 0) + msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); +-#if DB_VERSION_MAJOR =3D=3D 5 || (DB_VERSION_MAJOR =3D=3D 4 && DB_VERSION_M= INOR > 0) ++#if DB_VERSION_MAJOR =3D=3D 6 || DB_VERSION_MAJOR =3D=3D 5 || (DB_VERSION_M= AJOR =3D=3D 4 && DB_VERSION_MINOR > 0) + if ((errno =3D db->open(db, 0, db_path, 0, type, db_flags, 0644)) !=3D = 0) + FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags, + "open database %s: %m", db_path)); --=20 2.4.3 --===============7885498351354059596==--