From 49c655dd598b8d7e3f7e85b28ef9808393ee7d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 16 Mar 2020 19:35:00 +0100 Subject: [PATCH 001/108] New version Resolves: rhbz#1813740 --- postfix-3.4.4-res-macros-fix.patch | 21 ------------------- ...config.patch => postfix-3.5.0-config.patch | 4 ++-- postfix.spec | 10 +++++---- 3 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 postfix-3.4.4-res-macros-fix.patch rename postfix-3.4.0-config.patch => postfix-3.5.0-config.patch (97%) diff --git a/postfix-3.4.4-res-macros-fix.patch b/postfix-3.4.4-res-macros-fix.patch deleted file mode 100644 index 1034c85..0000000 --- a/postfix-3.4.4-res-macros-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c -index 5f2cce5..df32345 100644 ---- a/src/dns/dns_str_resflags.c -+++ b/src/dns/dns_str_resflags.c -@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { - "RES_DEFNAMES", RES_DEFNAMES, - "RES_STAYOPEN", RES_STAYOPEN, - "RES_DNSRCH", RES_DNSRCH, -+#ifdef RES_INSECURE1 - "RES_INSECURE1", RES_INSECURE1, -+#endif -+#ifdef RES_INSECURE2 - "RES_INSECURE2", RES_INSECURE2, -+#endif - "RES_NOALIASES", RES_NOALIASES, -+#ifdef RES_USE_INET6 - "RES_USE_INET6", RES_USE_INET6, -+#endif - #ifdef RES_ROTATE - "RES_ROTATE", RES_ROTATE, - #endif diff --git a/postfix-3.4.0-config.patch b/postfix-3.5.0-config.patch similarity index 97% rename from postfix-3.4.0-config.patch rename to postfix-3.5.0-config.patch index eff0f57..da42263 100644 --- a/postfix-3.4.0-config.patch +++ b/postfix-3.5.0-config.patch @@ -130,8 +130,8 @@ index c0f2508..05c5d07 100644 # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe --# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} -+# user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user} +-# flags=DRX user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} ++# flags=DRX user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user} # # ==================================================================== # diff --git a/postfix.spec b/postfix.spec index 4097212..59b84ed 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,7 +47,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.4.10 +Version: 3.5.0 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -85,7 +85,7 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.4.0-config.patch +Patch1: postfix-3.5.0-config.patch Patch2: postfix-3.4.0-files.patch Patch3: postfix-3.3.3-alternatives.patch Patch4: postfix-3.4.0-large-fs.patch @@ -93,7 +93,6 @@ Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch -Patch12: postfix-3.4.4-res-macros-fix.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -229,7 +228,6 @@ pushd pflogsumm-%{pflogsumm_ver} popd %endif %patch11 -p1 -b .chroot-example-fix -%patch12 -p1 -b .res-macros-fix for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -757,6 +755,10 @@ fi %endif %changelog +* Mon Mar 16 2020 Jaroslav Škarvada - 2:3.5.0-1 +- New version + Resolves: rhbz#1813740 + * Thu Mar 12 2020 Jaroslav Škarvada - 2:3.4.10-1 - New version Resolves: rhbz#1812987 From 75d2d6cce77c64ced7a061e881c17fd63d67b679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 16 Mar 2020 19:40:45 +0100 Subject: [PATCH 002/108] Added new sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 74f9061..db17659 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.4.10.tar.gz) = b337fff8212bfec100d4f415ddb04a4539fad31c7cb555a37e778e7807d70a2a6879ac6d79af96a0593c23189cfaf65e5021fd4e8d39c641ccaabdd06cb7daad +SHA512 (postfix-3.5.0.tar.gz) = 7633687c8f9fb4f7204443dda66c1234b8ae121ae750916b23ea7cd16f2fd5944c0e4541c51cbdeb66f51437e3186433bbb9d2b1f538002a3c8aaeb6ddbfe154 From bdb8d0125ed671c0aa9c25987a304e43f85f079e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 20 Apr 2020 11:55:01 +0200 Subject: [PATCH 003/108] New version Resolves: rhbz#1825547 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 59b84ed..59e5823 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,7 +47,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.0 +Version: 3.5.1 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -755,6 +755,10 @@ fi %endif %changelog +* Mon Apr 20 2020 Jaroslav Škarvada - 2:3.5.1-1 +- New version + Resolves: rhbz#1825547 + * Mon Mar 16 2020 Jaroslav Škarvada - 2:3.5.0-1 - New version Resolves: rhbz#1813740 diff --git a/sources b/sources index db17659..d932b8f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.0.tar.gz) = 7633687c8f9fb4f7204443dda66c1234b8ae121ae750916b23ea7cd16f2fd5944c0e4541c51cbdeb66f51437e3186433bbb9d2b1f538002a3c8aaeb6ddbfe154 +SHA512 (postfix-3.5.1.tar.gz) = 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698 From 8c2eb69b8839feb904bd59f92239950061cfd3f5 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 15 May 2020 14:08:39 +0100 Subject: [PATCH 004/108] Rebuild for ICU 67 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 59e5823..821219a 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -755,6 +755,9 @@ fi %endif %changelog +* Fri May 15 2020 Pete Walter - 2:3.5.1-2 +- Rebuild for ICU 67 + * Mon Apr 20 2020 Jaroslav Škarvada - 2:3.5.1-1 - New version Resolves: rhbz#1825547 From c2f3ba12251b2e66abf9c69fd1daf26cc51a38aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 19 May 2020 13:13:13 +0200 Subject: [PATCH 005/108] New version Resolves: rhbz#1836653 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 821219a..5bbea81 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,8 +47,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.1 -Release: 2%{?dist} +Version: 3.5.2 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -755,6 +755,10 @@ fi %endif %changelog +* Tue May 19 2020 Jaroslav Škarvada - 2:3.5.2-1 +- New version + Resolves: rhbz#1836653 + * Fri May 15 2020 Pete Walter - 2:3.5.1-2 - Rebuild for ICU 67 diff --git a/sources b/sources index d932b8f..ca3210a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.1.tar.gz) = 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698 +SHA512 (postfix-3.5.2.tar.gz) = 04e37c4542952dba0f3e44f10775c0bedf343e6382df14a9c43ebc80c005c3f6de68a4e7a7469f32ae74b8e50d10c089d4930eac0cd2e2a9ff1bd8d7481b3a76 From 37b8c0b83ada2836fdfd7ff8719f1f2788788b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 15 Jun 2020 15:42:13 +0200 Subject: [PATCH 006/108] New version Resolves: rhbz#1846939 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 5bbea81..c0b0141 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,7 +47,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.2 +Version: 3.5.3 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -755,6 +755,10 @@ fi %endif %changelog +* Mon Jun 15 2020 Jaroslav Škarvada - 2:3.5.3-1 +- New version + Resolves: rhbz#1846939 + * Tue May 19 2020 Jaroslav Škarvada - 2:3.5.2-1 - New version Resolves: rhbz#1836653 diff --git a/sources b/sources index ca3210a..5699cc5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (postfix-3.5.3.tar.gz) = 1d020292f244e770353efb634909afdc9ac29b81707547fda1089631febbb8ecdac7c43f6b6ec9bdc4084da2be320bc433064d293811424873062d71d3545235 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.2.tar.gz) = 04e37c4542952dba0f3e44f10775c0bedf343e6382df14a9c43ebc80c005c3f6de68a4e7a7469f32ae74b8e50d10c089d4930eac0cd2e2a9ff1bd8d7481b3a76 From fd691b0be09d9d81877cd7d86beb26209f5982b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 29 Jun 2020 17:37:45 +0200 Subject: [PATCH 007/108] New version Resolves: rhbz#1851650 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index c0b0141..982e325 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,7 +47,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.3 +Version: 3.5.4 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -755,6 +755,10 @@ fi %endif %changelog +* Mon Jun 29 2020 Jaroslav Škarvada - 2:3.5.4-1 +- New version + Resolves: rhbz#1851650 + * Mon Jun 15 2020 Jaroslav Škarvada - 2:3.5.3-1 - New version Resolves: rhbz#1846939 diff --git a/sources b/sources index 5699cc5..9847ed7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.5.3.tar.gz) = 1d020292f244e770353efb634909afdc9ac29b81707547fda1089631febbb8ecdac7c43f6b6ec9bdc4084da2be320bc433064d293811424873062d71d3545235 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d +SHA512 (postfix-3.5.4.tar.gz) = 428c31bc9fea09f260333d6e3707f619424dd21f1f88c5935842b20b008f3a3a1555a962a7b98a0ae6b1c0367587f99064365403923ab1a8895023a10327a442 From 51e5039508338c4e5b93468b20ffe6582f2083ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 8 Jul 2020 10:35:43 +0200 Subject: [PATCH 008/108] Added support for LMDB maps --- postfix.spec | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/postfix.spec b/postfix.spec index 982e325..7a4e41e 100644 --- a/postfix.spec +++ b/postfix.spec @@ -6,6 +6,7 @@ %bcond_without sqlite %bcond_without cdb %bcond_without ldap +%bcond_without lmdb %bcond_without pcre %bcond_without sasl %bcond_without tls @@ -48,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -104,6 +105,7 @@ BuildRequires: systemd-units, libicu-devel, libnsl2-devel BuildRequires: gcc, m4, findutils %{?with_ldap:BuildRequires: openldap-devel} +%{?with_lmdb:BuildRequires: lmdb-devel} %{?with_sasl:BuildRequires: cyrus-sasl-devel} %{?with_pcre:BuildRequires: pcre-devel} %{?with_mysql:BuildRequires: mariadb-connector-c-devel} @@ -197,6 +199,16 @@ This provides support for LDAP maps in Postfix. If you plan to use LDAP maps with Postfix, you need this. %endif +%if %{with lmdb} +%package lmdb +Summary: Postfix LDMB map support +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description lmdb +This provides support for LMDB maps in Postfix. If you plan to use LMDB +maps with Postfix, you need this. +%endif + %if %{with pcre} %package pcre Summary: Postfix PCRE map support @@ -235,7 +247,7 @@ for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do done %build -unset AUXLIBS AUXLIBS_LDAP AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB +unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB CCARGS="-fPIC -fcommon" AUXLIBS="-lnsl" @@ -247,6 +259,10 @@ CCARGS="${CCARGS} -fsigned-char" CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 %{?with_sasl:-DUSE_LDAP_SASL}" AUXLIBS_LDAP="-lldap -llber" %endif +%if %{with lmdb} + CCARGS="${CCARGS} -DHAS_LMDB" + AUXLIBS_LMDB="-llmdb" +%endif %if %{with pcre} # -I option required for pcre 3.4 (and later?) CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre" @@ -297,9 +313,10 @@ LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}" # way how to get them in make -f Makefile.init makefiles shared=yes dynamicmaps=yes \ %{?_hardened_build:pie=yes} CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \ - AUXLIBS_LDAP="${AUXLIBS_LDAP}" AUXLIBS_PCRE="${AUXLIBS_PCRE}" \ - AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \ - AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" AUXLIBS_CDB="${AUXLIBS_CDB}"\ + AUXLIBS_LDAP="${AUXLIBS_LDAP}" AUXLIBS_LMDB="${AUXLIBS_LMDB}" \ + AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \ + AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" \ + AUXLIBS_CDB="${AUXLIBS_CDB}" \ DEBUG="" SHLIB_RPATH="-Wl,-rpath,%{postfix_shlib_dir} $LDFLAGS" \ OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment" \ POSTFIX_INSTALL_OPTS=-keep-build-mtime @@ -433,7 +450,7 @@ function split_file # split global dynamic maps configuration to individual sub-packages pushd $RPM_BUILD_ROOT%{postfix_config_dir} for map in %{?with_mysql:mysql} %{?with_pgsql:pgsql} %{?with_sqlite:sqlite} \ -%{?with_cdb:cdb} %{?with_ldap:ldap} %{?with_pcre:pcre}; do +%{?with_cdb:cdb} %{?with_ldap:ldap} %{?with_lmdb:lmdb} %{?with_pcre:pcre}; do rm -f dynamicmaps.cf.d/"$map" "postfix-files.d/$map" split_file "^\s*$map\b" "$map" dynamicmaps.cf sed -i "s|postfix-$map\\.so|%{postfix_shlib_dir}/\\0|" "dynamicmaps.cf.d/$map" @@ -585,6 +602,8 @@ fi %exclude %{postfix_doc_dir}/README_FILES/CDB_README %exclude %{_mandir}/man5/ldap_table.5* %exclude %{postfix_doc_dir}/README_FILES/LDAP_README +%exclude %{_mandir}/man5/lmdb_table.5* +%exclude %{postfix_doc_dir}/README_FILES/LMDB_README %exclude %{_mandir}/man5/pcre_table.5* %exclude %{postfix_doc_dir}/README_FILES/PCRE_README @@ -745,6 +764,15 @@ fi %attr(0644, root, root) %{postfix_doc_dir}/README_FILES/LDAP_README %endif +%if %{with lmdb} +%files lmdb +%attr(0644, root, root) %{postfix_config_dir}/dynamicmaps.cf.d/lmdb +%attr(0644, root, root) %{postfix_config_dir}/postfix-files.d/lmdb +%attr(0755, root, root) %{postfix_shlib_dir}/postfix-lmdb.so +%attr(0644, root, root) %{_mandir}/man5/lmdb_table.5* +%attr(0644, root, root) %{postfix_doc_dir}/README_FILES/LMDB_README +%endif + %if %{with pcre} %files pcre %attr(0644, root, root) %{postfix_config_dir}/dynamicmaps.cf.d/pcre @@ -755,6 +783,9 @@ fi %endif %changelog +* Wed Jul 8 2020 Jaroslav Škarvada - 2:3.5.4-2 +- Added support for LMDB maps + * Mon Jun 29 2020 Jaroslav Škarvada - 2:3.5.4-1 - New version Resolves: rhbz#1851650 From b36bf2b54eccc4d4d9d3b1849216c3c8a0b8007f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 03:04:47 +0000 Subject: [PATCH 009/108] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- postfix.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 7a4e41e..549e8a0 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -321,7 +321,7 @@ make -f Makefile.init makefiles shared=yes dynamicmaps=yes \ OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment" \ POSTFIX_INSTALL_OPTS=-keep-build-mtime -make %{?_smp_mflags} +%make_build %install rm -rf $RPM_BUILD_ROOT @@ -783,6 +783,10 @@ fi %endif %changelog +* Tue Jul 14 2020 Tom Stellard - 2:3.5.4-3 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jul 8 2020 Jaroslav Škarvada - 2:3.5.4-2 - Added support for LMDB maps From 92a1fc7a26712c3baf3feb7364b11a6d7d82de63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 Jul 2020 23:36:10 +0200 Subject: [PATCH 010/108] New version Resolves: rhbz#1860547 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 549e8a0..17808fd 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.4 -Release: 3%{?dist} +Version: 3.5.6 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -783,6 +783,10 @@ fi %endif %changelog +* Tue Jul 28 2020 Jaroslav Škarvada - 2:3.5.6-1 +- New version + Resolves: rhbz#1860547 + * Tue Jul 14 2020 Tom Stellard - 2:3.5.4-3 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro diff --git a/sources b/sources index 9847ed7..0a88eb0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.4.tar.gz) = 428c31bc9fea09f260333d6e3707f619424dd21f1f88c5935842b20b008f3a3a1555a962a7b98a0ae6b1c0367587f99064365403923ab1a8895023a10327a442 +SHA512 (postfix-3.5.6.tar.gz) = 9187981357a3861d735b8601c61851a5b9e53cde5668a0ebc62ca8b922a2629e53fe3369af6beb9df1a6fe6d4d87822d8882e27410a460ea8c98418b17287b9c From d93b1bf082e1207e0dfa3c092093010f6de4e356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 6 Aug 2020 22:27:03 +0200 Subject: [PATCH 011/108] Minor spec cleanup Added posttls-finger test tool Resolves: rhbz#1865701 --- postfix.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/postfix.spec b/postfix.spec index 17808fd..d2539a5 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -324,9 +324,6 @@ make -f Makefile.init makefiles shared=yes dynamicmaps=yes \ %make_build %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT - # install postfix into $RPM_BUILD_ROOT # Move stuff around so we don't conflict with sendmail @@ -354,12 +351,6 @@ make non-interactive-package \ sample_directory=%{postfix_sample_dir} \ readme_directory=%{postfix_readme_dir} || exit 1 -%if 0%{?fedora} < 23 -# This installs into the /etc/rc.d/init.d directory -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix -%endif - # Systemd mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} @@ -372,8 +363,8 @@ for i in active bounce corrupt defer deferred flush incoming private saved maild mkdir -p $RPM_BUILD_ROOT%{postfix_queue_dir}/$i done -# install performance benchmark tools by hand -for i in smtp-sink smtp-source ; do +# install performance benchmark and test tools by hand +for i in smtp-sink smtp-source posttls-finger ; do install -c -m 755 bin/$i $RPM_BUILD_ROOT%{postfix_command_dir}/ install -c -m 755 man/man1/$i.1 $RPM_BUILD_ROOT%{_mandir}/man1/ done @@ -644,6 +635,7 @@ fi %attr(0755, root, root) %{postfix_command_dir}/smtp-sink %attr(0755, root, root) %{postfix_command_dir}/smtp-source +%attr(0755, root, root) %{postfix_command_dir}/posttls-finger %attr(0755, root, root) %{postfix_command_dir}/postalias %attr(0755, root, root) %{postfix_command_dir}/postcat @@ -783,6 +775,11 @@ fi %endif %changelog +* Thu Aug 6 2020 Jaroslav Škarvada - 2:3.5.6-2 +- Minor spec cleanup +- Added posttls-finger test tool + Resolves: rhbz#1865701 + * Tue Jul 28 2020 Jaroslav Škarvada - 2:3.5.6-1 - New version Resolves: rhbz#1860547 From 5adef77d7a9ba463dbc7c9cedd3ff1c450a39691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 31 Aug 2020 11:22:06 +0200 Subject: [PATCH 012/108] New version Resolves: rhbz#1873857 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index d2539a5..fa6673c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.6 -Release: 2%{?dist} +Version: 3.5.7 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -775,6 +775,10 @@ fi %endif %changelog +* Mon Aug 31 2020 Jaroslav Škarvada - 2:3.5.7-1 +- New version + Resolves: rhbz#1873857 + * Thu Aug 6 2020 Jaroslav Škarvada - 2:3.5.6-2 - Minor spec cleanup - Added posttls-finger test tool diff --git a/sources b/sources index 0a88eb0..812589e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.6.tar.gz) = 9187981357a3861d735b8601c61851a5b9e53cde5668a0ebc62ca8b922a2629e53fe3369af6beb9df1a6fe6d4d87822d8882e27410a460ea8c98418b17287b9c +SHA512 (postfix-3.5.7.tar.gz) = 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2 From 238aa8d0168ba4d9597d4c31d31fd97cbdbcfbd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 9 Nov 2020 19:11:07 +0100 Subject: [PATCH 013/108] New version Resolves: rhbz#1895644 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index fa6673c..ef9fc56 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.7 +Version: 3.5.8 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -775,6 +775,10 @@ fi %endif %changelog +* Mon Nov 9 2020 Jaroslav Škarvada - 2:3.5.8-1 +- New version + Resolves: rhbz#1895644 + * Mon Aug 31 2020 Jaroslav Škarvada - 2:3.5.7-1 - New version Resolves: rhbz#1873857 diff --git a/sources b/sources index 812589e..a6fc69a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (postfix-3.5.8.tar.gz) = 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.7.tar.gz) = 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2 From 9c40e9dcad37f4211d14886e2bd5ba76396424b5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 19:25:45 +0000 Subject: [PATCH 014/108] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- postfix.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/postfix.spec b/postfix.spec index ef9fc56..433d174 100644 --- a/postfix.spec +++ b/postfix.spec @@ -100,6 +100,7 @@ Patch11: postfix-3.4.4-chroot-example-fix.patch # Determine the different packages required for building postfix +BuildRequires: make BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel BuildRequires: systemd-units, libicu-devel, libnsl2-devel BuildRequires: gcc, m4, findutils From c3fa20e8c9216aeb769c0841ce3b7b3a3372e02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Jan 2021 10:26:33 +0100 Subject: [PATCH 015/108] New version Resolves: rhbz#1917155 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 433d174..ffffe2e 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.8 +Version: 3.5.9 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -776,6 +776,10 @@ fi %endif %changelog +* Mon Jan 18 2021 Jaroslav Škarvada - 2:3.5.9-1 +- New version + Resolves: rhbz#1917155 + * Mon Nov 9 2020 Jaroslav Škarvada - 2:3.5.8-1 - New version Resolves: rhbz#1895644 diff --git a/sources b/sources index a6fc69a..a6521bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.5.8.tar.gz) = 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d +SHA512 (postfix-3.5.9.tar.gz) = 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd From 1d849190afa0309f36528587acf65cab002d101c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:27:11 +0000 Subject: [PATCH 016/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index ffffe2e..598a7d9 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.9 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -776,6 +776,9 @@ fi %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2:3.5.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 18 2021 Jaroslav Škarvada - 2:3.5.9-1 - New version Resolves: rhbz#1917155 From c6d5d28bcd41ff5b809842b7f4c47c2080f87a32 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Feb 2021 09:37:36 +0100 Subject: [PATCH 017/108] rebuild for libpq ABI fix Related: rhbz#1908268 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 598a7d9..794e4e2 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.9 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -776,6 +776,9 @@ fi %endif %changelog +* Mon Feb 08 2021 Pavel Raiskup - 2:3.5.9-3 +- rebuild for libpq ABI fix rhbz#1908268 + * Wed Jan 27 2021 Fedora Release Engineering - 2:3.5.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 329095cd6db9a6d7ae7351ffbce3288553a9117b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 19 Feb 2021 18:09:15 +0100 Subject: [PATCH 018/108] Fixed sysvinit conditionals for RHEL Resolves: rhbz#1930709 --- postfix.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/postfix.spec b/postfix.spec index 794e4e2..2cafe2b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -118,7 +118,7 @@ BuildRequires: gcc, m4, findutils %description Postfix is a Mail Transport Agent (MTA). -%if 0%{?fedora} < 23 +%if 0%{?fedora} < 23 && 0%{?rhel} < 9 %package sysvinit Summary: SysV initscript for postfix BuildArch: noarch @@ -535,7 +535,7 @@ exit 0 %postun %systemd_postun_with_restart %{name}.service -%if 0%{?fedora} < 23 +%if 0%{?fedora} < 23 && 0%{?rhel} < 9 %post sysvinit /sbin/chkconfig --add postfix >/dev/null 2>&1 ||: @@ -698,7 +698,7 @@ fi %ghost %attr(0644, root, root) %{_var}/lib/misc/postfix.aliasesdb-stamp -%if 0%{?fedora} < 23 +%if 0%{?fedora} < 23 && 0%{?rhel} < 9 %files sysvinit %{_initrddir}/postfix %endif @@ -776,6 +776,10 @@ fi %endif %changelog +* Fri Feb 19 2021 Jaroslav Škarvada - 2:3.5.9-4 +- Fixed sysvinit conditionals for RHEL + Resolves: rhbz#1930709 + * Mon Feb 08 2021 Pavel Raiskup - 2:3.5.9-3 - rebuild for libpq ABI fix rhbz#1908268 From 74ff57ed976f7bfcd92c3934c57f1042ecf1e33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:01 +0100 Subject: [PATCH 019/108] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- postfix.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 2cafe2b..0a2d5fd 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.9 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -776,6 +776,10 @@ fi %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2:3.5.9-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Fri Feb 19 2021 Jaroslav Škarvada - 2:3.5.9-4 - Fixed sysvinit conditionals for RHEL Resolves: rhbz#1930709 From a6739626ad64e24c760788209fa56bbb85853536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 Mar 2021 15:22:35 +0100 Subject: [PATCH 020/108] Disable NIS support for RHEL9+ (patch from fjanus@redhat.com) --- postfix.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 0a2d5fd..76eb654 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.9 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -104,6 +104,10 @@ BuildRequires: make BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel BuildRequires: systemd-units, libicu-devel, libnsl2-devel BuildRequires: gcc, m4, findutils +%if 0%{?rhel} >= 9 +%else +BuildRequires: libnsl2-devel +%endif %{?with_ldap:BuildRequires: openldap-devel} %{?with_lmdb:BuildRequires: lmdb-devel} @@ -250,7 +254,11 @@ done %build unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB CCARGS="-fPIC -fcommon" +%if 0%{?rhel} >= 9 +AUXLIBS="" +%else AUXLIBS="-lnsl" +%endif %ifarch s390 s390x ppc CCARGS="${CCARGS} -fsigned-char" @@ -305,7 +313,9 @@ CCARGS="${CCARGS} -fsigned-char" CCARGS="${CCARGS} -DDEF_CONFIG_DIR=\\\"%{postfix_config_dir}\\\"" CCARGS="${CCARGS} $(getconf LFS_CFLAGS)" - +%if 0%{?rhel} >= 9 + CCARGS="${CCARGS} -DNO_NIS" +%endif LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}" # SHLIB_RPATH is needed to find private libraries @@ -776,6 +786,9 @@ fi %endif %changelog +* Wed Mar 24 2021 Jaroslav Škarvada - 2:3.5.9-6 +- Disable NIS support for RHEL9+ (patch from fjanus@redhat.com) + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2:3.5.9-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 4040c359622bb33fb6db3ace63371dd1a2726c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 25 Mar 2021 20:55:44 +0100 Subject: [PATCH 021/108] Simplified macros related to NIS --- postfix.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 76eb654..d250e12 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.9 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -104,8 +104,7 @@ BuildRequires: make BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel BuildRequires: systemd-units, libicu-devel, libnsl2-devel BuildRequires: gcc, m4, findutils -%if 0%{?rhel} >= 9 -%else +%if 0%{?rhel} < 9 BuildRequires: libnsl2-devel %endif @@ -786,6 +785,9 @@ fi %endif %changelog +* Thu Mar 25 2021 Jaroslav Škarvada - 2:3.5.9-7 +- Simplified macros related to NIS + * Wed Mar 24 2021 Jaroslav Škarvada - 2:3.5.9-6 - Disable NIS support for RHEL9+ (patch from fjanus@redhat.com) From 39280a3c6a2beae6b1b66a1cec47af8800693e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Apr 2021 23:33:00 +0200 Subject: [PATCH 022/108] New version Resolves: rhbz#1948306 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index d250e12..a539b2d 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.9 -Release: 7%{?dist} +Version: 3.5.10 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -785,6 +785,10 @@ fi %endif %changelog +* Mon Apr 12 2021 Jaroslav Škarvada - 2:3.5.10-1 +- New version + Resolves: rhbz#1948306 + * Thu Mar 25 2021 Jaroslav Škarvada - 2:3.5.9-7 - Simplified macros related to NIS diff --git a/sources b/sources index a6521bf..494fca7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.9.tar.gz) = 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd +SHA512 (postfix-3.5.10.tar.gz) = 5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da From d5cec813056b074652d2e6e23466a55d823e97b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 22 Apr 2021 23:50:47 +0200 Subject: [PATCH 023/108] Fixed NIS build requirements --- postfix.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index a539b2d..ce51519 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.5.10 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -102,7 +102,7 @@ Patch11: postfix-3.4.4-chroot-example-fix.patch # Determine the different packages required for building postfix BuildRequires: make BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel -BuildRequires: systemd-units, libicu-devel, libnsl2-devel +BuildRequires: systemd-units, libicu-devel BuildRequires: gcc, m4, findutils %if 0%{?rhel} < 9 BuildRequires: libnsl2-devel @@ -785,6 +785,9 @@ fi %endif %changelog +* Thu Apr 22 2021 Jaroslav Škarvada - 2:3.5.10-2 +- Fixed NIS build requirements + * Mon Apr 12 2021 Jaroslav Škarvada - 2:3.5.10-1 - New version Resolves: rhbz#1948306 From ff85b7be3f104fda46b91bd6ba056353459fb57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 30 Apr 2021 18:19:42 +0200 Subject: [PATCH 024/108] New version Resolves: rhbz#1955369 --- .gitignore | 4 ++-- postfix.spec | 8 ++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1e95c2a..d1f0352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -pflogsumm-*.tar.gz -postfix-*.tar.gz +/pflogsumm-*.tar.gz +/postfix-*.tar.gz diff --git a/postfix.spec b/postfix.spec index ce51519..f0e7238 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.5.10 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -785,6 +785,10 @@ fi %endif %changelog +* Fri Apr 30 2021 Jaroslav Škarvada - 2:3.6.0-1 +- New version + Resolves: rhbz#1955369 + * Thu Apr 22 2021 Jaroslav Škarvada - 2:3.5.10-2 - Fixed NIS build requirements diff --git a/sources b/sources index 494fca7..cac4b4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (postfix-3.6.0.tar.gz) = af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.5.10.tar.gz) = 5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da From 630fb7cf597fc6bbf89ef42224fe4be666633b1e Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 19 May 2021 16:48:35 +0100 Subject: [PATCH 025/108] Rebuild for ICU 69 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index f0e7238..110b37b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -785,6 +785,9 @@ fi %endif %changelog +* Wed May 19 2021 Pete Walter - 2:3.6.0-2 +- Rebuild for ICU 69 + * Fri Apr 30 2021 Jaroslav Škarvada - 2:3.6.0-1 - New version Resolves: rhbz#1955369 From 38bf3a206c4410340aabe92c06ec42bea26e5567 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 May 2021 01:13:46 +0100 Subject: [PATCH 026/108] Rebuild for ICU 69 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 110b37b..26b283b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -785,6 +785,9 @@ fi %endif %changelog +* Thu May 20 2021 Pete Walter - 2:3.6.0-3 +- Rebuild for ICU 69 + * Wed May 19 2021 Pete Walter - 2:3.6.0-2 - Rebuild for ICU 69 From 9f3ce2a26575f82948a80af218280c2d17594a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 14 Jun 2021 09:40:54 +0200 Subject: [PATCH 027/108] New version Resolves: rhbz#1971363 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 26b283b..319a4aa 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.6.0 -Release: 3%{?dist} +Version: 3.6.1 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -785,6 +785,10 @@ fi %endif %changelog +* Mon Jun 14 2021 Jaroslav Škarvada - 2:3.6.1-1 +- New version + Resolves: rhbz#1971363 + * Thu May 20 2021 Pete Walter - 2:3.6.0-3 - Rebuild for ICU 69 diff --git a/sources b/sources index cac4b4f..042366b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.6.0.tar.gz) = af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf +SHA512 (postfix-3.6.1.tar.gz) = 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d From 10049534ce079e8150f0b162a39cb9b2b9d4c819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Jul 2021 20:47:50 +0200 Subject: [PATCH 028/108] Fixed build on rhel < 9 --- postfix.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 319a4aa..ce60887 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -361,6 +361,12 @@ make non-interactive-package \ sample_directory=%{postfix_sample_dir} \ readme_directory=%{postfix_readme_dir} || exit 1 +%if 0%{?fedora} < 23 && 0%{?rhel} < 9 +# This installs into the /etc/rc.d/init.d directory +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix +%endif + # Systemd mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} @@ -785,6 +791,9 @@ fi %endif %changelog +* Fri Jul 2 2021 Jaroslav Škarvada - 2:3.6.1-2 +- Fixed build on rhel < 9 + * Mon Jun 14 2021 Jaroslav Škarvada - 2:3.6.1-1 - New version Resolves: rhbz#1971363 From 9a503d16ae21b7468b220e5bfa86501575f838e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:54:55 +0000 Subject: [PATCH 029/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index ce60887..a979330 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -791,6 +791,9 @@ fi %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2:3.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jul 2 2021 Jaroslav Škarvada - 2:3.6.1-2 - Fixed build on rhel < 9 From 87cce946ef824b92d2f60b2bef9216a2c7f9f13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 29 Jul 2021 10:41:22 +0200 Subject: [PATCH 030/108] New version Resolves: rhbz#1985778 --- postfix-3.6.2-glibc-234-build-fix.patch | 43 +++++++++++++++++++++++++ postfix.spec | 12 +++++-- sources | 3 +- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 postfix-3.6.2-glibc-234-build-fix.patch diff --git a/postfix-3.6.2-glibc-234-build-fix.patch b/postfix-3.6.2-glibc-234-build-fix.patch new file mode 100644 index 0000000..71ea284 --- /dev/null +++ b/postfix-3.6.2-glibc-234-build-fix.patch @@ -0,0 +1,43 @@ +diff --git a/src/util/sys_compat.c b/src/util/sys_compat.c +index 8bf8e58..c87f043 100644 +--- a/src/util/sys_compat.c ++++ b/src/util/sys_compat.c +@@ -286,7 +286,7 @@ int dup2_pass_on_exec(int oldd, int newd) + + /* closefrom() - closes all file descriptors from the given one up */ + +-int closefrom(int lowfd) ++void closefrom(int lowfd) + { + int fd_limit = open_limit(0); + int fd; +@@ -298,14 +298,14 @@ int closefrom(int lowfd) + */ + if (lowfd < 0) { + errno = EBADF; +- return (-1); ++ return; + } + if (fd_limit > 500) + fd_limit = 500; + for (fd = lowfd; fd < fd_limit; fd++) + (void) close(fd); + +- return (0); ++ return; + } + + #endif +diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h +index 99bec9b..16e27db 100644 +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -1509,7 +1509,7 @@ extern int setsid(void); + #endif + + #ifndef HAS_CLOSEFROM +-extern int closefrom(int); ++extern void closefrom(int); + + #endif + diff --git a/postfix.spec b/postfix.spec index a979330..44d861a 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.6.1 -Release: 3%{?dist} +Version: 3.6.2 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -94,6 +94,9 @@ Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch +# bug report sent upstream, the fedora patch is a hack, +# please do not reuse ;) +Patch12: postfix-3.6.2-glibc-234-build-fix.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -244,6 +247,7 @@ pushd pflogsumm-%{pflogsumm_ver} popd %endif %patch11 -p1 -b .chroot-example-fix +%patch12 -p1 -b .glibc-234-build-fix for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -791,6 +795,10 @@ fi %endif %changelog +* Thu Jul 29 2021 Jaroslav Škarvada - 2:3.6.2-1 +- New version + Resolves: rhbz#1985778 + * Fri Jul 23 2021 Fedora Release Engineering - 2:3.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 042366b..789e795 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (postfix-3.6.1.tar.gz) = 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3 -SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d +SHA512 (postfix-3.6.2.tar.gz) = 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9 From ab27b28016c9f880ace8f4c7c1e2b7d2ecce22bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 29 Jul 2021 10:51:44 +0200 Subject: [PATCH 031/108] Added missing sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 789e795..c72d767 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d SHA512 (postfix-3.6.2.tar.gz) = 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9 From a7f2d43d3476fac87539fc51441bbc54d7fba0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Aug 2021 23:55:35 +0200 Subject: [PATCH 032/108] Fixed scriptlets to work with openssl-3.0 --- postfix.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/postfix.spec b/postfix.spec index 44d861a..25586d2 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -512,7 +512,7 @@ fi # Create self-signed SSL certificate if [ ! -f %{sslkey} ]; then umask 077 - %{_bindir}/openssl genrsa 4096 > %{sslkey} 2> /dev/null + %{_bindir}/openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:4096 -out %{sslkey} fi if [ ! -f %{sslcert} ]; then @@ -521,8 +521,10 @@ if [ ! -f %{sslcert} ]; then FQDN=localhost.localdomain fi - %{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} \ - -subj "/C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}" + req_cmd="%{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} \ + -subj /C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}" +# openssl-3.0 and fallback for backward compatibility with openssl < 3.0 + $req_cmd -noenc -copy_extension none 2>/dev/null || $req_cmd chmod 644 %{sslcert} fi @@ -795,6 +797,9 @@ fi %endif %changelog +* Mon Aug 2 2021 Jaroslav Škarvada - 2:3.6.2-2 +- Fixed scriptlets to work with openssl-3.0 + * Thu Jul 29 2021 Jaroslav Škarvada - 2:3.6.2-1 - New version Resolves: rhbz#1985778 From b2278b1ff416cea8cff3658a280c9aac4dd0c793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 3 Aug 2021 14:43:26 +0200 Subject: [PATCH 033/108] Fixed openssl req parameters --- postfix.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 25586d2..37cb6ab 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -524,7 +524,7 @@ if [ ! -f %{sslcert} ]; then req_cmd="%{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} \ -subj /C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}" # openssl-3.0 and fallback for backward compatibility with openssl < 3.0 - $req_cmd -noenc -copy_extension none 2>/dev/null || $req_cmd + $req_cmd -noenc -copy_extensions none 2>/dev/null || $req_cmd chmod 644 %{sslcert} fi @@ -797,6 +797,9 @@ fi %endif %changelog +* Tue Aug 3 2021 Jaroslav Škarvada - 2:3.6.2-3 +- Fixed openssl req parameters + * Mon Aug 2 2021 Jaroslav Škarvada - 2:3.6.2-2 - Fixed scriptlets to work with openssl-3.0 From d71adada04280b82d41710c167c1ee38c5118bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 5 Aug 2021 11:00:55 +0200 Subject: [PATCH 034/108] Updated patch fixing FTBFS with the glibc-2.34 --- postfix-3.6.2-glibc-234-build-fix.patch | 55 ++++++++----------------- postfix.spec | 8 ++-- 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/postfix-3.6.2-glibc-234-build-fix.patch b/postfix-3.6.2-glibc-234-build-fix.patch index 71ea284..c46b857 100644 --- a/postfix-3.6.2-glibc-234-build-fix.patch +++ b/postfix-3.6.2-glibc-234-build-fix.patch @@ -1,43 +1,22 @@ -diff --git a/src/util/sys_compat.c b/src/util/sys_compat.c -index 8bf8e58..c87f043 100644 ---- a/src/util/sys_compat.c -+++ b/src/util/sys_compat.c -@@ -286,7 +286,7 @@ int dup2_pass_on_exec(int oldd, int newd) - - /* closefrom() - closes all file descriptors from the given one up */ - --int closefrom(int lowfd) -+void closefrom(int lowfd) - { - int fd_limit = open_limit(0); - int fd; -@@ -298,14 +298,14 @@ int closefrom(int lowfd) - */ - if (lowfd < 0) { - errno = EBADF; -- return (-1); -+ return; - } - if (fd_limit > 500) - fd_limit = 500; - for (fd = lowfd; fd < fd_limit; fd++) - (void) close(fd); - -- return (0); -+ return; - } - - #endif diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index 99bec9b..16e27db 100644 +index 99bec9b..95c78ec 100644 --- a/src/util/sys_defs.h +++ b/src/util/sys_defs.h -@@ -1509,7 +1509,7 @@ extern int setsid(void); +@@ -1,6 +1,7 @@ + #ifndef _SYS_DEFS_H_INCLUDED_ + #define _SYS_DEFS_H_INCLUDED_ + ++ + /*++ + /* NAME + /* sys_defs 3h +@@ -802,6 +803,9 @@ extern int initgroups(const char *, int); + #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #endif - - #ifndef HAS_CLOSEFROM --extern int closefrom(int); -+extern void closefrom(int); - #endif - ++#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34) ++#define HAS_CLOSEFROM ++#endif + #include + #if !defined(KERNEL_VERSION) + #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1) diff --git a/postfix.spec b/postfix.spec index 37cb6ab..16f6882 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -94,8 +94,7 @@ Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch -# bug report sent upstream, the fedora patch is a hack, -# please do not reuse ;) +# upstream patch Patch12: postfix-3.6.2-glibc-234-build-fix.patch # Optional patches - set the appropriate environment variables to include @@ -797,6 +796,9 @@ fi %endif %changelog +* Thu Aug 5 2021 Jaroslav Škarvada - 2:3.6.2-4 +- Updated patch fixing FTBFS with the glibc-2.34 + * Tue Aug 3 2021 Jaroslav Škarvada - 2:3.6.2-3 - Fixed openssl req parameters From 2f9d42453e67ebc43f786d98262a249037f80a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 5 Aug 2021 11:24:52 +0200 Subject: [PATCH 035/108] Fixed cleanup crash when processing messages with whitespace only fullname Fixed whitespaces in the glibc-234-build-fix patch --- postfix-3.6.2-glibc-234-build-fix.patch | 8 -------- postfix-3.6.2-whitespace-name-fix.patch | 13 +++++++++++++ postfix.spec | 9 ++++++++- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 postfix-3.6.2-whitespace-name-fix.patch diff --git a/postfix-3.6.2-glibc-234-build-fix.patch b/postfix-3.6.2-glibc-234-build-fix.patch index c46b857..b678b78 100644 --- a/postfix-3.6.2-glibc-234-build-fix.patch +++ b/postfix-3.6.2-glibc-234-build-fix.patch @@ -2,14 +2,6 @@ diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h index 99bec9b..95c78ec 100644 --- a/src/util/sys_defs.h +++ b/src/util/sys_defs.h -@@ -1,6 +1,7 @@ - #ifndef _SYS_DEFS_H_INCLUDED_ - #define _SYS_DEFS_H_INCLUDED_ - -+ - /*++ - /* NAME - /* sys_defs 3h @@ -802,6 +803,9 @@ extern int initgroups(const char *, int); #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #endif diff --git a/postfix-3.6.2-whitespace-name-fix.patch b/postfix-3.6.2-whitespace-name-fix.patch new file mode 100644 index 0000000..c45035e --- /dev/null +++ b/postfix-3.6.2-whitespace-name-fix.patch @@ -0,0 +1,13 @@ +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); + } diff --git a/postfix.spec b/postfix.spec index 16f6882..8a0b730 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -96,6 +96,8 @@ Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch # upstream patch Patch12: postfix-3.6.2-glibc-234-build-fix.patch +# sent upstream +Patch13: postfix-3.6.2-whitespace-name-fix.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -247,6 +249,7 @@ popd %endif %patch11 -p1 -b .chroot-example-fix %patch12 -p1 -b .glibc-234-build-fix +%patch13 -p1 -b .whitespace-name-fix for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -796,6 +799,10 @@ fi %endif %changelog +* Thu Aug 5 2021 Jaroslav Škarvada - 2:3.6.2-5 +- Fixed cleanup crash when processing messages with whitespace only fullname +- Fixed whitespaces in the glibc-234-build-fix patch + * Thu Aug 5 2021 Jaroslav Škarvada - 2:3.6.2-4 - Updated patch fixing FTBFS with the glibc-2.34 From 90a233beeb2b1eaa39426621179168d11f8c5de5 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:11:55 +0200 Subject: [PATCH 036/108] Rebuilt with OpenSSL 3.0.0 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 8a0b730..1b7e323 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.2 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -799,6 +799,9 @@ fi %endif %changelog +* Tue Sep 14 2021 Sahana Prasad - 2:3.6.2-6 +- Rebuilt with OpenSSL 3.0.0 + * Thu Aug 5 2021 Jaroslav Škarvada - 2:3.6.2-5 - Fixed cleanup crash when processing messages with whitespace only fullname - Fixed whitespaces in the glibc-234-build-fix patch From df77e1efa9905700c734914c3d91d3eca2761e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 10 Nov 2021 18:10:04 +0100 Subject: [PATCH 037/108] New version Resolves: rhbz#2020984 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 1b7e323..5de6ed2 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.6.2 -Release: 6%{?dist} +Version: 3.6.3 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -799,6 +799,10 @@ fi %endif %changelog +* Wed Nov 10 2021 Jaroslav Škarvada - 2:3.6.3-1 +- New version + Resolves: rhbz#2020984 + * Tue Sep 14 2021 Sahana Prasad - 2:3.6.2-6 - Rebuilt with OpenSSL 3.0.0 diff --git a/sources b/sources index c72d767..75f7164 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.6.2.tar.gz) = 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9 +SHA512 (postfix-3.6.3.tar.gz) = 7179aaeeaf27838b867d9a07f9a889d7cd6b7f5053e123caef4dff2820d4df6d5be167effedde6c857b4468966b8449c631e56405e1ac2d589716fb4e3f15e3b From 1860f79dd45cbefbdba1ae8162eb728ab0e70891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 12 Nov 2021 22:26:56 +0100 Subject: [PATCH 038/108] Rebuild(libnsl2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 5de6ed2..d03473f 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -799,6 +799,9 @@ fi %endif %changelog +* Fri Nov 12 2021 Björn Esser - 2:3.6.3-2 +- Rebuild(libnsl2) + * Wed Nov 10 2021 Jaroslav Škarvada - 2:3.6.3-1 - New version Resolves: rhbz#2020984 From f9afcb4e7e864b7d9edbacac6f16e6e996ff3f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Wed, 8 Dec 2021 10:04:50 +0100 Subject: [PATCH 039/108] Use %set_build_flags to set all build flags This is a simple makefile build, so %set_build_flags should be used to popoulate the standard environment variables. --- postfix.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index d03473f..d8c4113 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -257,6 +257,7 @@ for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do done %build +%set_build_flags unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB CCARGS="-fPIC -fcommon" %if 0%{?rhel} >= 9 @@ -321,7 +322,7 @@ CCARGS="${CCARGS} $(getconf LFS_CFLAGS)" %if 0%{?rhel} >= 9 CCARGS="${CCARGS} -DNO_NIS" %endif -LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}" +LDFLAGS="$LDFLAGS %{?_hardened_build:-Wl,-z,relro,-z,now}" # SHLIB_RPATH is needed to find private libraries # LDFLAGS are added to SHLIB_RPATH because the postfix build system @@ -334,7 +335,7 @@ make -f Makefile.init makefiles shared=yes dynamicmaps=yes \ AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" \ AUXLIBS_CDB="${AUXLIBS_CDB}" \ DEBUG="" SHLIB_RPATH="-Wl,-rpath,%{postfix_shlib_dir} $LDFLAGS" \ - OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment" \ + OPT="$CFLAGS -fno-strict-aliasing -Wno-comment" \ POSTFIX_INSTALL_OPTS=-keep-build-mtime %make_build @@ -799,6 +800,9 @@ fi %endif %changelog +* Wed Dec 08 2021 Timm Bäder - 2:3.6.3-3 +- Use %%set_build_flags to set all build flags + * Fri Nov 12 2021 Björn Esser - 2:3.6.3-2 - Rebuild(libnsl2) From 6a08ebfa4b8718d7fe167f164d67743e8a08983f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 14 Dec 2021 01:21:01 +0100 Subject: [PATCH 040/108] Added SELinux workound for systemd service to work after 'postfix start' --- postfix.service | 1 + postfix.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/postfix.service b/postfix.service index e2b43a6..7a798fb 100644 --- a/postfix.service +++ b/postfix.service @@ -11,6 +11,7 @@ PrivateTmp=true CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE ProtectSystem=true PrivateDevices=true +ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid/master.pid ExecStartPre=-/usr/libexec/postfix/aliasesdb ExecStartPre=-/usr/libexec/postfix/chroot-update ExecStart=/usr/sbin/postfix start diff --git a/postfix.spec b/postfix.spec index d8c4113..41def1b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.3 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -62,7 +62,10 @@ Requires(preun): %{_sbindir}/alternatives Requires(preun): systemd Requires(postun): systemd # Required by /usr/libexec/postfix/postfix-script -Requires: diffutils, findutils +Requires: diffutils +Requires: findutils +# for restorecon +Requires: policycoreutils Provides: MTA smtpd smtpdaemon server(smtp) Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz @@ -800,6 +803,9 @@ fi %endif %changelog +* Tue Dec 14 2021 Jaroslav Škarvada - 2:3.6.3-4 +- Added SELinux workound for systemd service to work after 'postfix start' + * Wed Dec 08 2021 Timm Bäder - 2:3.6.3-3 - Use %%set_build_flags to set all build flags From 0b687772b37f6e1fbf5df4d643d56125f2c82307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Jan 2022 17:25:05 +0100 Subject: [PATCH 041/108] Fixed pflogsumm to allow underscores in the syslog_name Resolves: rhbz#1931403 --- ...summ-1.1.5-syslog-name-underscore-fix.patch | 18 ++++++++++++++++++ postfix.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pflogsumm-1.1.5-syslog-name-underscore-fix.patch diff --git a/pflogsumm-1.1.5-syslog-name-underscore-fix.patch b/pflogsumm-1.1.5-syslog-name-underscore-fix.patch new file mode 100644 index 0000000..9279bcc --- /dev/null +++ b/pflogsumm-1.1.5-syslog-name-underscore-fix.patch @@ -0,0 +1,18 @@ +diff --git a/pflogsumm-1.1.5/pflogsumm.pl b/pflogsumm-1.1.5/pflogsumm.pl +index eb527d0..7e26206 100755 +--- a/pflogsumm-1.1.5/pflogsumm.pl ++++ b/pflogsumm-1.1.5/pflogsumm.pl +@@ -503,7 +503,12 @@ $usageMsg = + # Accept either "_"s or "-"s in --switches + foreach (@ARGV) { + last if($_ eq "--"); +- tr/_/-/ if(/^--\w/); ++ if (/^--\w/) ++ { ++ my @argspl = split("=", $_, 2); ++ $argspl[0] =~ tr/_/-/; ++ $_ = join("=", @argspl); ++ } + } + + # Some pre-inits for convenience diff --git a/postfix.spec b/postfix.spec index 41def1b..8918e3a 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.6.3 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -101,6 +101,8 @@ Patch11: postfix-3.4.4-chroot-example-fix.patch Patch12: postfix-3.6.2-glibc-234-build-fix.patch # sent upstream Patch13: postfix-3.6.2-whitespace-name-fix.patch +# rhbz#1931403, sent upstream +Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -253,6 +255,7 @@ popd %patch11 -p1 -b .chroot-example-fix %patch12 -p1 -b .glibc-234-build-fix %patch13 -p1 -b .whitespace-name-fix +%patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -803,6 +806,10 @@ fi %endif %changelog +* Mon Jan 17 2022 Jaroslav Škarvada - 2:3.6.3-5 +- Fixed pflogsumm to allow underscores in the syslog_name + Resolves: rhbz#1931403 + * Tue Dec 14 2021 Jaroslav Škarvada - 2:3.6.3-4 - Added SELinux workound for systemd service to work after 'postfix start' From e45367e31cb02e27a1d3ca3b1fbd2215262dd099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 21 Jan 2022 00:24:36 +0100 Subject: [PATCH 042/108] New version Resolves: rhbz#2040977 Suppressed openssl output during SSL certificates generation Resolves: rhbz#2041589 --- postfix.spec | 14 ++++++++++---- sources | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/postfix.spec b/postfix.spec index 8918e3a..b8c560d 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.6.3 -Release: 5%{?dist} +Version: 3.6.4 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -521,7 +521,7 @@ fi # Create self-signed SSL certificate if [ ! -f %{sslkey} ]; then umask 077 - %{_bindir}/openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:4096 -out %{sslkey} + %{_bindir}/openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:4096 -out %{sslkey} 2>/dev/null || echo "openssl genpkey failed" fi if [ ! -f %{sslcert} ]; then @@ -533,7 +533,7 @@ if [ ! -f %{sslcert} ]; then req_cmd="%{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} \ -subj /C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}" # openssl-3.0 and fallback for backward compatibility with openssl < 3.0 - $req_cmd -noenc -copy_extensions none 2>/dev/null || $req_cmd + $req_cmd -noenc -copy_extensions none 2>/dev/null || $req_cmd 2>/dev/null || echo "openssl req failed" chmod 644 %{sslcert} fi @@ -806,6 +806,12 @@ fi %endif %changelog +* Thu Jan 20 2022 Jaroslav Škarvada - 2:3.6.4-1 +- New version + Resolves: rhbz#2040977 +- Suppressed openssl output during SSL certificates generation + Resolves: rhbz#2041589 + * Mon Jan 17 2022 Jaroslav Škarvada - 2:3.6.3-5 - Fixed pflogsumm to allow underscores in the syslog_name Resolves: rhbz#1931403 diff --git a/sources b/sources index 75f7164..a1fa437 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.6.3.tar.gz) = 7179aaeeaf27838b867d9a07f9a889d7cd6b7f5053e123caef4dff2820d4df6d5be167effedde6c857b4468966b8449c631e56405e1ac2d589716fb4e3f15e3b +SHA512 (postfix-3.6.4.tar.gz) = f5813801377a5887d27720cc7f85a6a68f8ca82fc7a9e852b27c8967996b3d64f651cc16e2b021d55316a074b4778e19155bb60c8f0885d4aaf72766cab7c4cd From 61cd20692d0c5f7a247fecfba33176df28357d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 22 Feb 2022 15:13:26 +0100 Subject: [PATCH 043/108] New version Resolves: rhbz#2051046 --- postfix-3.6.2-glibc-234-build-fix.patch | 14 ------------- ...config.patch => postfix-3.7.0-config.patch | 20 +++++++++--------- ...e-fs.patch => postfix-3.7.0-large-fs.patch | 4 ++-- ...=> postfix-3.7.0-whitespace-name-fix.patch | 4 ++-- postfix.spec | 21 ++++++++++--------- sources | 2 +- 6 files changed, 26 insertions(+), 39 deletions(-) delete mode 100644 postfix-3.6.2-glibc-234-build-fix.patch rename postfix-3.5.0-config.patch => postfix-3.7.0-config.patch (90%) rename postfix-3.4.0-large-fs.patch => postfix-3.7.0-large-fs.patch (92%) rename postfix-3.6.2-whitespace-name-fix.patch => postfix-3.7.0-whitespace-name-fix.patch (82%) diff --git a/postfix-3.6.2-glibc-234-build-fix.patch b/postfix-3.6.2-glibc-234-build-fix.patch deleted file mode 100644 index b678b78..0000000 --- a/postfix-3.6.2-glibc-234-build-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index 99bec9b..95c78ec 100644 ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -802,6 +803,9 @@ extern int initgroups(const char *, int); - #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" - #endif - #endif -+#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34) -+#define HAS_CLOSEFROM -+#endif - #include - #if !defined(KERNEL_VERSION) - #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1) diff --git a/postfix-3.5.0-config.patch b/postfix-3.7.0-config.patch similarity index 90% rename from postfix-3.5.0-config.patch rename to postfix-3.7.0-config.patch index da42263..d8be512 100644 --- a/postfix-3.5.0-config.patch +++ b/postfix-3.7.0-config.patch @@ -1,8 +1,8 @@ diff --git a/conf/main.cf b/conf/main.cf -index 7af8bde..495e346 100644 +index 47de434..112c1f1 100644 --- a/conf/main.cf +++ b/conf/main.cf -@@ -132,6 +132,10 @@ mail_owner = postfix +@@ -136,6 +136,10 @@ mail_owner = postfix #inet_interfaces = all #inet_interfaces = $myhostname #inet_interfaces = $myhostname, localhost @@ -13,7 +13,7 @@ index 7af8bde..495e346 100644 # The proxy_interfaces parameter specifies the network interface # addresses that this mail system receives mail on by way of a -@@ -176,7 +180,7 @@ mail_owner = postfix +@@ -180,7 +184,7 @@ mail_owner = postfix # # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". # @@ -22,7 +22,7 @@ index 7af8bde..495e346 100644 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, # mail.$mydomain, www.$mydomain, ftp.$mydomain -@@ -398,7 +402,7 @@ unknown_local_recipient_reject_code = 550 +@@ -407,7 +411,7 @@ unknown_local_recipient_reject_code = 550 # "postfix reload" to eliminate the delay. # #alias_maps = dbm:/etc/aliases @@ -31,7 +31,7 @@ index 7af8bde..495e346 100644 #alias_maps = hash:/etc/aliases, nis:mail.aliases #alias_maps = netinfo:/aliases -@@ -409,7 +413,7 @@ unknown_local_recipient_reject_code = 550 +@@ -418,7 +422,7 @@ unknown_local_recipient_reject_code = 550 # #alias_database = dbm:/etc/aliases #alias_database = dbm:/etc/mail/aliases @@ -40,7 +40,7 @@ index 7af8bde..495e346 100644 #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases # ADDRESS EXTENSIONS (e.g., user+foo) -@@ -479,7 +483,27 @@ unknown_local_recipient_reject_code = 550 +@@ -488,7 +492,27 @@ unknown_local_recipient_reject_code = 550 # # Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" # listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. @@ -69,7 +69,7 @@ index 7af8bde..495e346 100644 # # Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and # subsequent line in master.cf. -@@ -499,8 +523,7 @@ unknown_local_recipient_reject_code = 550 +@@ -508,8 +532,7 @@ unknown_local_recipient_reject_code = 550 # the main.cf file, otherwise the SMTP server will reject mail for # non-UNIX accounts with "User unknown in local recipient table". # @@ -79,7 +79,7 @@ index 7af8bde..495e346 100644 #fallback_transport = # The luser_relay parameter specifies an optional destination address -@@ -673,4 +696,41 @@ sample_directory = +@@ -682,4 +705,41 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = @@ -123,10 +123,10 @@ index 7af8bde..495e346 100644 +# +smtp_tls_security_level = may diff --git a/conf/master.cf b/conf/master.cf -index c0f2508..05c5d07 100644 +index 83fc6fd..bb0eae9 100644 --- a/conf/master.cf +++ b/conf/master.cf -@@ -98,14 +98,14 @@ postlog unix-dgram n - n - 1 postlogd +@@ -110,14 +110,14 @@ postlog unix-dgram n - n - 1 postlogd # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe diff --git a/postfix-3.4.0-large-fs.patch b/postfix-3.7.0-large-fs.patch similarity index 92% rename from postfix-3.4.0-large-fs.patch rename to postfix-3.7.0-large-fs.patch index fbc55f1..3c09e5e 100644 --- a/postfix-3.4.0-large-fs.patch +++ b/postfix-3.7.0-large-fs.patch @@ -21,10 +21,10 @@ index 50a4aa7..beef3db 100644 if (msg_verbose) msg_info("%s: %s: block size %lu, blocks free %lu", diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index a8d2571..ad07498 100644 +index c9ebc33..f2be0e2 100644 --- a/src/util/sys_defs.h +++ b/src/util/sys_defs.h -@@ -769,8 +769,8 @@ extern int initgroups(const char *, int); +@@ -771,8 +771,8 @@ extern int initgroups(const char *, int); #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" #define FIONREAD_IN_TERMIOS_H diff --git a/postfix-3.6.2-whitespace-name-fix.patch b/postfix-3.7.0-whitespace-name-fix.patch similarity index 82% rename from postfix-3.6.2-whitespace-name-fix.patch rename to postfix-3.7.0-whitespace-name-fix.patch index c45035e..e6a1db4 100644 --- a/postfix-3.6.2-whitespace-name-fix.patch +++ b/postfix-3.7.0-whitespace-name-fix.patch @@ -1,8 +1,8 @@ diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c -index 391c711..be5ce42 100644 +index f2b86d0..018e39e 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) +@@ -772,6 +772,8 @@ static void cleanup_header_done_callback(void *context) /* Normalize whitespace. */ token = tok822_scan_limit(state->fullname, &dummy_token, var_token_limit); diff --git a/postfix.spec b/postfix.spec index b8c560d..4c80144 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.6.4 +Version: 3.7.0 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -89,20 +89,18 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.5.0-config.patch +Patch1: postfix-3.7.0-config.patch Patch2: postfix-3.4.0-files.patch Patch3: postfix-3.3.3-alternatives.patch -Patch4: postfix-3.4.0-large-fs.patch +Patch4: postfix-3.7.0-large-fs.patch Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch -# upstream patch -Patch12: postfix-3.6.2-glibc-234-build-fix.patch # sent upstream -Patch13: postfix-3.6.2-whitespace-name-fix.patch +Patch12: postfix-3.7.0-whitespace-name-fix.patch # rhbz#1931403, sent upstream -Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch +Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -253,9 +251,8 @@ pushd pflogsumm-%{pflogsumm_ver} popd %endif %patch11 -p1 -b .chroot-example-fix -%patch12 -p1 -b .glibc-234-build-fix -%patch13 -p1 -b .whitespace-name-fix -%patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix +%patch12 -p1 -b .whitespace-name-fix +%patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -806,6 +803,10 @@ fi %endif %changelog +* Tue Feb 22 2022 Jaroslav Škarvada - 2:3.7.0-1 +- New version + Resolves: rhbz#2051046 + * Thu Jan 20 2022 Jaroslav Škarvada - 2:3.6.4-1 - New version Resolves: rhbz#2040977 diff --git a/sources b/sources index a1fa437..4cbf996 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.6.4.tar.gz) = f5813801377a5887d27720cc7f85a6a68f8ca82fc7a9e852b27c8967996b3d64f651cc16e2b021d55316a074b4778e19155bb60c8f0885d4aaf72766cab7c4cd +SHA512 (postfix-3.7.0.tar.gz) = f2fb5c0399100c19e428b68728a8ce62b1fb74d365038373f22ed698c1d0fece506b3f1335c322b949875a4a9fa96fa0a7680b12641d596d09615e8fef061da4 From c4ace32f5a7ec89f189834bd09ad4a04838d9f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 19 Apr 2022 23:25:13 +0200 Subject: [PATCH 044/108] New version Resolves: rhbz#2076317 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 4c80144..7b21b54 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.7.0 +Version: 3.7.1 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -803,6 +803,10 @@ fi %endif %changelog +* Tue Apr 19 2022 Jaroslav Škarvada - 2:3.7.1-1 +- New version + Resolves: rhbz#2076317 + * Tue Feb 22 2022 Jaroslav Škarvada - 2:3.7.0-1 - New version Resolves: rhbz#2051046 diff --git a/sources b/sources index 4cbf996..3747c10 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.7.0.tar.gz) = f2fb5c0399100c19e428b68728a8ce62b1fb74d365038373f22ed698c1d0fece506b3f1335c322b949875a4a9fa96fa0a7680b12641d596d09615e8fef061da4 +SHA512 (postfix-3.7.1.tar.gz) = 2a8916eae4b0a4f4e055e1dbae1b9655b1eabcb22d911599a63fb9a1900174c9eab24280bee2ddab42db6674c6b4362964a2a41f67fcb18f0c8c41ad0100b044 From 52113b3a795f28a93ea830a75b04dc3d4e2e70ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 28 Apr 2022 12:27:45 +0200 Subject: [PATCH 045/108] New version Resolves: rhbz#2079634 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 7b21b54..d4bb1d0 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.7.1 +Version: 3.7.2 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -803,6 +803,10 @@ fi %endif %changelog +* Thu Apr 28 2022 Jaroslav Škarvada - 2:3.7.2-1 +- New version + Resolves: rhbz#2079634 + * Tue Apr 19 2022 Jaroslav Škarvada - 2:3.7.1-1 - New version Resolves: rhbz#2076317 diff --git a/sources b/sources index 3747c10..02dc86c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (postfix-3.7.2.tar.gz) = 23bb1af6bf3743c741f108da136f64613f9062d121dc459944ac192275335952cd309ffec6c380f5d36430605eec538c2549c3fdee9d4597f739d9d1b0a033fc SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.7.1.tar.gz) = 2a8916eae4b0a4f4e055e1dbae1b9655b1eabcb22d911599a63fb9a1900174c9eab24280bee2ddab42db6674c6b4362964a2a41f67fcb18f0c8c41ad0100b044 From 7952a26995c33d1666429808962b02403c7617c9 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Thu, 2 Jun 2022 15:04:35 +0200 Subject: [PATCH 046/108] Adding fmf plan --- .fmf/version | 1 + plans/all.fmf | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/all.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..3df347f --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,6 @@ +summary: Test plan with all Fedora tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/frr.git +execute: + how: tmt From 3ce9f8fee04f1bffeaf7c5558b016657357edbf8 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Thu, 2 Jun 2022 15:04:45 +0200 Subject: [PATCH 047/108] Adding gating.yaml --- gating.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..195c6fe --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +#gating rawhide +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file From 984a5d114178e6adfd03ff4ba3ab626c512f8e33 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Thu, 2 Jun 2022 15:05:53 +0200 Subject: [PATCH 048/108] Fixing tests repo location --- plans/all.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/all.fmf b/plans/all.fmf index 3df347f..5b892e7 100644 --- a/plans/all.fmf +++ b/plans/all.fmf @@ -1,6 +1,6 @@ summary: Test plan with all Fedora tests discover: how: fmf - url: https://src.fedoraproject.org/tests/frr.git + url: https://src.fedoraproject.org/tests/postfix.git execute: how: tmt From eb0a81aba00988313c0332e362bdb8b07d7540dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 15:15:18 +0000 Subject: [PATCH 049/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index d4bb1d0..cd89e7c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -803,6 +803,9 @@ fi %endif %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2:3.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Apr 28 2022 Jaroslav Škarvada - 2:3.7.2-1 - New version Resolves: rhbz#2079634 From 7b9e0060a565a3c0037d2cce401bb1d635793d36 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Sat, 23 Jul 2022 18:50:47 +0000 Subject: [PATCH 050/108] Build with pcre2 over deprecated pcre --- postfix.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/postfix.spec b/postfix.spec index cd89e7c..5cd92fe 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -118,7 +118,7 @@ BuildRequires: libnsl2-devel %{?with_ldap:BuildRequires: openldap-devel} %{?with_lmdb:BuildRequires: lmdb-devel} %{?with_sasl:BuildRequires: cyrus-sasl-devel} -%{?with_pcre:BuildRequires: pcre-devel} +%{?with_pcre:BuildRequires: pcre2-devel} %{?with_mysql:BuildRequires: mariadb-connector-c-devel} %{?with_pgsql:BuildRequires: libpq-devel} %{?with_sqlite:BuildRequires: sqlite-devel} @@ -282,9 +282,8 @@ CCARGS="${CCARGS} -fsigned-char" AUXLIBS_LMDB="-llmdb" %endif %if %{with pcre} - # -I option required for pcre 3.4 (and later?) - CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre" - AUXLIBS_PCRE="-lpcre" + CCARGS="${CCARGS} -DHAS_PCRE=2 `pcre2-config --cflags`" + AUXLIBS_PCRE=`pcre2-config --libs8` %endif %if %{with mysql} CCARGS="${CCARGS} -DHAS_MYSQL -I%{_includedir}/mysql" @@ -803,6 +802,9 @@ fi %endif %changelog +* Sat Jul 23 2022 Stewart Smith - 2:3.7.2-3 +- Build with pcre2 instead of the deprecated pcre library + * Fri Jul 22 2022 Fedora Release Engineering - 2:3.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 979512541f2becedcf53b7baa8831c3c95d60f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 1 Aug 2022 15:08:31 +0200 Subject: [PATCH 051/108] Rebuilt for ICU 71.1 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 5cd92fe..5424918 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.7.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -802,6 +802,9 @@ fi %endif %changelog +* Mon Aug 01 2022 Frantisek Zatloukal - 2:3.7.2-4 +- Rebuilt for ICU 71.1 + * Sat Jul 23 2022 Stewart Smith - 2:3.7.2-3 - Build with pcre2 instead of the deprecated pcre library From c38b56850d36fe51d044bb235ad1a318d3ed6458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Oct 2022 20:32:45 +0200 Subject: [PATCH 052/108] New version Resolves: rhbz#2133120 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 5424918..8f34ef6 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.7.2 -Release: 4%{?dist} +Version: 3.7.3 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -802,6 +802,10 @@ fi %endif %changelog +* Mon Oct 10 2022 Jaroslav Škarvada - 2:3.7.3-1 +- New version + Resolves: rhbz#2133120 + * Mon Aug 01 2022 Frantisek Zatloukal - 2:3.7.2-4 - Rebuilt for ICU 71.1 diff --git a/sources b/sources index 02dc86c..6fba956 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.7.2.tar.gz) = 23bb1af6bf3743c741f108da136f64613f9062d121dc459944ac192275335952cd309ffec6c380f5d36430605eec538c2549c3fdee9d4597f739d9d1b0a033fc SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d +SHA512 (postfix-3.7.3.tar.gz) = 4ceedd1b7b364f47a3becc041cf29a48aea54e38306fd1227c5a7c25894831fb5c37150d99d781d237175e58da21ac53887c97d99bb6b715c4988777596ee890 From 6686b3e5411de4cfb4f308c7130caa9492ce8d1e Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 31 Dec 2022 04:03:32 +0000 Subject: [PATCH 053/108] Rebuild for ICU 72 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 8f34ef6..616ed66 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -802,6 +802,9 @@ fi %endif %changelog +* Sat Dec 31 2022 Pete Walter - 2:3.7.3-2 +- Rebuild for ICU 72 + * Mon Oct 10 2022 Jaroslav Škarvada - 2:3.7.3-1 - New version Resolves: rhbz#2133120 From 15516bff0d8af58f2c2154f9b68938668cc35737 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 31 Dec 2022 23:40:02 +0900 Subject: [PATCH 054/108] Backport upstream fix for uname -r detection with kernel 6.x --- postfix.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 616ed66..26086e3 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -254,6 +254,10 @@ popd %patch12 -p1 -b .whitespace-name-fix %patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix +# Backport 3.8-20221006 fix for uname -r detection +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}{_,} @@ -802,6 +806,9 @@ fi %endif %changelog +* Sat Dec 31 2022 Mamoru TASAKA - 2:3.7.3-3 +- Backport upstream fix for uname -r detection with kernel 6.x + * Sat Dec 31 2022 Pete Walter - 2:3.7.3-2 - Rebuild for ICU 72 From c47b1caf309600079cac8edbc05cfe3d5c1b1707 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 10:07:14 +0000 Subject: [PATCH 055/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 26086e3..1e00fbb 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -806,6 +806,9 @@ fi %endif %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2:3.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 31 2022 Mamoru TASAKA - 2:3.7.3-3 - Backport upstream fix for uname -r detection with kernel 6.x From de7ce9698331af4076b325ed569a0f8cea9e2fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 25 Jan 2023 19:11:38 +0100 Subject: [PATCH 056/108] New version Resolves: rhbz#2162932 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 1e00fbb..d8d1407 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.7.3 -Release: 4%{?dist} +Version: 3.7.4 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -806,6 +806,10 @@ fi %endif %changelog +* Wed Jan 25 2023 Jaroslav Škarvada - 2:3.7.4-1 +- New version + Resolves: rhbz#2162932 + * Fri Jan 20 2023 Fedora Release Engineering - 2:3.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 6fba956..309edd5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.7.3.tar.gz) = 4ceedd1b7b364f47a3becc041cf29a48aea54e38306fd1227c5a7c25894831fb5c37150d99d781d237175e58da21ac53887c97d99bb6b715c4988777596ee890 +SHA512 (postfix-3.7.4.tar.gz) = 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236 From 43399f266f95bed6ce43ba39c55e46b11a077018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 26 Apr 2023 12:31:07 +0200 Subject: [PATCH 057/108] New version Resolves: rhbz#2187121 --- ...ix-3.7.0-config.patch => postfix-3.8.0-config.patch | 6 +++--- ....7.0-large-fs.patch => postfix-3.8.0-large-fs.patch | 4 ++-- postfix.spec | 10 +++++++--- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) rename postfix-3.7.0-config.patch => postfix-3.8.0-config.patch (97%) rename postfix-3.7.0-large-fs.patch => postfix-3.8.0-large-fs.patch (92%) diff --git a/postfix-3.7.0-config.patch b/postfix-3.8.0-config.patch similarity index 97% rename from postfix-3.7.0-config.patch rename to postfix-3.8.0-config.patch index d8be512..f77cdc3 100644 --- a/postfix-3.7.0-config.patch +++ b/postfix-3.8.0-config.patch @@ -1,5 +1,5 @@ diff --git a/conf/main.cf b/conf/main.cf -index 47de434..112c1f1 100644 +index 2ee7996..336bd7b 100644 --- a/conf/main.cf +++ b/conf/main.cf @@ -136,6 +136,10 @@ mail_owner = postfix @@ -123,10 +123,10 @@ index 47de434..112c1f1 100644 +# +smtp_tls_security_level = may diff --git a/conf/master.cf b/conf/master.cf -index 83fc6fd..bb0eae9 100644 +index fd282dd..8d969c6 100644 --- a/conf/master.cf +++ b/conf/master.cf -@@ -110,14 +110,14 @@ postlog unix-dgram n - n - 1 postlogd +@@ -112,14 +112,14 @@ postlog unix-dgram n - n - 1 postlogd # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe diff --git a/postfix-3.7.0-large-fs.patch b/postfix-3.8.0-large-fs.patch similarity index 92% rename from postfix-3.7.0-large-fs.patch rename to postfix-3.8.0-large-fs.patch index 3c09e5e..b0c7933 100644 --- a/postfix-3.7.0-large-fs.patch +++ b/postfix-3.8.0-large-fs.patch @@ -21,10 +21,10 @@ index 50a4aa7..beef3db 100644 if (msg_verbose) msg_info("%s: %s: block size %lu, blocks free %lu", diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index c9ebc33..f2be0e2 100644 +index 1fb449d..bcaac27 100644 --- a/src/util/sys_defs.h +++ b/src/util/sys_defs.h -@@ -771,8 +771,8 @@ extern int initgroups(const char *, int); +@@ -783,8 +783,8 @@ extern int initgroups(const char *, int); #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" #define FIONREAD_IN_TERMIOS_H diff --git a/postfix.spec b/postfix.spec index d8d1407..3963d7f 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,7 +48,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.7.4 +Version: 3.8.0 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -89,10 +89,10 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.7.0-config.patch +Patch1: postfix-3.8.0-config.patch Patch2: postfix-3.4.0-files.patch Patch3: postfix-3.3.3-alternatives.patch -Patch4: postfix-3.7.0-large-fs.patch +Patch4: postfix-3.8.0-large-fs.patch Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch @@ -806,6 +806,10 @@ fi %endif %changelog +* Wed Apr 26 2023 Jaroslav Škarvada - 2:3.8.0-1 +- New version + Resolves: rhbz#2187121 + * Wed Jan 25 2023 Jaroslav Škarvada - 2:3.7.4-1 - New version Resolves: rhbz#2162932 diff --git a/sources b/sources index 309edd5..507d326 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.7.4.tar.gz) = 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236 +SHA512 (postfix-3.8.0.tar.gz) = a66956b0cc5eb6ad5ee926348b584ba5640586784aec794a84c40472faecb6313d46537c9f5696edfd8fda070591925a0cfaedc014e15bb3496195e5fb9ee4bd From a48b20209c8ad0dc6fa1e6992af905f806c09685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 26 Apr 2023 18:45:45 +0200 Subject: [PATCH 058/108] Added links to some patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- postfix.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 3963d7f..bee1814 100644 --- a/postfix.spec +++ b/postfix.spec @@ -92,12 +92,13 @@ Source101: postfix-pam.conf Patch1: postfix-3.8.0-config.patch Patch2: postfix-3.4.0-files.patch Patch3: postfix-3.3.3-alternatives.patch +# probably rhbz#428996 Patch4: postfix-3.8.0-large-fs.patch Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch -# sent upstream +# rhbz#1977732, sent upstream, https://marc.info/?t=162531022900002 Patch12: postfix-3.7.0-whitespace-name-fix.patch # rhbz#1931403, sent upstream Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch From ecc0e9b3440c5a9b4225ccdcce8d7069a4b92aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 26 Apr 2023 18:59:11 +0200 Subject: [PATCH 059/108] Dropped whitespace-name-fix patch, not needed --- postfix-3.7.0-whitespace-name-fix.patch | 13 ------------- postfix.spec | 8 ++++---- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 postfix-3.7.0-whitespace-name-fix.patch diff --git a/postfix-3.7.0-whitespace-name-fix.patch b/postfix-3.7.0-whitespace-name-fix.patch deleted file mode 100644 index e6a1db4..0000000 --- a/postfix-3.7.0-whitespace-name-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c -index f2b86d0..018e39e 100644 ---- a/src/cleanup/cleanup_message.c -+++ b/src/cleanup/cleanup_message.c -@@ -772,6 +772,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); - } diff --git a/postfix.spec b/postfix.spec index bee1814..dc6b51d 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -98,8 +98,6 @@ Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch -# rhbz#1977732, sent upstream, https://marc.info/?t=162531022900002 -Patch12: postfix-3.7.0-whitespace-name-fix.patch # rhbz#1931403, sent upstream Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch @@ -252,7 +250,6 @@ pushd pflogsumm-%{pflogsumm_ver} popd %endif %patch11 -p1 -b .chroot-example-fix -%patch12 -p1 -b .whitespace-name-fix %patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix # Backport 3.8-20221006 fix for uname -r detection @@ -807,6 +804,9 @@ fi %endif %changelog +* Wed Apr 26 2023 Jaroslav Škarvada - 2:3.8.0-2 +- Dropped whitespace-name-fix patch, not needed + * Wed Apr 26 2023 Jaroslav Škarvada - 2:3.8.0-1 - New version Resolves: rhbz#2187121 From 8d9e3a48bbbbbacab50d4a6490649f515f1b4483 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Thu, 25 May 2023 15:02:21 +0200 Subject: [PATCH 060/108] Fix freed memory access --- postfix-3.8.0-posttls-finger.patch | 37 ++++++++++++++++++++++++++++++ postfix.spec | 7 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 postfix-3.8.0-posttls-finger.patch diff --git a/postfix-3.8.0-posttls-finger.patch b/postfix-3.8.0-posttls-finger.patch new file mode 100644 index 0000000..1178961 --- /dev/null +++ b/postfix-3.8.0-posttls-finger.patch @@ -0,0 +1,37 @@ +commit a53fb4c34c8dc09e81ed0577df51a11bc5b7ae3e +Author: Tomas Korbar +Date: Thu May 25 14:59:46 2023 +0200 + + Fix freed memory access in posttls-finger + +diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c +index 2f3a58e..d446583 100644 +--- a/src/posttls-finger/posttls-finger.c ++++ b/src/posttls-finger/posttls-finger.c +@@ -1590,12 +1590,12 @@ static char *parse_destination(char *destination, char *def_service, + static void connect_remote(STATE *state, char *dest) + { + DNS_RR *addr; +- char *buf; +- char *domain; +- char *service; + + /* When reconnecting use IP address of previous session */ + if (state->addr == 0) { ++ char *buf; ++ char *domain; ++ char *service; + buf = parse_destination(dest, state->smtp ? "smtp" : "24", + &domain, &service, &state->port); + if (!state->nexthop) +@@ -1622,8 +1622,8 @@ static void connect_remote(STATE *state, char *dest) + + if (level == TLS_LEV_INVALID + || (state->stream = connect_addr(state, addr)) == 0) { +- msg_info("Failed to establish session to %s:%s via %s:%u: %s", +- dest, service, HNAME(addr), addr->port, ++ msg_info("Failed to establish session to %s via %s:%u: %s", ++ dest, HNAME(addr), addr->port, + vstring_str(state->why->reason)); + continue; + } diff --git a/postfix.spec b/postfix.spec index dc6b51d..249b5a5 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -100,6 +100,8 @@ Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch # rhbz#1931403, sent upstream Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch +# fix freed memory access reported and fixed by upstream after 3.8.0 +Patch14: postfix-3.8.0-posttls-finger.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -804,6 +806,9 @@ fi %endif %changelog +* Thu May 25 2023 Tomas Korbar - 2:3.8.0-3 +- Fix freed memory access + * Wed Apr 26 2023 Jaroslav Škarvada - 2:3.8.0-2 - Dropped whitespace-name-fix patch, not needed From 973d98f3f8a719a2975a54d63c0ba9661ead84dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 6 Jun 2023 11:34:45 +0200 Subject: [PATCH 061/108] New version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#2212596 Signed-off-by: Jaroslav Škarvada --- postfix-3.8.0-posttls-finger.patch | 37 ------------------------------ postfix.spec | 10 ++++---- sources | 2 +- 3 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 postfix-3.8.0-posttls-finger.patch diff --git a/postfix-3.8.0-posttls-finger.patch b/postfix-3.8.0-posttls-finger.patch deleted file mode 100644 index 1178961..0000000 --- a/postfix-3.8.0-posttls-finger.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit a53fb4c34c8dc09e81ed0577df51a11bc5b7ae3e -Author: Tomas Korbar -Date: Thu May 25 14:59:46 2023 +0200 - - Fix freed memory access in posttls-finger - -diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c -index 2f3a58e..d446583 100644 ---- a/src/posttls-finger/posttls-finger.c -+++ b/src/posttls-finger/posttls-finger.c -@@ -1590,12 +1590,12 @@ static char *parse_destination(char *destination, char *def_service, - static void connect_remote(STATE *state, char *dest) - { - DNS_RR *addr; -- char *buf; -- char *domain; -- char *service; - - /* When reconnecting use IP address of previous session */ - if (state->addr == 0) { -+ char *buf; -+ char *domain; -+ char *service; - buf = parse_destination(dest, state->smtp ? "smtp" : "24", - &domain, &service, &state->port); - if (!state->nexthop) -@@ -1622,8 +1622,8 @@ static void connect_remote(STATE *state, char *dest) - - if (level == TLS_LEV_INVALID - || (state->stream = connect_addr(state, addr)) == 0) { -- msg_info("Failed to establish session to %s:%s via %s:%u: %s", -- dest, service, HNAME(addr), addr->port, -+ msg_info("Failed to establish session to %s via %s:%u: %s", -+ dest, HNAME(addr), addr->port, - vstring_str(state->why->reason)); - continue; - } diff --git a/postfix.spec b/postfix.spec index 249b5a5..b69a12f 100644 --- a/postfix.spec +++ b/postfix.spec @@ -48,8 +48,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.0 -Release: 3%{?dist} +Version: 3.8.1 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -100,8 +100,6 @@ Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch # rhbz#1931403, sent upstream Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch -# fix freed memory access reported and fixed by upstream after 3.8.0 -Patch14: postfix-3.8.0-posttls-finger.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -806,6 +804,10 @@ fi %endif %changelog +* Tue Jun 6 2023 Jaroslav Škarvada - 2:3.8.1-1 +- New version + Resolves: rhbz#2212596 + * Thu May 25 2023 Tomas Korbar - 2:3.8.0-3 - Fix freed memory access diff --git a/sources b/sources index 507d326..8fc247a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.8.0.tar.gz) = a66956b0cc5eb6ad5ee926348b584ba5640586784aec794a84c40472faecb6313d46537c9f5696edfd8fda070591925a0cfaedc014e15bb3496195e5fb9ee4bd +SHA512 (postfix-3.8.1.tar.gz) = 9eb91f2baab327de22dd55fc5ff398de74856e30be461282f41b1801301873881a8f40ce061c16e0505d51d96aaf0eff8d0ac660e5f6c70c6125133f64a4ee80 From daef2e4088e6e0b8d1d3bef93e5a34b04f16c4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dora=20O=E2=80=99Fee?= Date: Sat, 8 Jul 2023 01:26:22 +0000 Subject: [PATCH 062/108] Fix master.pid: No such file or directory error --- postfix.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix.service b/postfix.service index 7a798fb..1016ac3 100644 --- a/postfix.service +++ b/postfix.service @@ -11,7 +11,7 @@ PrivateTmp=true CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE ProtectSystem=true PrivateDevices=true -ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid/master.pid +ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid ExecStartPre=-/usr/libexec/postfix/aliasesdb ExecStartPre=-/usr/libexec/postfix/chroot-update ExecStart=/usr/sbin/postfix start From 2548b6b070a824532b50827f502596adac81876e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 11 Jul 2023 13:55:28 +0200 Subject: [PATCH 063/108] Fixed possible warning when postfix is restarted Resolves: rhbz#2218058 --- postfix.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index b69a12f..90fff80 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -804,6 +804,10 @@ fi %endif %changelog +* Tue Jul 11 2023 Jaroslav Škarvada - 2:3.8.1-2 +- Fixed possible warning when postfix is restarted + Resolves: rhbz#2218058 + * Tue Jun 6 2023 Jaroslav Škarvada - 2:3.8.1-1 - New version Resolves: rhbz#2212596 From 032b6a18cdd75a26ac9568aff461a55c20a9e22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:20:45 +0200 Subject: [PATCH 064/108] Rebuilt for ICU 73.2 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 90fff80..05e06a4 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -804,6 +804,9 @@ fi %endif %changelog +* Tue Jul 11 2023 František Zatloukal - 2:3.8.1-3 +- Rebuilt for ICU 73.2 + * Tue Jul 11 2023 Jaroslav Škarvada - 2:3.8.1-2 - Fixed possible warning when postfix is restarted Resolves: rhbz#2218058 From 64f10e56029907322cd3d51a60e08a0bc2732fa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 06:06:38 +0000 Subject: [PATCH 065/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 05e06a4..5d5aacd 100644 --- a/postfix.spec +++ b/postfix.spec @@ -49,7 +49,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -804,6 +804,9 @@ fi %endif %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2:3.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 František Zatloukal - 2:3.8.1-3 - Rebuilt for ICU 73.2 From 42292a103eaba98fa9fa0ac58807296513ab1ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 14 Aug 2023 15:38:32 +0200 Subject: [PATCH 066/108] Use systemd-sysusers, original patch by Jonathan Wright --- postfix.spec | 26 +++++++++++++++----------- postfix.sysusers | 4 ++++ 2 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 postfix.sysusers diff --git a/postfix.spec b/postfix.spec index 5d5aacd..740d880 100644 --- a/postfix.spec +++ b/postfix.spec @@ -21,12 +21,9 @@ # Postfix requires one exlusive uid/gid and a 2nd exclusive gid for its own # use. Let me know if the second gid collides with another package. # Be careful: Redhat's 'mail' user & group isn't unique! -%define postfix_uid 89 +# It's now handled by systemd-sysusers. %define postfix_user postfix -%define postfix_gid 89 -%define postfix_group postfix %define maildrop_group postdrop -%define maildrop_gid 90 %define postfix_config_dir %{_sysconfdir}/postfix %define postfix_daemon_dir %{_libexecdir}/postfix @@ -49,15 +46,13 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) Requires(post): systemd systemd-sysv hostname Requires(post): %{_sbindir}/alternatives Requires(post): %{_bindir}/openssl -Requires(pre): %{_sbindir}/groupadd -Requires(pre): %{_sbindir}/useradd Requires(preun): %{_sbindir}/alternatives Requires(preun): systemd Requires(postun): systemd @@ -74,6 +69,7 @@ Source2: postfix.service Source3: README-Postfix-SASL-RedHat.txt Source4: postfix.aliasesdb Source5: postfix-chroot-update +Source6: postfix.sysusers # Sources 50-99 are upstream [patch] contributions @@ -110,6 +106,7 @@ BuildRequires: make BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel BuildRequires: systemd-units, libicu-devel BuildRequires: gcc, m4, findutils +BuildRequires: systemd-rpm-macros %if 0%{?rhel} < 9 BuildRequires: libnsl2-devel %endif @@ -384,6 +381,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} install -m 755 %{SOURCE4} %{buildroot}%{postfix_daemon_dir}/aliasesdb install -m 755 %{SOURCE5} %{buildroot}%{postfix_daemon_dir}/chroot-update +# systemd-sysusers +install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/postfix.conf + install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail.postfix for i in active bounce corrupt defer deferred flush incoming private saved maildrop public pid saved trace; do @@ -539,10 +539,7 @@ exit 0 %pre # Add user and groups if necessary -%{_sbindir}/groupadd -g %{maildrop_gid} -r %{maildrop_group} 2>/dev/null -%{_sbindir}/groupadd -g %{postfix_gid} -r %{postfix_group} 2>/dev/null -%{_sbindir}/groupadd -g 12 -r mail 2>/dev/null -%{_sbindir}/useradd -d %{postfix_queue_dir} -s /sbin/nologin -g %{postfix_group} -G mail -M -r -u %{postfix_uid} %{postfix_user} 2>/dev/null +%sysusers_create_compat %{SOURCE6} # hack, to turn man8/smtpd.8.gz into alternatives symlink (part of the rhbz#1051180 fix) # this could be probably dropped in f23+ @@ -726,6 +723,9 @@ fi %ghost %attr(0644, root, root) %{_var}/lib/misc/postfix.aliasesdb-stamp +# systemd-sysusers +%{_sysusersdir}/postfix.conf + %if 0%{?fedora} < 23 && 0%{?rhel} < 9 %files sysvinit %{_initrddir}/postfix @@ -804,6 +804,10 @@ fi %endif %changelog +* Mon Aug 14 2023 Jaroslav Škarvada - 2:3.8.1-5 +- Use systemd-sysusers, original patch by + Jonathan Wright + * Fri Jul 21 2023 Fedora Release Engineering - 2:3.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/postfix.sysusers b/postfix.sysusers new file mode 100644 index 0000000..876b305 --- /dev/null +++ b/postfix.sysusers @@ -0,0 +1,4 @@ +u postfix 89 - /var/spool/postfix /sbin/nologin +g postdrop 90 +g mail 12 +m postfix mail From e1e2ac872bbe77f7107fa8c3c414584b7ac08f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 5 Sep 2023 15:17:21 +0200 Subject: [PATCH 067/108] New version Resolves: rhbz#2236828 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 740d880..f9ef5a1 100644 --- a/postfix.spec +++ b/postfix.spec @@ -45,8 +45,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.1 -Release: 5%{?dist} +Version: 3.8.2 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -804,6 +804,10 @@ fi %endif %changelog +* Tue Sep 5 2023 Jaroslav Škarvada - 2:3.8.2-1 +- New version + Resolves: rhbz#2236828 + * Mon Aug 14 2023 Jaroslav Škarvada - 2:3.8.1-5 - Use systemd-sysusers, original patch by Jonathan Wright diff --git a/sources b/sources index 8fc247a..1491640 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.8.1.tar.gz) = 9eb91f2baab327de22dd55fc5ff398de74856e30be461282f41b1801301873881a8f40ce061c16e0505d51d96aaf0eff8d0ac660e5f6c70c6125133f64a4ee80 +SHA512 (postfix-3.8.2.tar.gz) = 1c441c95bcadee6fc038eb5cb826a686a8bd98b0c78afbc36fdcee01ca0b1c7071036542c729ac345ef8f1e6fb42211452da802e86048967ebc77774dea7752d From 6a2621e4d73d59337dc64ba45922132286b841a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 9 Oct 2023 18:22:23 +0200 Subject: [PATCH 068/108] Drop libdb for RHEL>9 Related: rhbz#1788480 --- postfix-etc-init.d-postfix | 17 +++++++++----- postfix.aliasesdb | 17 +++++++++----- postfix.spec | 46 ++++++++++++++++++++++++++++++++++---- 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/postfix-etc-init.d-postfix b/postfix-etc-init.d-postfix index c609b0a..52bd7bd 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 8c0156e..863b405 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 f9ef5a1..c784d14 100644 --- a/postfix.spec +++ b/postfix.spec @@ -1,6 +1,11 @@ # plugins have unresolvable symbols in compile time %undefine _strict_symbol_defs_build +%if 0%{?rhel} < 10 +%bcond_without db +%else +%bcond_with db +%endif %bcond_without mysql %bcond_without pgsql %bcond_without sqlite @@ -13,6 +18,12 @@ %bcond_without ipv6 %bcond_without pflogsumm +%if %{without db} && %{with lmdb} +%global defmap_lmdb 1 +%else +%global defmap_lmdb 0 +%endif + %global sysv2systemdnvr 2.8.12-2 # hardened build if not overrided @@ -46,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -103,10 +114,19 @@ Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch # Determine the different packages required for building postfix BuildRequires: make -BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel -BuildRequires: systemd-units, libicu-devel -BuildRequires: gcc, m4, findutils +%if %{with db} +BuildRequires: libdb-devel +%endif +BuildRequires: perl-generators +BuildRequires: pkgconfig +BuildRequires: zlib-devel +BuildRequires: systemd-units +BuildRequires: libicu-devel +BuildRequires: gcc +BuildRequires: m4 +BuildRequires: findutils BuildRequires: systemd-rpm-macros +BuildRequires: sed %if 0%{?rhel} < 9 BuildRequires: libnsl2-devel %endif @@ -121,6 +141,10 @@ BuildRequires: libnsl2-devel %{?with_cdb:BuildRequires: tinycdb-devel} %{?with_tls:BuildRequires: openssl-devel} +%if 0%{?defmap_lmdb} +Requires: %{name}-lmdb%{?_isa} = %{epoch}:%{version}-%{release} +%endif + %description Postfix is a Mail Transport Agent (MTA). @@ -258,6 +282,12 @@ for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do touch -r ${f}{,_} && mv -f ${f}{_,} done +# fix default maps +%if 0%{?defmap_lmdb} + sed -i '/^\s*alias_maps\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf + sed -i '/^\s*alias_database\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf +%endif + %build %set_build_flags unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB @@ -268,6 +298,10 @@ AUXLIBS="" AUXLIBS="-lnsl" %endif +%if %{without db} + CCARGS="${CCARGS} -DNO_DB" +%endif + %ifarch s390 s390x ppc CCARGS="${CCARGS} -fsigned-char" %endif @@ -804,6 +838,10 @@ fi %endif %changelog +* Mon Oct 9 2023 Jaroslav Škarvada - 2:3.8.2-2 +- Drop libdb for RHEL>9 + Related: rhbz#1788480 + * Tue Sep 5 2023 Jaroslav Škarvada - 2:3.8.2-1 - New version Resolves: rhbz#2236828 From 917062105008cce583ce0b47688caa606dc9cd89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 2 Nov 2023 13:59:52 +0100 Subject: [PATCH 069/108] Minor spec improvement regarding libdb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- postfix.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index c784d14..895d7b9 100644 --- a/postfix.spec +++ b/postfix.spec @@ -114,9 +114,6 @@ Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch # Determine the different packages required for building postfix BuildRequires: make -%if %{with db} -BuildRequires: libdb-devel -%endif BuildRequires: perl-generators BuildRequires: pkgconfig BuildRequires: zlib-devel @@ -131,6 +128,7 @@ BuildRequires: sed BuildRequires: libnsl2-devel %endif +%{?with_db:BuildRequires: libdb-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_lmdb:BuildRequires: lmdb-devel} %{?with_sasl:BuildRequires: cyrus-sasl-devel} From f2bc8dd8d36029600141bf921b79e2557872dd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 2 Nov 2023 21:12:24 +0100 Subject: [PATCH 070/108] New version Resolves: rhbz#2247553 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 895d7b9..3713509 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.2 -Release: 2%{?dist} +Version: 3.8.3 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) @@ -836,6 +836,10 @@ fi %endif %changelog +* Thu Nov 2 2023 Jaroslav Škarvada - 2:3.8.3-1 +- New version + Resolves: rhbz#2247553 + * Mon Oct 9 2023 Jaroslav Škarvada - 2:3.8.2-2 - Drop libdb for RHEL>9 Related: rhbz#1788480 diff --git a/sources b/sources index 1491640..748ce3c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (postfix-3.8.3.tar.gz) = 38df222cd1fca992bba9eef123ed547386244f41577f0f4eec9c055afd48773736bd9d5857166e31d94e5c55be57a4381f8ce1c8cde80e9b8779bae5e0720aef SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.8.2.tar.gz) = 1c441c95bcadee6fc038eb5cb826a686a8bd98b0c78afbc36fdcee01ca0b1c7071036542c729ac345ef8f1e6fb42211452da802e86048967ebc77774dea7752d From 629eddff09169a643f8a729672246d6944d2e532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 12 Dec 2023 19:19:39 +0100 Subject: [PATCH 071/108] Converted license tag to SPDX --- postfix.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 3713509..8fae092 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,10 +57,10 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org -License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) +License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC Requires(post): systemd systemd-sysv hostname Requires(post): %{_sbindir}/alternatives Requires(post): %{_bindir}/openssl @@ -836,6 +836,9 @@ fi %endif %changelog +* Tue Dec 12 2023 Jaroslav Škarvada - 2:3.8.3-2 +- Converted license tag to SPDX + * Thu Nov 2 2023 Jaroslav Škarvada - 2:3.8.3-1 - New version Resolves: rhbz#2247553 From f1e8416149086937053fc2e1876f20ff6438d931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Jan 2024 23:37:43 +0100 Subject: [PATCH 072/108] New version Resolves: rhbz#2255641 Fixed SMTP smuggling vulnerability Resolves: CVE-2023-51764 --- postfix.spec | 10 ++++++++-- sources | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 8fae092..462a0e5 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.3 -Release: 2%{?dist} +Version: 3.8.4 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,12 @@ fi %endif %changelog +* Tue Jan 2 2024 Jaroslav Škarvada - 2:3.8.4-1 +- New version + Resolves: rhbz#2255641 +- Fixed SMTP smuggling vulnerability + Resolves: CVE-2023-51764 + * Tue Dec 12 2023 Jaroslav Škarvada - 2:3.8.3-2 - Converted license tag to SPDX diff --git a/sources b/sources index 748ce3c..71a9a6a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.8.3.tar.gz) = 38df222cd1fca992bba9eef123ed547386244f41577f0f4eec9c055afd48773736bd9d5857166e31d94e5c55be57a4381f8ce1c8cde80e9b8779bae5e0720aef +SHA512 (postfix-3.8.4.tar.gz) = 5bae3d62e104714aead1fff28a595bab4315227382f53c8dae2a231f4240e31abda19c1e3befc1db4c89bc5d66c9a43830390365aadabdac5cf36b493c5c48c7 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d From 46fa6ce8eb5e31ada6b4389f4e3a5246eff28f4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:10:55 +0000 Subject: [PATCH 073/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 462a0e5..fb1bea2 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,9 @@ fi %endif %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2:3.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 2 2024 Jaroslav Škarvada - 2:3.8.4-1 - New version Resolves: rhbz#2255641 From d7cfa84b6259394830688d00bcf892d6819b1b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 22 Jan 2024 17:35:56 +0100 Subject: [PATCH 074/108] New version Resolves: rhbz#2259469 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index fb1bea2..94d4273 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.4 -Release: 2%{?dist} +Version: 3.8.5 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,10 @@ fi %endif %changelog +* Mon Jan 22 2024 Jaroslav Škarvada - 2:3.8.5-1 +- New version + Resolves: rhbz#2259469 + * Sun Jan 21 2024 Fedora Release Engineering - 2:3.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 71a9a6a..e933b83 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.8.4.tar.gz) = 5bae3d62e104714aead1fff28a595bab4315227382f53c8dae2a231f4240e31abda19c1e3befc1db4c89bc5d66c9a43830390365aadabdac5cf36b493c5c48c7 +SHA512 (postfix-3.8.5.tar.gz) = 26005da5750e7af742f4fc7596ae8320467176e069546c3487418c663b54f56734b4a6541665b8d72d94df2e0fd4f68a2bcc44c50a6d950334d5a5fb2293dff4 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d From e2c24f776de6cf5a6cd7b7643ea983a5b6ba11d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:57:57 +0000 Subject: [PATCH 075/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 94d4273..63def9b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,9 @@ fi %endif %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2:3.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Jaroslav Škarvada - 2:3.8.5-1 - New version Resolves: rhbz#2259469 From 5494e96544265abf0c989184ac3e0bd8b29ba1d8 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 1 Feb 2024 11:13:30 +0000 Subject: [PATCH 076/108] Rebuild for ICU 74 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 63def9b..bbe521f 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,9 @@ fi %endif %changelog +* Thu Feb 01 2024 Pete Walter - 2:3.8.5-3 +- Rebuild for ICU 74 + * Thu Jan 25 2024 Fedora Release Engineering - 2:3.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b4c7cd3ad1dc848715fef4b2aba4555e1584cac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 27 Feb 2024 17:03:27 +0100 Subject: [PATCH 077/108] Dropped mail group configuration / creation, it is provided by setup Resolves: rhbz#2244744 --- postfix.spec | 6 +++++- postfix.sysusers | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index bbe521f..37e83b0 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.8.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,10 @@ fi %endif %changelog +* Tue Feb 27 2024 Jaroslav Škarvada - 2:3.8.5-4 +- Dropped mail group configuration / creation, it is provided by setup + Resolves: rhbz#2244744 + * Thu Feb 01 2024 Pete Walter - 2:3.8.5-3 - Rebuild for ICU 74 diff --git a/postfix.sysusers b/postfix.sysusers index 876b305..7778edf 100644 --- a/postfix.sysusers +++ b/postfix.sysusers @@ -1,4 +1,3 @@ u postfix 89 - /var/spool/postfix /sbin/nologin g postdrop 90 -g mail 12 m postfix mail From dbf6c74d764eae3352d52cb01213ef8930e27c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 5 Mar 2024 14:07:03 +0100 Subject: [PATCH 078/108] New version Resolves: rhbz#2267836 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 37e83b0..60346bb 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.5 -Release: 4%{?dist} +Version: 3.8.6 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -836,6 +836,10 @@ fi %endif %changelog +* Tue Mar 5 2024 Jaroslav Škarvada - 2:3.8.6-1 +- New version + Resolves: rhbz#2267836 + * Tue Feb 27 2024 Jaroslav Škarvada - 2:3.8.5-4 - Dropped mail group configuration / creation, it is provided by setup Resolves: rhbz#2244744 diff --git a/sources b/sources index e933b83..e511a92 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postfix-3.8.5.tar.gz) = 26005da5750e7af742f4fc7596ae8320467176e069546c3487418c663b54f56734b4a6541665b8d72d94df2e0fd4f68a2bcc44c50a6d950334d5a5fb2293dff4 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d +SHA512 (postfix-3.8.6.tar.gz) = 2b227bb6b57e4cf2d727a23762b161f2328959faa4683d63b35543701c3e954be552537eaa14a899c65ec4856d9f91b0398337088a6e2b48c0446fd406be8de4 From 7dd4fb79730c338e7ad26643772bd5722a297bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 7 Mar 2024 17:50:30 +0100 Subject: [PATCH 079/108] New version Resolves: rhbz#2268245 --- ...natives.patch => postfix-3.9.0-alternatives.patch | 0 ...ix-3.4.0-files.patch => postfix-3.9.0-files.patch | 12 ++++++------ postfix.spec | 10 +++++++--- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) rename postfix-3.3.3-alternatives.patch => postfix-3.9.0-alternatives.patch (100%) rename postfix-3.4.0-files.patch => postfix-3.9.0-files.patch (88%) diff --git a/postfix-3.3.3-alternatives.patch b/postfix-3.9.0-alternatives.patch similarity index 100% rename from postfix-3.3.3-alternatives.patch rename to postfix-3.9.0-alternatives.patch diff --git a/postfix-3.4.0-files.patch b/postfix-3.9.0-files.patch similarity index 88% rename from postfix-3.4.0-files.patch rename to postfix-3.9.0-files.patch index ad73553..a7592ba 100644 --- a/postfix-3.4.0-files.patch +++ b/postfix-3.9.0-files.patch @@ -1,8 +1,8 @@ diff --git a/conf/postfix-files b/conf/postfix-files -index 4ed9d1f..19711d2 100644 +index 5a93982..336c07b 100644 --- a/conf/postfix-files +++ b/conf/postfix-files -@@ -83,7 +83,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755 +@@ -84,7 +84,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755 $meta_directory/dynamicmaps.cf.d:d:root:-:755 $meta_directory/dynamicmaps.cf:f:root:-:644 $meta_directory/main.cf.proto:f:root:-:644 @@ -10,7 +10,7 @@ index 4ed9d1f..19711d2 100644 $meta_directory/master.cf.proto:f:root:-:644 $meta_directory/postfix-files.d:d:root:-:755 $meta_directory/postfix-files:f:root:-:644 -@@ -141,18 +140,13 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u +@@ -142,18 +141,13 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u $sendmail_path:f:root:-:755 $newaliases_path:l:$sendmail_path $mailq_path:l:$sendmail_path @@ -29,7 +29,7 @@ index 4ed9d1f..19711d2 100644 $config_directory/main.cf:f:root:-:644:p $config_directory/master.cf:f:root:-:644:p $config_directory/pcre_table:f:root:-:644:o -@@ -165,8 +159,8 @@ $config_directory/postfix-script:f:root:-:755:o +@@ -166,8 +160,8 @@ $config_directory/postfix-script:f:root:-:755:o $config_directory/postfix-script-sgid:f:root:-:755:o $config_directory/postfix-script-nosgid:f:root:-:755:o $config_directory/post-install:f:root:-:755:o @@ -40,7 +40,7 @@ index 4ed9d1f..19711d2 100644 $manpage_directory/man1/postalias.1:f:root:-:644 $manpage_directory/man1/postcat.1:f:root:-:644 $manpage_directory/man1/postconf.1:f:root:-:644 -@@ -180,9 +174,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644 +@@ -181,9 +175,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644 $manpage_directory/man1/postmulti.1:f:root:-:644 $manpage_directory/man1/postqueue.1:f:root:-:644 $manpage_directory/man1/postsuper.1:f:root:-:644 @@ -52,7 +52,7 @@ index 4ed9d1f..19711d2 100644 $manpage_directory/man5/body_checks.5:f:root:-:644 $manpage_directory/man5/bounce.5:f:root:-:644 $manpage_directory/man5/canonical.5:f:root:-:644 -@@ -230,7 +224,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644 +@@ -232,7 +226,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644 $manpage_directory/man8/scache.8:f:root:-:644 $manpage_directory/man8/showq.8:f:root:-:644 $manpage_directory/man8/smtp.8:f:root:-:644 diff --git a/postfix.spec b/postfix.spec index 60346bb..8afb86d 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,7 +56,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.8.6 +Version: 3.9.0 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -97,8 +97,8 @@ Source101: postfix-pam.conf # Patches Patch1: postfix-3.8.0-config.patch -Patch2: postfix-3.4.0-files.patch -Patch3: postfix-3.3.3-alternatives.patch +Patch2: postfix-3.9.0-files.patch +Patch3: postfix-3.9.0-alternatives.patch # probably rhbz#428996 Patch4: postfix-3.8.0-large-fs.patch Patch9: pflogsumm-1.1.5-datecalc.patch @@ -836,6 +836,10 @@ fi %endif %changelog +* Thu Mar 7 2024 Jaroslav Škarvada - 2:3.9.0-1 +- New version + Resolves: rhbz#2268245 + * Tue Mar 5 2024 Jaroslav Škarvada - 2:3.8.6-1 - New version Resolves: rhbz#2267836 diff --git a/sources b/sources index e511a92..2154c8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.8.6.tar.gz) = 2b227bb6b57e4cf2d727a23762b161f2328959faa4683d63b35543701c3e954be552537eaa14a899c65ec4856d9f91b0398337088a6e2b48c0446fd406be8de4 +SHA512 (postfix-3.9.0.tar.gz) = 46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324 From 0d8d1ab875e2f9c6b54640ca07aa3910d278257b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Apr 2024 16:06:25 +0200 Subject: [PATCH 080/108] Added man8/smtp.8.gz to alternatives Resolves: rhbz#2274402 --- postfix-3.9.0-alternatives.patch | 5 +++-- postfix-3.9.0-files.patch | 8 +++++--- postfix.spec | 22 ++++++++++++++-------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/postfix-3.9.0-alternatives.patch b/postfix-3.9.0-alternatives.patch index 2c3ba18..d384239 100644 --- a/postfix-3.9.0-alternatives.patch +++ b/postfix-3.9.0-alternatives.patch @@ -1,8 +1,8 @@ diff --git a/conf/post-install b/conf/post-install -index 25ef7e6..4fd6434 100644 +index ed7c79a..c647f81 100644 --- a/conf/post-install +++ b/conf/post-install -@@ -537,6 +537,17 @@ test -n "$create" && { +@@ -541,6 +541,18 @@ test -n "$create" && { case $path in no|no/*) continue;; esac @@ -15,6 +15,7 @@ index 25ef7e6..4fd6434 100644 + /usr/share/man/man1/mailq.1.gz) path=/usr/share/man/man1/mailq.postfix.1.gz ;; + /usr/share/man/man1/newaliases.1.gz) path=/usr/share/man/man1/newaliases.postfix.1.gz ;; + /usr/share/man/man5/aliases.5.gz) path=/usr/share/man/man5/aliases.postfix.5.gz ;; ++ /usr/share/man/man8/smtp.8.gz) path=/usr/share/man/man8/smtp.postfix.8.gz ;; + /usr/share/man/man8/smtpd.8.gz) path=/usr/share/man/man8/smtpd.postfix.8.gz ;; + esac # Pick up the flags. diff --git a/postfix-3.9.0-files.patch b/postfix-3.9.0-files.patch index a7592ba..03ae645 100644 --- a/postfix-3.9.0-files.patch +++ b/postfix-3.9.0-files.patch @@ -1,5 +1,5 @@ diff --git a/conf/postfix-files b/conf/postfix-files -index 5a93982..336c07b 100644 +index 5a93982..b843fec 100644 --- a/conf/postfix-files +++ b/conf/postfix-files @@ -84,7 +84,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755 @@ -52,11 +52,13 @@ index 5a93982..336c07b 100644 $manpage_directory/man5/body_checks.5:f:root:-:644 $manpage_directory/man5/bounce.5:f:root:-:644 $manpage_directory/man5/canonical.5:f:root:-:644 -@@ -232,7 +226,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644 +@@ -231,8 +225,8 @@ $manpage_directory/man8/qmgr.8:f:root:-:644 + $manpage_directory/man8/qmqpd.8:f:root:-:644 $manpage_directory/man8/scache.8:f:root:-:644 $manpage_directory/man8/showq.8:f:root:-:644 - $manpage_directory/man8/smtp.8:f:root:-:644 +-$manpage_directory/man8/smtp.8:f:root:-:644 -$manpage_directory/man8/smtpd.8:f:root:-:644 ++$manpage_directory/man8/smtp.postfix.8:f:root:-:644 +$manpage_directory/man8/smtpd.postfix.8:f:root:-:644 $manpage_directory/man8/spawn.8:f:root:-:644 $manpage_directory/man8/tlsproxy.8:f:root:-:644 diff --git a/postfix.spec b/postfix.spec index 8afb86d..64b1ef7 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -377,7 +377,7 @@ make -f Makefile.init makefiles shared=yes dynamicmaps=yes \ # install postfix into $RPM_BUILD_ROOT # Move stuff around so we don't conflict with sendmail -for i in man1/mailq.1 man1/newaliases.1 man1/sendmail.1 man5/aliases.5 man8/smtpd.8; do +for i in man1/mailq.1 man1/newaliases.1 man1/sendmail.1 man5/aliases.5 man8/smtp{,d}.8; do dest=$(echo $i | sed 's|\.[1-9]$|.postfix\0|') mv man/$i man/$dest sed -i "s|^\.so $i|\.so $dest|" man/man?/*.[1-9] @@ -484,7 +484,7 @@ touch $RPM_BUILD_ROOT%{_var}/lib/misc/postfix.aliasesdb-stamp # prepare alternatives ghosts for i in %{postfix_command_dir}/sendmail %{_bindir}/{mailq,newaliases,rmail} \ %{_sysconfdir}/pam.d/smtp %{_prefix}/lib/sendmail \ - %{_mandir}/{man1/{mailq.1,newaliases.1},man5/aliases.5,man8/{sendmail.8,smtpd.8}} + %{_mandir}/{man1/{mailq.1,newaliases.1},man5/aliases.5,man8/{sendmail.8,smtp{,d}.8}} do touch $RPM_BUILD_ROOT$i done @@ -529,6 +529,7 @@ ALTERNATIVES_DOCS="" --slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.postfix.1.gz --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/sendmail.postfix.1.gz --slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.postfix.5.gz + --slave %{_mandir}/man8/smtp.8.gz mta-smtpman %{_mandir}/man8/smtp.postfix.8.gz' --slave %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz' %{_sbindir}/alternatives --install %{postfix_command_dir}/sendmail mta %{postfix_command_dir}/sendmail.postfix 60 \ @@ -573,10 +574,10 @@ exit 0 # Add user and groups if necessary %sysusers_create_compat %{SOURCE6} -# hack, to turn man8/smtpd.8.gz into alternatives symlink (part of the rhbz#1051180 fix) -# this could be probably dropped in f23+ -if [ -e %{_mandir}/man8/smtpd.8.gz ]; then - [ -h %{_mandir}/man8/smtpd.8.gz ] || rm -f %{_mandir}/man8/smtpd.8.gz +# hack, to turn man8/smtp.8.gz into alternatives symlink (part of the rhbz#2274402 fix) +# this could be probably dropped in f44+ +if [ -e %{_mandir}/man8/smtp.8.gz ]; then + [ -h %{_mandir}/man8/smtp.8.gz ] || rm -f %{_mandir}/man8/smtp.8.gz fi exit 0 @@ -688,7 +689,7 @@ fi %attr(0644, root, root) %{_mandir}/man5/*.postfix.5* %attr(0644, root, root) %{_mandir}/man8/[a-qt-v]*.8* %attr(0644, root, root) %{_mandir}/man8/s[ch-lnp]*.8* -%attr(0644, root, root) %{_mandir}/man8/smtp.8* +%attr(0644, root, root) %{_mandir}/man8/smtp.postfix.8* %attr(0644, root, root) %{_mandir}/man8/smtpd.postfix.8* %attr(0755, root, root) %{postfix_command_dir}/smtp-sink @@ -745,6 +746,7 @@ fi %ghost %{_mandir}/man1/newaliases.1.gz %ghost %{_mandir}/man5/aliases.5.gz %ghost %{_mandir}/man8/sendmail.8.gz +%ghost %{_mandir}/man8/smtp.8.gz %ghost %{_mandir}/man8/smtpd.8.gz %ghost %attr(0755, root, root) %{_bindir}/mailq @@ -836,6 +838,10 @@ fi %endif %changelog +* Thu Apr 11 2024 Jaroslav Škarvada - 2:3.9.0-2 +- Added man8/smtp.8.gz to alternatives + Resolves: rhbz#2274402 + * Thu Mar 7 2024 Jaroslav Škarvada - 2:3.9.0-1 - New version Resolves: rhbz#2268245 From bf9c337d2b636872cba876effa340a7f124cf411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Apr 2024 18:15:34 +0200 Subject: [PATCH 081/108] Fixed typo in alternatives Related: rhbz#2274402 --- postfix.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 64b1ef7..5940344 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -529,8 +529,8 @@ ALTERNATIVES_DOCS="" --slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.postfix.1.gz --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/sendmail.postfix.1.gz --slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.postfix.5.gz - --slave %{_mandir}/man8/smtp.8.gz mta-smtpman %{_mandir}/man8/smtp.postfix.8.gz' - --slave %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz' + --slave %{_mandir}/man8/smtp.8.gz mta-smtpman %{_mandir}/man8/smtp.postfix.8.gz + --slave %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz %{_sbindir}/alternatives --install %{postfix_command_dir}/sendmail mta %{postfix_command_dir}/sendmail.postfix 60 \ --slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.postfix \ @@ -838,6 +838,10 @@ fi %endif %changelog +* Thu Apr 11 2024 Jaroslav Škarvada - 2:3.9.0-3 +- Fixed typo in alternatives + Related: rhbz#2274402 + * Thu Apr 11 2024 Jaroslav Škarvada - 2:3.9.0-2 - Added man8/smtp.8.gz to alternatives Resolves: rhbz#2274402 From 7f2afe66cd301cdf91a0b93c0b0e36cc52c384a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 12 Apr 2024 15:16:45 +0200 Subject: [PATCH 082/108] Fixed closing quote in alternatives Related: rhbz#2274402 --- postfix.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 5940344..e135a68 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -530,7 +530,7 @@ ALTERNATIVES_DOCS="" --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/sendmail.postfix.1.gz --slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.postfix.5.gz --slave %{_mandir}/man8/smtp.8.gz mta-smtpman %{_mandir}/man8/smtp.postfix.8.gz - --slave %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz + --slave %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz' %{_sbindir}/alternatives --install %{postfix_command_dir}/sendmail mta %{postfix_command_dir}/sendmail.postfix 60 \ --slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.postfix \ @@ -838,6 +838,10 @@ fi %endif %changelog +* Fri Apr 12 2024 Jaroslav Škarvada - 2:3.9.0-4 +- Fixed closing quote in alternatives + Related: rhbz#2274402 + * Thu Apr 11 2024 Jaroslav Škarvada - 2:3.9.0-3 - Fixed typo in alternatives Related: rhbz#2274402 From 9967419b85ed38a8ecb433953910764c1dfcacb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 13 Apr 2024 12:04:15 +0200 Subject: [PATCH 083/108] Add compat sbin Provides In preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. About a dozen packages require /usr/sbin/sendmail. php-phpmailer6 has BuildRequires: /usr/sbin/smtp-sink. Also, use macro instead of hardcoding "sbindir", so that it becomes /usr/bin automatically when the macro definition is updated. --- postfix.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index e135a68..14e0cba 100644 --- a/postfix.spec +++ b/postfix.spec @@ -143,6 +143,14 @@ BuildRequires: libnsl2-devel Requires: %{name}-lmdb%{?_isa} = %{epoch}:%{version}-%{release} %endif +%if "%{_sbindir}" == "%{_bindir}" +# Compat symlinks for Requires in other packages. +# We rely on filesystem to create the symlinks for us. +Requires: filesystem(unmerged-sbin-symlinks) +Provides: /usr/sbin/sendmail +Provides: /usr/sbin/smtp-sink +%endif + %description Postfix is a Mail Transport Agent (MTA). @@ -474,9 +482,7 @@ rm -f $RPM_BUILD_ROOT%{postfix_config_dir}/aliases # create /usr/lib/sendmail mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib -pushd $RPM_BUILD_ROOT%{_prefix}/lib -ln -sf ../sbin/sendmail.postfix . -popd +ln -sf --relative $RPM_BUILD_ROOT%{_sbindir}/sendmail.postfix $RPM_BUILD_ROOT%{_prefix}/lib/ mkdir -p $RPM_BUILD_ROOT%{_var}/lib/misc touch $RPM_BUILD_ROOT%{_var}/lib/misc/postfix.aliasesdb-stamp From aa0f226f942f521863b0829a367844c1464d9ddc Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 084/108] Eliminate use of obsolete %patchN syntax (#2283636) --- postfix.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/postfix.spec b/postfix.spec index 14e0cba..5fc193d 100644 --- a/postfix.spec +++ b/postfix.spec @@ -259,10 +259,10 @@ maps with Postfix, you need this. %prep %setup -q # Apply obligatory patches -%patch1 -p1 -b .config -%patch2 -p1 -b .files -%patch3 -p1 -b .alternatives -%patch4 -p1 -b .large-fs +%patch -P1 -p1 -b .config +%patch -P2 -p1 -b .files +%patch -P3 -p1 -b .alternatives +%patch -P4 -p1 -b .large-fs # Change DEF_SHLIB_DIR according to build host sed -i \ @@ -272,12 +272,12 @@ src/global/mail_params.h %if %{with pflogsumm} gzip -dc %{SOURCE53} | tar xf - pushd pflogsumm-%{pflogsumm_ver} -%patch9 -p1 -b .datecalc -%patch10 -p1 -b .ipv6-warnings-fix +%patch -P9 -p1 -b .datecalc +%patch -P10 -p1 -b .ipv6-warnings-fix popd %endif -%patch11 -p1 -b .chroot-example-fix -%patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix +%patch -P11 -p1 -b .chroot-example-fix +%patch -P13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix # Backport 3.8-20221006 fix for uname -r detection sed -i makedefs -e '\@Linux\.@s|345|3456|' From db003f90d8ce21c82cff01150c51f1c3b73a2702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jul 2024 13:48:32 +0200 Subject: [PATCH 085/108] Rebuilt for the bin-sbin merge https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 5fc193d..25d7173 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -844,6 +844,9 @@ fi %endif %changelog +* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 2:3.9.0-5 +- Rebuilt for the bin-sbin merge + * Fri Apr 12 2024 Jaroslav Škarvada - 2:3.9.0-4 - Fixed closing quote in alternatives Related: rhbz#2274402 From 9d9c784155cd3d22e2ddf1b4ed88df3872b5adf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jul 2024 14:33:51 +0200 Subject: [PATCH 086/108] Pull in openssl-devel-engine to fix build --- postfix.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/postfix.spec b/postfix.spec index 25d7173..268b1f8 100644 --- a/postfix.spec +++ b/postfix.spec @@ -138,6 +138,9 @@ BuildRequires: libnsl2-devel %{?with_sqlite:BuildRequires: sqlite-devel} %{?with_cdb:BuildRequires: tinycdb-devel} %{?with_tls:BuildRequires: openssl-devel} +%if %{?with_tls} && 0%{?fedora} >= 41 +BuildRequires: openssl-devel-engine +%endif %if 0%{?defmap_lmdb} Requires: %{name}-lmdb%{?_isa} = %{epoch}:%{version}-%{release} From c2344f2115036c3ae4a36996954443ef2bb8805f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:18:17 +0000 Subject: [PATCH 087/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 268b1f8..4219c2b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -847,6 +847,9 @@ fi %endif %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2:3.9.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 2:3.9.0-5 - Rebuilt for the bin-sbin merge From 7235852485bb4452cd2f909d5ff9cbb6c451e08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 25 Jul 2024 12:11:56 +0200 Subject: [PATCH 088/108] Explicitly set default_database_type if lmdb map is used --- postfix.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 4219c2b..caf8c65 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -295,6 +295,8 @@ done %if 0%{?defmap_lmdb} sed -i '/^\s*alias_maps\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf sed -i '/^\s*alias_database\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf + echo >> conf/main.cf + echo "default_database_type = lmdb" >> conf/main.cf %endif %build @@ -847,6 +849,9 @@ fi %endif %changelog +* Thu Jul 25 2024 Jaroslav Škarvada - 2:3.9.0-7 +- Explicitly set default_database_type if lmdb map is used + * Fri Jul 19 2024 Fedora Release Engineering - 2:3.9.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 979433fd55a9ab13420321454b157f8fcd01d6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 25 Jul 2024 17:51:06 +0200 Subject: [PATCH 089/108] Fixed postlog RPM verification --- postfix.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index caf8c65..ffa4332 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -714,7 +714,7 @@ fi %attr(0755, root, root) %{postfix_command_dir}/postfix %attr(0755, root, root) %{postfix_command_dir}/postkick %attr(0755, root, root) %{postfix_command_dir}/postlock -%attr(0755, root, root) %{postfix_command_dir}/postlog +%attr(2755, root, %{maildrop_group}) %{postfix_command_dir}/postlog %attr(0755, root, root) %{postfix_command_dir}/postmap %attr(0755, root, root) %{postfix_command_dir}/postmulti %attr(2755, root, %{maildrop_group}) %{postfix_command_dir}/postqueue @@ -849,6 +849,9 @@ fi %endif %changelog +* Thu Jul 25 2024 Jaroslav Škarvada - 2:3.9.0-8 +- Fixed postlog RPM verification + * Thu Jul 25 2024 Jaroslav Škarvada - 2:3.9.0-7 - Explicitly set default_database_type if lmdb map is used From 46307bcec61b708b24c0d73afc88678b08219536 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 8 Sep 2024 16:23:50 -0400 Subject: [PATCH 090/108] Avoid openssl-devel-engine dependency The ENGINE_* APIs are not used here, and the header is not available by default in Fedora 41 and RHEL 10: https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine --- postfix-3.9.0-openssl-no-engine.patch | 15 +++++++++++++++ postfix.spec | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 postfix-3.9.0-openssl-no-engine.patch diff --git a/postfix-3.9.0-openssl-no-engine.patch b/postfix-3.9.0-openssl-no-engine.patch new file mode 100644 index 0000000..f19ae39 --- /dev/null +++ b/postfix-3.9.0-openssl-no-engine.patch @@ -0,0 +1,15 @@ +diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c +index b474a40..9f633f7 100644 +--- a/src/posttls-finger/posttls-finger.c ++++ b/src/posttls-finger/posttls-finger.c +@@ -414,7 +414,9 @@ + + #ifdef USE_TLS + #include +-#include ++#include ++#include ++#include + #endif + + /* diff --git a/postfix.spec b/postfix.spec index ffa4332..93447ea 100644 --- a/postfix.spec +++ b/postfix.spec @@ -107,6 +107,8 @@ Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch # rhbz#1931403, sent upstream Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch +# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +Patch14: postfix-3.9.0-openssl-no-engine.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -138,9 +140,6 @@ BuildRequires: libnsl2-devel %{?with_sqlite:BuildRequires: sqlite-devel} %{?with_cdb:BuildRequires: tinycdb-devel} %{?with_tls:BuildRequires: openssl-devel} -%if %{?with_tls} && 0%{?fedora} >= 41 -BuildRequires: openssl-devel-engine -%endif %if 0%{?defmap_lmdb} Requires: %{name}-lmdb%{?_isa} = %{epoch}:%{version}-%{release} @@ -281,6 +280,7 @@ popd %endif %patch -P11 -p1 -b .chroot-example-fix %patch -P13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix +%patch -P14 -p1 -b .openssl-no-engine # Backport 3.8-20221006 fix for uname -r detection sed -i makedefs -e '\@Linux\.@s|345|3456|' From 2439c37dacb925b26dfa1dbf60d837d542c1cd66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 5 Dec 2024 12:36:01 +0100 Subject: [PATCH 091/108] New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 New version Resolves: rhbz#2330454 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 93447ea..b106229 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.9.0 -Release: 8%{?dist} +Version: 3.9.1 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,10 @@ fi %endif %changelog +* Thu Dec 5 2024 Jaroslav Škarvada - 2:3.9.1-1 +- New version + Resolves: rhbz#2330454 + * Thu Jul 25 2024 Jaroslav Škarvada - 2:3.9.0-8 - Fixed postlog RPM verification diff --git a/sources b/sources index 2154c8c..a90f33b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.9.0.tar.gz) = 46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324 +SHA512 (postfix-3.9.1.tar.gz) = 79109d9f19e51d9089a0f2b5c6134972148a6e1a7e385aabc79c0a32e09c78715ad94a93ae3eca1171b770c62d6bf3b8e079b94183ae851001db1a0cf21fff15 From 069ee8017f377ad220b807a17bf6d7ef01c01a5a Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:38:21 +0000 Subject: [PATCH 092/108] Rebuild for ICU 76 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index b106229..ed82738 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,9 @@ fi %endif %changelog +* Sun Dec 08 2024 Pete Walter - 2:3.9.1-2 +- Rebuild for ICU 76 + * Thu Dec 5 2024 Jaroslav Škarvada - 2:3.9.1-1 - New version Resolves: rhbz#2330454 From 00a7ff6259df387710df39eb6e58da1778650d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:39:35 +0100 Subject: [PATCH 093/108] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index ed82738..af9ff77 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,9 @@ fi %endif %changelog +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2:3.9.1-3 +- Rebuilt for the bin-sbin merge (2nd attempt) + * Sun Dec 08 2024 Pete Walter - 2:3.9.1-2 - Rebuild for ICU 76 From 0cb102fcd6b98aa4e734a876582a1f0ed9fdf4ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:37:13 +0000 Subject: [PATCH 094/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index af9ff77..2cb7b95 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,9 @@ fi %endif %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2:3.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2:3.9.1-3 - Rebuilt for the bin-sbin merge (2nd attempt) From cf122c7cff7e0941a83097be55cc10799c1a933f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 4 Mar 2025 19:46:03 -0500 Subject: [PATCH 095/108] Fix build with GCC 15 GCC 15 defaults to C23, in which `bool` is a keyword and not ABI compatible with int, which this code relies upon. This has yet to be fixed upstream, so compiling for an earlier standard is the simplest solution. --- postfix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 2cb7b95..6d1c411 100644 --- a/postfix.spec +++ b/postfix.spec @@ -302,7 +302,7 @@ done %build %set_build_flags unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB -CCARGS="-fPIC -fcommon" +CCARGS="-fPIC -fcommon -std=gnu17" %if 0%{?rhel} >= 9 AUXLIBS="" %else From a6b853cc3230ed496cda63a3b1bb5a4a87ce65bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 6 Mar 2025 14:44:38 +0100 Subject: [PATCH 096/108] New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 New version Resolves: rhbz#2346039 --- postfix.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 6d1c411..00dd7a3 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.9.1 -Release: 4%{?dist} +Version: 3.10.1 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,10 @@ fi %endif %changelog +* Thu Mar 6 2025 Jaroslav Škarvada - 2:3.10.1-1 +- New version + Resolves: rhbz#2346039 + * Sat Jan 18 2025 Fedora Release Engineering - 2:3.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index a90f33b..9ebeb11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.9.1.tar.gz) = 79109d9f19e51d9089a0f2b5c6134972148a6e1a7e385aabc79c0a32e09c78715ad94a93ae3eca1171b770c62d6bf3b8e079b94183ae851001db1a0cf21fff15 +SHA512 (postfix-3.10.1.tar.gz) = f977668a3475493c679884fb06e7b6aee33e082b2a828e63e1f67515907ded7b406468d2bb03685275b9cde50ac04c03415876119401d0ca45c5b28ca0277cfe From ef0ff458256534983298fe2ea69a9d690202c9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 24 Apr 2025 14:20:19 +0200 Subject: [PATCH 097/108] New version Resolves: rhbz#2361704 Switched to the GCC default standard (now C23) --- postfix.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 00dd7a3..6fa2cfd 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,7 +56,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.10.1 +Version: 3.10.2 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -302,7 +302,7 @@ done %build %set_build_flags unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB -CCARGS="-fPIC -fcommon -std=gnu17" +CCARGS="-fPIC -fcommon" %if 0%{?rhel} >= 9 AUXLIBS="" %else @@ -849,6 +849,11 @@ fi %endif %changelog +* Thu Apr 24 2025 Jaroslav Škarvada - 2:3.10.2-1 +- New version + Resolves: rhbz#2361704 +- Switched to the GCC default standard (now C23) + * Thu Mar 6 2025 Jaroslav Škarvada - 2:3.10.1-1 - New version Resolves: rhbz#2346039 diff --git a/sources b/sources index 9ebeb11..cb4f2a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.10.1.tar.gz) = f977668a3475493c679884fb06e7b6aee33e082b2a828e63e1f67515907ded7b406468d2bb03685275b9cde50ac04c03415876119401d0ca45c5b28ca0277cfe +SHA512 (postfix-3.10.2.tar.gz) = 722a29613beae57caacbda1180c7882bfdfe7b948fd64acecbe704b0dbcd1989c59b73adfa6c686a51ad9d4c7a51650b7287b185515de2eaa1a6355127ca634f From 0fe7b8831828f5fe6b296fbb60d7af8efcc597b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 25 Apr 2025 00:57:47 +0200 Subject: [PATCH 098/108] Still used -std=gnu17 workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- postfix.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 6fa2cfd..5021270 100644 --- a/postfix.spec +++ b/postfix.spec @@ -302,7 +302,7 @@ done %build %set_build_flags unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB -CCARGS="-fPIC -fcommon" +CCARGS="-fPIC -fcommon -std=gnu17" %if 0%{?rhel} >= 9 AUXLIBS="" %else @@ -852,7 +852,6 @@ fi * Thu Apr 24 2025 Jaroslav Škarvada - 2:3.10.2-1 - New version Resolves: rhbz#2361704 -- Switched to the GCC default standard (now C23) * Thu Mar 6 2025 Jaroslav Škarvada - 2:3.10.1-1 - New version From 392ad127bde4494bc412e026ea9a87eea574a008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 9 May 2025 16:12:25 +0200 Subject: [PATCH 099/108] Use modern option name for "follower" symlinks Also, drop full path from call to alternatives. The full path is not needed for anything. --- postfix.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/postfix.spec b/postfix.spec index 5021270..aee389b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -536,19 +536,19 @@ popd readme_directory=%{postfix_readme_dir} &> /dev/null ALTERNATIVES_DOCS="" -[ "%%{_excludedocs}" = 1 ] || ALTERNATIVES_DOCS='--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.postfix.1.gz - --slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.postfix.1.gz - --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/sendmail.postfix.1.gz - --slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.postfix.5.gz - --slave %{_mandir}/man8/smtp.8.gz mta-smtpman %{_mandir}/man8/smtp.postfix.8.gz - --slave %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz' +[ "%%{_excludedocs}" = 1 ] || ALTERNATIVES_DOCS='--follower %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.postfix.1.gz + --follower %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.postfix.1.gz + --follower %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/sendmail.postfix.1.gz + --follower %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.postfix.5.gz + --follower %{_mandir}/man8/smtp.8.gz mta-smtpman %{_mandir}/man8/smtp.postfix.8.gz + --follower %{_mandir}/man8/smtpd.8.gz mta-smtpdman %{_mandir}/man8/smtpd.postfix.8.gz' -%{_sbindir}/alternatives --install %{postfix_command_dir}/sendmail mta %{postfix_command_dir}/sendmail.postfix 60 \ - --slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.postfix \ - --slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.postfix \ - --slave %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.postfix \ - --slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.postfix \ - --slave %{_prefix}/lib/sendmail mta-sendmail %{_prefix}/lib/sendmail.postfix \ +alternatives --install %{postfix_command_dir}/sendmail mta %{postfix_command_dir}/sendmail.postfix 60 \ + --follower %{_bindir}/mailq mta-mailq %{_bindir}/mailq.postfix \ + --follower %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.postfix \ + --follower %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.postfix \ + --follower %{_bindir}/rmail mta-rmail %{_bindir}/rmail.postfix \ + --follower %{_prefix}/lib/sendmail mta-sendmail %{_prefix}/lib/sendmail.postfix \ $ALTERNATIVES_DOCS \ --initscript postfix @@ -597,7 +597,7 @@ exit 0 %systemd_preun %{name}.service if [ "$1" = 0 ]; then - %{_sbindir}/alternatives --remove mta %{postfix_command_dir}/sendmail.postfix + alternatives --remove mta %{postfix_command_dir}/sendmail.postfix fi exit 0 From 65a051a0ae8633ae1b080eeb8b2953813e46510b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 9 May 2025 16:14:25 +0200 Subject: [PATCH 100/108] Make sure the /usr/sbin/sendmail symlink is created on unmerged systems --- postfix.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index aee389b..5a9219c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -552,6 +552,11 @@ alternatives --install %{postfix_command_dir}/sendmail mta %{postfix_command_dir $ALTERNATIVES_DOCS \ --initscript postfix +# Make sure that /usr/sbin/sendmail is not missing, if /usr/sbin is a +# directory. The symlink will only be created if there is no symlink +# or file already. +test -h /usr/sbin || ln -s ../bin/sendmail /usr/sbin/sendmail 2>/dev/null || : + %if %{with sasl} # Move sasl config to new location if [ -f %{_libdir}/sasl2/smtpd.conf ]; then @@ -849,6 +854,10 @@ fi %endif %changelog +* Thu May 08 2025 Zbigniew Jędrzejewski-Szmek - 2:3.10.2-2 +- Make sure the /usr/sbin/sendmail symlink is created on unmerged systems + Resolves: rhbz#2360491 + * Thu Apr 24 2025 Jaroslav Škarvada - 2:3.10.2-1 - New version Resolves: rhbz#2361704 From 8d5320c3f5eb7e48f349119113878fc567b36473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 5 Jun 2025 19:11:37 +0200 Subject: [PATCH 101/108] Updated pflogsumm to 1.1.6 Resolves: rhbz#2368396 --- pflogsumm-1.1.5-datecalc.patch | 15 ------------ pflogsumm-1.1.5-ipv6-warnings-fix.patch | 13 ----------- ...umm-1.1.6-syslog-name-underscore-fix.patch | 8 +++---- ...onfig.patch => postfix-3.10.2-config.patch | 6 ++--- postfix.spec | 23 +++++++++---------- sources | 2 +- 6 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 pflogsumm-1.1.5-datecalc.patch delete mode 100644 pflogsumm-1.1.5-ipv6-warnings-fix.patch rename pflogsumm-1.1.5-syslog-name-underscore-fix.patch => pflogsumm-1.1.6-syslog-name-underscore-fix.patch (65%) rename postfix-3.8.0-config.patch => postfix-3.10.2-config.patch (97%) diff --git a/pflogsumm-1.1.5-datecalc.patch b/pflogsumm-1.1.5-datecalc.patch deleted file mode 100644 index 77ca806..0000000 --- a/pflogsumm-1.1.5-datecalc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git pflogsumm-1.1.5/pflogsumm.pl pflogsumm-1.1.5/pflogsumm.pl -index 31de5bd..36384dd 100755 ---- pflogsumm-1.1.5/pflogsumm.pl -+++ pflogsumm-1.1.5/pflogsumm.pl -@@ -398,8 +398,8 @@ Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.5 - use strict; - use locale; - use Getopt::Long; --eval { require Date::Calc }; --my $hasDateCalc = $@ ? 0 : 1; -+require Date::Calc; -+my $hasDateCalc = 1; - - my $mailqCmd = "mailq"; - my $release = "1.1.5"; diff --git a/pflogsumm-1.1.5-ipv6-warnings-fix.patch b/pflogsumm-1.1.5-ipv6-warnings-fix.patch deleted file mode 100644 index 51e759e..0000000 --- a/pflogsumm-1.1.5-ipv6-warnings-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git pflogsumm-1.1.5/pflogsumm.pl pflogsumm-1.1.5/pflogsumm.pl -index 36384dd..eb527d0 100755 ---- pflogsumm-1.1.5/pflogsumm.pl -+++ pflogsumm-1.1.5/pflogsumm.pl -@@ -1536,7 +1536,7 @@ sub gimme_domain { - # split domain/ipaddr into separates - # newer versions of Postfix have them "dom.ain[i.p.add.ress]" - # older versions of Postfix have them "dom.ain/i.p.add.ress" -- unless((($domain, $ipAddr) = /^([^\[]+)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2 || -+ unless((($domain, $ipAddr) = /^([^\[]+)\[((?:\d{1,3}\.){3}\d{1,3}|[0-9a-f:]+)\]/) == 2 || - (($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/i) == 2) { - # more exhaustive method - ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/; diff --git a/pflogsumm-1.1.5-syslog-name-underscore-fix.patch b/pflogsumm-1.1.6-syslog-name-underscore-fix.patch similarity index 65% rename from pflogsumm-1.1.5-syslog-name-underscore-fix.patch rename to pflogsumm-1.1.6-syslog-name-underscore-fix.patch index 9279bcc..d5e461d 100644 --- a/pflogsumm-1.1.5-syslog-name-underscore-fix.patch +++ b/pflogsumm-1.1.6-syslog-name-underscore-fix.patch @@ -1,7 +1,7 @@ -diff --git a/pflogsumm-1.1.5/pflogsumm.pl b/pflogsumm-1.1.5/pflogsumm.pl -index eb527d0..7e26206 100755 ---- a/pflogsumm-1.1.5/pflogsumm.pl -+++ b/pflogsumm-1.1.5/pflogsumm.pl +diff --git a/pflogsumm b/pflogsumm +index cb3b8a9..35309f0 100755 +--- a/pflogsumm ++++ b/pflogsumm @@ -503,7 +503,12 @@ $usageMsg = # Accept either "_"s or "-"s in --switches foreach (@ARGV) { diff --git a/postfix-3.8.0-config.patch b/postfix-3.10.2-config.patch similarity index 97% rename from postfix-3.8.0-config.patch rename to postfix-3.10.2-config.patch index f77cdc3..3658cd2 100644 --- a/postfix-3.8.0-config.patch +++ b/postfix-3.10.2-config.patch @@ -1,5 +1,5 @@ diff --git a/conf/main.cf b/conf/main.cf -index 2ee7996..336bd7b 100644 +index 1d2c8c2..1c6d5b8 100644 --- a/conf/main.cf +++ b/conf/main.cf @@ -136,6 +136,10 @@ mail_owner = postfix @@ -123,10 +123,10 @@ index 2ee7996..336bd7b 100644 +# +smtp_tls_security_level = may diff --git a/conf/master.cf b/conf/master.cf -index fd282dd..8d969c6 100644 +index 5abe06c..81ae929 100644 --- a/conf/master.cf +++ b/conf/master.cf -@@ -112,14 +112,14 @@ postlog unix-dgram n - n - 1 postlogd +@@ -116,14 +116,14 @@ postlog unix-dgram n - n - 1 postlogd # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe diff --git a/postfix.spec b/postfix.spec index 5a9219c..dd207a9 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -84,7 +84,7 @@ Source6: postfix.sysusers # Sources 50-99 are upstream [patch] contributions -%define pflogsumm_ver 1.1.5 +%define pflogsumm_ver 1.1.6 # Postfix Log Entry Summarizer: http://jimsun.linxnet.com/postfix_contrib.html Source53: http://jimsun.linxnet.com/downloads/pflogsumm-%{pflogsumm_ver}.tar.gz @@ -96,17 +96,14 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.8.0-config.patch +Patch1: postfix-3.10.2-config.patch Patch2: postfix-3.9.0-files.patch Patch3: postfix-3.9.0-alternatives.patch # probably rhbz#428996 Patch4: postfix-3.8.0-large-fs.patch -Patch9: pflogsumm-1.1.5-datecalc.patch -# rhbz#1384871, sent upstream -Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch -Patch11: postfix-3.4.4-chroot-example-fix.patch # rhbz#1931403, sent upstream -Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch +Patch9: pflogsumm-1.1.6-syslog-name-underscore-fix.patch +Patch11: postfix-3.4.4-chroot-example-fix.patch # https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine Patch14: postfix-3.9.0-openssl-no-engine.patch @@ -274,12 +271,10 @@ src/global/mail_params.h %if %{with pflogsumm} gzip -dc %{SOURCE53} | tar xf - pushd pflogsumm-%{pflogsumm_ver} -%patch -P9 -p1 -b .datecalc -%patch -P10 -p1 -b .ipv6-warnings-fix +%patch -P9 -p1 -b .pflogsumm-1.1.6-syslog-name-underscore-fix popd %endif %patch -P11 -p1 -b .chroot-example-fix -%patch -P13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix %patch -P14 -p1 -b .openssl-no-engine # Backport 3.8-20221006 fix for uname -r detection @@ -474,7 +469,7 @@ find $RPM_BUILD_ROOT%{postfix_doc_dir} -type d | xargs chmod 755 %if %{with pflogsumm} install -c -m 644 pflogsumm-%{pflogsumm_ver}/pflogsumm-faq.txt $RPM_BUILD_ROOT%{postfix_doc_dir}/pflogsumm-faq.txt install -c -m 644 pflogsumm-%{pflogsumm_ver}/pflogsumm.1 $RPM_BUILD_ROOT%{_mandir}/man1/pflogsumm.1 -install -c pflogsumm-%{pflogsumm_ver}/pflogsumm.pl $RPM_BUILD_ROOT%{postfix_command_dir}/pflogsumm +install -c pflogsumm-%{pflogsumm_ver}/pflogsumm $RPM_BUILD_ROOT%{postfix_command_dir}/pflogsumm %endif # install qshape @@ -854,6 +849,10 @@ fi %endif %changelog +* Thu Jun 5 2025 Jaroslav Škarvada - 2:3.10.2-3 +- Updated pflogsumm to 1.1.6 + Resolves: rhbz#2368396 + * Thu May 08 2025 Zbigniew Jędrzejewski-Szmek - 2:3.10.2-2 - Make sure the /usr/sbin/sendmail symlink is created on unmerged systems Resolves: rhbz#2360491 diff --git a/sources b/sources index cb4f2a3..eb5649d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d +SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630 SHA512 (postfix-3.10.2.tar.gz) = 722a29613beae57caacbda1180c7882bfdfe7b948fd64acecbe704b0dbcd1989c59b73adfa6c686a51ad9d4c7a51650b7287b185515de2eaa1a6355127ca634f From 7523aed70a4e7384b178c183a1d39aa9457dc45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 10 Jul 2025 15:52:14 +0200 Subject: [PATCH 102/108] New version Resolves: rhbz#2379297 Updated cyrus-imapd comment in config to point to the correct location Related: RHEL-63089 --- ....10.2-config.patch => postfix-3.10.3-config.patch | 8 +++++--- postfix.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) rename postfix-3.10.2-config.patch => postfix-3.10.3-config.patch (95%) diff --git a/postfix-3.10.2-config.patch b/postfix-3.10.3-config.patch similarity index 95% rename from postfix-3.10.2-config.patch rename to postfix-3.10.3-config.patch index 3658cd2..dfdd06a 100644 --- a/postfix-3.10.2-config.patch +++ b/postfix-3.10.3-config.patch @@ -1,5 +1,5 @@ diff --git a/conf/main.cf b/conf/main.cf -index 1d2c8c2..1c6d5b8 100644 +index 1d2c8c2..7a91139 100644 --- a/conf/main.cf +++ b/conf/main.cf @@ -136,6 +136,10 @@ mail_owner = postfix @@ -40,11 +40,13 @@ index 1d2c8c2..1c6d5b8 100644 #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases # ADDRESS EXTENSIONS (e.g., user+foo) -@@ -488,7 +492,27 @@ unknown_local_recipient_reject_code = 550 +@@ -487,8 +491,28 @@ unknown_local_recipient_reject_code = 550 + # non-UNIX accounts with "User unknown in local recipient table". # # Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" - # listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +-# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. -#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp ++# listen="/var/lib/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp + +# If using the cyrus-imapd IMAP server deliver local mail to the IMAP diff --git a/postfix.spec b/postfix.spec index dd207a9..343a41c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.10.2 -Release: 3%{?dist} +Version: 3.10.3 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -96,7 +96,7 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.10.2-config.patch +Patch1: postfix-3.10.3-config.patch Patch2: postfix-3.9.0-files.patch Patch3: postfix-3.9.0-alternatives.patch # probably rhbz#428996 @@ -849,6 +849,12 @@ fi %endif %changelog +* Thu Jul 10 2025 Jaroslav Škarvada - 2:3.10.3-1 +- New version + Resolves: rhbz#2379297 +- Updated cyrus-imapd comment in config to point to the correct location + Related: RHEL-63089 + * Thu Jun 5 2025 Jaroslav Škarvada - 2:3.10.2-3 - Updated pflogsumm to 1.1.6 Resolves: rhbz#2368396 diff --git a/sources b/sources index eb5649d..d19b631 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630 -SHA512 (postfix-3.10.2.tar.gz) = 722a29613beae57caacbda1180c7882bfdfe7b948fd64acecbe704b0dbcd1989c59b73adfa6c686a51ad9d4c7a51650b7287b185515de2eaa1a6355127ca634f +SHA512 (postfix-3.10.3.tar.gz) = 457f2d49c0845992b19601fb597422190f7506da5edd66eac1b0387e9adb339a65d3822205b1c4e9243d8f0a9a4108eb7cf11fba6b53f366934caf8cd489157c From 4e80d80dc3270e1ef50cdaeaec09305e5d115363 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:03:32 +0000 Subject: [PATCH 103/108] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 343a41c..1a2db05 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,9 @@ fi %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2:3.10.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 10 2025 Jaroslav Škarvada - 2:3.10.3-1 - New version Resolves: rhbz#2379297 From ad919ada0b8f5e6b3ae2c8eff01a184d257d0a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:56:59 +0200 Subject: [PATCH 104/108] Rebuilt for icu 77.1 --- postfix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 1a2db05..d6d9a24 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.10.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -849,6 +849,9 @@ fi %endif %changelog +* Wed Aug 06 2025 František Zatloukal - 2:3.10.3-3 +- Rebuilt for icu 77.1 + * Fri Jul 25 2025 Fedora Release Engineering - 2:3.10.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1c1719b4aaf0c0c73d575fc2800a4813d6f597e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Aug 2025 14:10:55 +0200 Subject: [PATCH 105/108] New version Resolves: rhbz#2389310 --- postfix-3.9.0-openssl-no-engine.patch | 15 --------------- postfix.spec | 11 ++++++----- sources | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 postfix-3.9.0-openssl-no-engine.patch diff --git a/postfix-3.9.0-openssl-no-engine.patch b/postfix-3.9.0-openssl-no-engine.patch deleted file mode 100644 index f19ae39..0000000 --- a/postfix-3.9.0-openssl-no-engine.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c -index b474a40..9f633f7 100644 ---- a/src/posttls-finger/posttls-finger.c -+++ b/src/posttls-finger/posttls-finger.c -@@ -414,7 +414,9 @@ - - #ifdef USE_TLS - #include --#include -+#include -+#include -+#include - #endif - - /* diff --git a/postfix.spec b/postfix.spec index d6d9a24..88c12f8 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,8 +56,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.10.3 -Release: 3%{?dist} +Version: 3.10.4 +Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC @@ -104,8 +104,6 @@ Patch4: postfix-3.8.0-large-fs.patch # rhbz#1931403, sent upstream Patch9: pflogsumm-1.1.6-syslog-name-underscore-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch -# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine -Patch14: postfix-3.9.0-openssl-no-engine.patch # Optional patches - set the appropriate environment variables to include # them when building the package/spec file @@ -275,7 +273,6 @@ pushd pflogsumm-%{pflogsumm_ver} popd %endif %patch -P11 -p1 -b .chroot-example-fix -%patch -P14 -p1 -b .openssl-no-engine # Backport 3.8-20221006 fix for uname -r detection sed -i makedefs -e '\@Linux\.@s|345|3456|' @@ -849,6 +846,10 @@ fi %endif %changelog +* Mon Aug 25 2025 Jaroslav Škarvada - 2:3.10.4-1 +- New version + Resolves: rhbz#2389310 + * Wed Aug 06 2025 František Zatloukal - 2:3.10.3-3 - Rebuilt for icu 77.1 diff --git a/sources b/sources index d19b631..e7f751d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630 -SHA512 (postfix-3.10.3.tar.gz) = 457f2d49c0845992b19601fb597422190f7506da5edd66eac1b0387e9adb339a65d3822205b1c4e9243d8f0a9a4108eb7cf11fba6b53f366934caf8cd489157c +SHA512 (postfix-3.10.4.tar.gz) = da3a581551670ad4aa595ab50a8dd0bbe7d9e93ee354342c778ae1b461aa7bad9a640e4a55e27b025975c47c92f8238c8d281e1ca5bd1579a009d81ce06924d9 From 391874706816b18356aac7bb45359bd8ba58c46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 30 Oct 2025 18:04:50 +0100 Subject: [PATCH 106/108] New version Resolves: rhbz#2406450 Changed protocol for downloading sources from FTP to HTTP (HTTPS isn't supported) --- postfix.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 88c12f8..419e1fb 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,7 +56,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.10.4 +Version: 3.10.5 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -74,7 +74,7 @@ Requires: findutils Requires: policycoreutils Provides: MTA smtpd smtpdaemon server(smtp) -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: README-Postfix-SASL-RedHat.txt @@ -846,6 +846,11 @@ fi %endif %changelog +* Thu Oct 30 2025 Jaroslav Škarvada - 2:3.10.5-1 +- New version + Resolves: rhbz#2406450 +- Changed protocol for downloading sources from FTP to HTTP (HTTPS isn't supported) + * Mon Aug 25 2025 Jaroslav Škarvada - 2:3.10.4-1 - New version Resolves: rhbz#2389310 diff --git a/sources b/sources index e7f751d..178671d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630 -SHA512 (postfix-3.10.4.tar.gz) = da3a581551670ad4aa595ab50a8dd0bbe7d9e93ee354342c778ae1b461aa7bad9a640e4a55e27b025975c47c92f8238c8d281e1ca5bd1579a009d81ce06924d9 +SHA512 (postfix-3.10.5.tar.gz) = 3bec6185f1311f9726c5dc3a902f7e7b9a2e80488bf544805118d212bc1e6496668b60414485331dd0fc807dc1714d0bda6a219e710cdd6c56270a33e1aacabc From f16c090bcbe0c1fa26897e1e99fec946b8f161a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 30 Oct 2025 18:35:38 +0100 Subject: [PATCH 107/108] Updated config patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- postfix-3.10.3-config.patch => postfix-3.10.5-config.patch | 6 ++++-- postfix.spec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) rename postfix-3.10.3-config.patch => postfix-3.10.5-config.patch (97%) diff --git a/postfix-3.10.3-config.patch b/postfix-3.10.5-config.patch similarity index 97% rename from postfix-3.10.3-config.patch rename to postfix-3.10.5-config.patch index dfdd06a..c09a76d 100644 --- a/postfix-3.10.3-config.patch +++ b/postfix-3.10.5-config.patch @@ -1,5 +1,5 @@ diff --git a/conf/main.cf b/conf/main.cf -index 1d2c8c2..7a91139 100644 +index 3687c85..ae3af9e 100644 --- a/conf/main.cf +++ b/conf/main.cf @@ -136,6 +136,10 @@ mail_owner = postfix @@ -81,11 +81,13 @@ index 1d2c8c2..7a91139 100644 #fallback_transport = # The luser_relay parameter specifies an optional destination address -@@ -682,4 +705,41 @@ sample_directory = +@@ -682,6 +705,43 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = -inet_protocols = ipv4 + shlib_directory = /usr/lib/postfix/${mail_version} + meta_directory = /etc/postfix + +# TLS CONFIGURATION +# diff --git a/postfix.spec b/postfix.spec index 419e1fb..cb568c4 100644 --- a/postfix.spec +++ b/postfix.spec @@ -96,7 +96,7 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.10.3-config.patch +Patch1: postfix-3.10.5-config.patch Patch2: postfix-3.9.0-files.patch Patch3: postfix-3.9.0-alternatives.patch # probably rhbz#428996 From 2e824a6f4d3b449afc8e29f9633d100fba581d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Jan 2026 22:55:35 +0100 Subject: [PATCH 108/108] New version Resolves: rhbz#2417154 --- postfix.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index cb568c4..30811de 100644 --- a/postfix.spec +++ b/postfix.spec @@ -56,7 +56,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.10.5 +Version: 3.10.7 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -846,6 +846,10 @@ fi %endif %changelog +* Fri Jan 02 2026 Jaroslav Škarvada - 2:3.10.7-1 +- New version + Resolves: rhbz#2417154 + * Thu Oct 30 2025 Jaroslav Škarvada - 2:3.10.5-1 - New version Resolves: rhbz#2406450 diff --git a/sources b/sources index 178671d..195284e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630 -SHA512 (postfix-3.10.5.tar.gz) = 3bec6185f1311f9726c5dc3a902f7e7b9a2e80488bf544805118d212bc1e6496668b60414485331dd0fc807dc1714d0bda6a219e710cdd6c56270a33e1aacabc +SHA512 (postfix-3.10.7.tar.gz) = 28d7c05bfd6fb15f906c67cca989c4b47640ec631b640943deb66d91e44a6684deb79af95f0d4ba4dd362d9ba59179e5ed268942384e5e35ba472c91cf366e4c