From 1582fdf34ed2413b5155cc66376be396d09f90db Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Fri, 16 May 2014 00:00:00 -0500
Subject: [PATCH] postfix-2.12-20140516

---
 postfix/HISTORY                   | 11 ++++++++++-
 postfix/src/global/mail_version.h |  2 +-
 postfix/src/pipe/pipe.c           |  1 +
 postfix/src/util/dict_db.c        |  5 +++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 41b21d70f..f9b9ef621 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -19716,8 +19716,17 @@ Apologies for any names omitted.
 	poorly reflected their purpose. "DEAD" is replaced with
 	"FORBIDDEN" (no I/O allowed) and "BAD" is replaced with
 	"THROTTLED" (anything that causes the queue manager to back
-	off from some destination). Files: smtp.h, smtp_coonnect.c,
+	off from some destination). Files: smtp.h, smtp_connect.c,
 	smtp_proto.c, smtp_trouble.c.
 
 	Cleanup: enable SMTP connection cache lookup by destination
 	while a surge of mail is drying up. File: smtp_connect.c.
+
+20140512
+
+	Portability: Berkeley DB6 support. File: util/dict_db.c.
+
+20140515
+
+	Bugfix (introduced: 20140320): missing initialization.
+	Viktor Dukhovni. File pipe/pipe.c.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 73c31170a..1531aca66 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20140508"
+#define MAIL_RELEASE_DATE	"20140516"
 #define MAIL_VERSION_NUMBER	"2.12"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/pipe/pipe.c b/postfix/src/pipe/pipe.c
index d63aca845..954fecfaf 100644
--- a/postfix/src/pipe/pipe.c
+++ b/postfix/src/pipe/pipe.c
@@ -1341,6 +1341,7 @@ int     main(int argc, char **argv)
 
     single_server_main(argc, argv, pipe_service,
 		       MAIL_SERVER_TIME_TABLE, time_table,
+		       MAIL_SERVER_STR_TABLE, str_table,
 		       MAIL_SERVER_PRE_INIT, pre_init,
 		       MAIL_SERVER_POST_INIT, drop_privileges,
 		       MAIL_SERVER_PRE_ACCEPT, pre_accept,
diff --git a/postfix/src/util/dict_db.c b/postfix/src/util/dict_db.c
index 93ee48098..4a09939a5 100644
--- a/postfix/src/util/dict_db.c
+++ b/postfix/src/util/dict_db.c
@@ -89,7 +89,7 @@
 #define DONT_CLOBBER			DB_NOOVERWRITE
 #endif
 
-#if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6)
+#if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR <= 6)
 #define DICT_DB_CURSOR(db, curs)	(db)->cursor((db), NULL, (curs))
 #else
 #define DICT_DB_CURSOR(db, curs)	(db)->cursor((db), NULL, (curs), 0)
@@ -693,7 +693,8 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags,
 	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));