!51 update postfix to 3.8.4

From: @eaglegai Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
update postfix to 3.8.4
2024-01-02 07:33:00 +00:00 · 2024-01-02 07:13:26 +00:00 · 2023-08-28 07:02:56 +00:00 · 2023-08-28 14:08:23 +08:00 · 2023-07-26 02:00:42 +00:00 · 2023-07-25 16:46:58 +08:00
6 changed files with 59 additions and 31 deletions
--- a/backport-postfix-3.6.2-whitespace-name-fix.patch
+++ b/backport-postfix-3.6.2-whitespace-name-fix.patch
@ -1,13 +0,0 @@
-diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c
-index 391c711..be5ce42 100644
--- a/src/cleanup/cleanup_message.c
-+++ b/src/cleanup/cleanup_message.c
-@@ -773,6 +773,8 @@ static void cleanup_header_done_callback(void *context)
- 		    /* Normalize whitespace. */
- 		    token = tok822_scan_limit(state->fullname, &dummy_token,
- 					      var_token_limit);
-+		    if (!token)
-+				token = tok822_alloc(TOK822_QSTRING, state->fullname);
- 		} else {
- 		    token = tok822_alloc(TOK822_QSTRING, state->fullname);
- 		}
--- a/postfix-3.7.2.tar.gz
+++ b/postfix-3.7.2.tar.gz
--- a/postfix-3.8.4.tar.gz
+++ b/postfix-3.8.4.tar.gz
--- a/postfix-etc-init.d-postfix
+++ b/postfix-etc-init.d-postfix
@ -51,15 +51,20 @@ conf_check() {
 }

 make_aliasesdb() {
-	if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
+	local MAP=""
+	local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
+	[ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
+	[ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
+
+	if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
 	then
-		# /etc/aliases.db may be used by other MTA, make sure nothing
+		# /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
 		# has touched it since our last newaliases call
-		[ /etc/aliases -nt /etc/aliases.db ] ||
-			[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
-			[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
+		[ /etc/aliases -nt /etc/aliases.$MAP ] ||
+			[ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
+			[ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return
 		/usr/bin/newaliases
-		touch -r /etc/aliases.db "$ALIASESDB_STAMP"
+		touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
 	else
 		/usr/bin/newaliases
 	fi
--- a/postfix.aliasesdb
+++ b/postfix.aliasesdb
@ -3,15 +3,20 @@
 ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp

 make_aliasesdb() {
-        if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
+        local MAP=""
+        local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
+        [ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
+        [ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
+
+        if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
        then
-                # /etc/aliases.db may be used by other MTA, make sure nothing
+                # /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
                # has touched it since our last newaliases call
-                [ /etc/aliases -nt /etc/aliases.db ] ||
-                        [ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
-                        [ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return 0
+                [ /etc/aliases -nt /etc/aliases.$MAP ] ||
+                        [ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
+                        [ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return 0
                /usr/bin/newaliases
-                touch -r /etc/aliases.db "$ALIASESDB_STAMP"
+                touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
        else
                /usr/bin/newaliases
        fi
--- a/postfix.spec
+++ b/postfix.spec
@ -22,12 +22,12 @@

 Name:           postfix
 Summary:        Postfix Mail Transport Agent
-Version:        3.7.2
-Release:        4
+Version:        3.8.4
+Release:        1
 Epoch:          2
 URL:            http://www.postfix.org
 License:        (IPL-1.0 and GPLv2+) or (EPL-2.0 and GPLv2+)
-Source0:        ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
+Source0:        http://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
 Source1:        postfix-etc-init.d-postfix
 Source2:        postfix.service
 Source3:        postfix.aliasesdb
@ -44,7 +44,6 @@ Patch5:         pflogsumm-1.1.5-datecalc.patch
 Patch6:         pflogsumm-1.1.5-ipv6-warnings-fix.patch 
 Patch11:        postfix-use-lmdb-by-default-instead-of-libdb.patch
 Patch12:        postfix-set-default_data_type-to-lmdb.patch
-Patch13:        backport-postfix-3.6.2-whitespace-name-fix.patch

 BuildRequires:  lmdb-devel perl-generators pkgconfig zlib-devel systemd-units libicu-devel libnsl2-devel gcc m4 openldap-devel
 BuildRequires:  cyrus-sasl-devel pcre2-devel mariadb-connector-c-devel postgresql-devel sqlite-devel openssl-devel procps-ng
@ -53,7 +52,7 @@ Requires(post): systemd-sysv %{_sbindir}/alternatives %{_bindir}/openssl
 Requires(pre):  %{_sbindir}/groupadd %{_sbindir}/useradd
 Requires(preun): %{_sbindir}/alternatives
 %{?systemd_requires}
-Requires: diffutils findutils
+Requires: diffutils findutils %{name}-help

 Provides:       MTA smtpd smtpdaemon server(smtp)
 Provides:       %{name}-mysql %{name}-sqlite %{name}-ldap %{name}-pcre
@ -107,7 +106,6 @@ PostgreSQL maps with Postfix, you need this.

 %patch11 -p1
 %patch12 -p1
-%patch13 -p1

 sed -i \
 's|^\(\s*#define\s\+DEF_SHLIB_DIR\s\+\)"/usr/lib/postfix"|\1"%{_libdir}/postfix"|' \
@ -121,6 +119,9 @@ pushd pflogsumm-1.1.5
 %patch6 -p1 -b .ipv6-warnings-fix
 popd

+sed -i makedefs -e '\@Linux\.@s|345|3456|'
+sed -i src/util/sys_defs.h -e 's@defined(LINUX5)@defined(LINUX5) || defined(LINUX6)@'
+
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
        iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
                touch -r ${f}{,_} && mv -f ${f}{_,}
@ -555,6 +556,36 @@ fi
 %{postfix_doc_dir}/README_FILES/*

 %changelog
+* Tue Jan 02 2024 gaihuiying <eaglegai@163.com> - 2:3.8.4-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:update postfix to 3.8.4
+
+* Mon Aug 28 2023 gaihuiying <eaglegai@163.com> - 2:3.8.1-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:strip for smtp qmgr
+
+* Tue Jul 25 2023 gaihuiying <eaglegai@163.com> - 2:3.8.1-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:update postfix to 3.8.1
+
+* Tue Jun 13 2023 zhouyihang <zhouyihang3@h-partners.com> - 2:3.7.4-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add require of help to fix empty symlink
+
+* Sat Mar 11 2023 xinghe <xinghe2@h-partners.com> - 2:3.7.4-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:update postfix to 3.7.4
+
 * Fri Mar 10 2023 gaihuiying <eaglegai@163.com> - 2:3.7.2-4
 - Type:bugfix
 - ID:NA
Author	SHA1	Message	Date
openeuler-ci-bot	383a2e69e4	!51 update postfix to 3.8.4 From: @eaglegai Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng	2024-01-02 07:33:00 +00:00
eaglegai	11f2b616c2	update postfix to 3.8.4	2024-01-02 07:13:26 +00:00
openeuler-ci-bot	9120237c41	!49 strip for smtp qmgr From: @eaglegai Reviewed-by: @robertxw Signed-off-by: @robertxw	2023-08-28 07:02:56 +00:00
eaglegai	85b19be8f1	strip for smtp qmgr	2023-08-28 14:08:23 +08:00
openeuler-ci-bot	98a046ac0e	!48 update postfix to 3.8.1 From: @eaglegai Reviewed-by: @robertxw Signed-off-by: @robertxw	2023-07-26 02:00:42 +00:00
eaglegai	6337ad8a20	update postfix to 3.8.1	2023-07-25 16:46:58 +08:00
openeuler-ci-bot	ebae80baae	!42 add require of help to fix empty symlink From: @sherlock2010 Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng	2023-06-14 02:17:03 +00:00
sherlock2010	f9b0b41dc2	add require of help to fix empty symlink	2023-06-13 08:35:32 +00:00
openeuler-ci-bot	c150fe0bd2	!40 update postfix to 3.7.4 From: @xinghe_1 Reviewed-by: @seuzw Signed-off-by: @seuzw	2023-03-11 11:46:36 +00:00
xinghe	5578c48ef3	update postfix to 3.7.4	2023-03-11 08:08:08 +00:00