postfix-3.3.22

diff --git a/postfix/HISTORY b/postfix/HISTORY
index c32945149f2d9e566e2d773d99b2d75da0ec1974..7d580e78e7ef7d2073ba117c3a89ba4b3d6bb021 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23874,3 +23874,13 @@ Apologies for any names omitted.
        alignment padding byte, or over an adjacent character byte
        that was never read. Reported by Robert Siemer. Files:
        *qmgr/qmgr_feedback.c.
+
+20220120
+
+       Bitrot: Glibc 2.34 implements closefrom(). File:
+       util/sys_defs.h.
+
+20220202
+
+       Bitrot: Berkeley DB 18 is like Berkeley DB 6. Yasuhiro
+       Kimura. File: util/dict_db.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6770724bf8326db0685c48b7dc9c4a76fd468725..86bc02921905a3c9c87639d51b457d5196825461 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20220114"
-#define MAIL_VERSION_NUMBER    "3.3.21"
+#define MAIL_RELEASE_DATE      "20220205"
+#define MAIL_VERSION_NUMBER    "3.3.22"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE      "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/util/dict_db.c b/postfix/src/util/dict_db.c
index 112211de40f6696b40e706450ed0987bf23fa9a1..581eca4e50343be2133814e2494af5840f6d26c4 100644 (file)
--- a/postfix/src/util/dict_db.c
+++ b/postfix/src/util/dict_db.c
@@ -743,7 +743,7 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags,
     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);
     db_base_buf = vstring_alloc(100);
-#if DB_VERSION_MAJOR == 6 || DB_VERSION_MAJOR == 5 || \
+#if DB_VERSION_MAJOR == 18 || DB_VERSION_MAJOR == 6 || DB_VERSION_MAJOR == 5 || \
        (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
     if ((errno = db->open(db, 0, sane_basename(db_base_buf, db_path),
                          0, type, db_flags, 0644)) != 0)

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 6a5da4fe524f36ef637a977a32e424b92ef74464..5728305bc22dc3a110370e61da7709ef45ff2d4e 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -826,6 +826,9 @@ extern int initgroups(const char *, int);
 #define HAVE_POSIX_GETPW_R
 #endif
 #endif
+#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34)
+#define HAS_CLOSEFROM
+#endif
 
 #endif