postfix-3.4.25

diff --git a/postfix/HISTORY b/postfix/HISTORY
index ba01af7db2ec48dfa6f71df38c042086341d92b7..8a684a2614137d61d9a7f2fbfaa703d7f36e2f2b 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24753,3 +24753,13 @@ Apologies for any names omitted.
        proxy_read_maps default value, based on output from the
        mantools/missing-proxy-read-maps script.  File:
        global/mail_params.h.
+
+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 1d907f0c8f6e52d1e27d8f12e93f1d3d85175b2d..7855a343123d9e0cde86c27148738fdcacdbb174 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.4.24"
+#define MAIL_RELEASE_DATE      "20220205"
+#define MAIL_VERSION_NUMBER    "3.4.25"
 
 #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 706d397a0f215b13bc24a06392fca8fa7c3ec378..c8bd5eb37a8029b965698d00fe1b2cc9a9dce24d 100644 (file)
--- a/postfix/src/util/dict_db.c
+++ b/postfix/src/util/dict_db.c
@@ -753,7 +753,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 39daa16d04eb93f54590902a1eb28eab868b5e1e..5de585504c3d7a62263236397925f58a2779714e 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -827,6 +827,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