diff --git a/postfix-3.8.1.tar.gz b/postfix-3.8.4.tar.gz similarity index 40% rename from postfix-3.8.1.tar.gz rename to postfix-3.8.4.tar.gz index ceb39df9e5d0377b249316b3ef50b50890a94e28..c7898cdd99bd7bf6f72f82de6546a201bafd0e62 100644 Binary files a/postfix-3.8.1.tar.gz and b/postfix-3.8.4.tar.gz differ diff --git a/postfix-etc-init.d-postfix b/postfix-etc-init.d-postfix index c609b0ad00082904f25d11ad9f23507c42763aeb..52bd7bdefe99c67a07d9045a8d4f383a99789de3 100644 --- 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 diff --git a/postfix.aliasesdb b/postfix.aliasesdb index 8c0156edc6845d2a3967aed358803910f7dc819d..863b40527c3ca2c058718090d0b8c51115bafc89 100644 --- 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 diff --git a/postfix.spec b/postfix.spec index 7d22753d9a647d2d0b25aaf8c8b5ab39696146c8..035b7f2f47229657f3eb758371ca48f8e3dd1a34 100644 --- a/postfix.spec +++ b/postfix.spec @@ -22,8 +22,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.1 -Release: 2 +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+) @@ -312,9 +312,6 @@ chrpath -d %{buildroot}%{_sbindir}/postconf chrpath -d %{buildroot}%{_sbindir}/postsuper chrpath -d %{buildroot}%{_sbindir}/postmulti -strip -s %{buildroot}%{_libexecdir}/postfix/qmgr -strip -s %{buildroot}%{_libexecdir}/postfix/smtp - mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{_libdir}/postfix" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf @@ -559,6 +556,12 @@ fi %{postfix_doc_dir}/README_FILES/* %changelog +* Tue Jan 02 2024 gaihuiying - 2:3.8.4-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC:update postfix to 3.8.4 + * Mon Aug 28 2023 gaihuiying - 2:3.8.1-2 - Type:bugfix - ID:NA