From 503ddef921aab340b2a5f19faef8aee64420f081 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Sat, 5 Feb 2022 00:00:00 -0500 Subject: [PATCH] postfix-3.3.22 --- postfix/HISTORY | 10 ++++++++++ postfix/src/global/mail_version.h | 4 ++-- postfix/src/util/dict_db.c | 2 +- postfix/src/util/sys_defs.h | 3 +++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index c32945149..7d580e78e 100644 --- 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 6770724bf..86bc02921 100644 --- 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 112211de4..581eca4e5 100644 --- 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 6a5da4fe5..5728305bc 100644 --- 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 -- 2.47.3