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 01/15] 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 02/15] 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 03/15] 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 04/15] 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 05/15] 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 d928914956a1f2dc2d8f4ba26a23172a6a5ca7ef 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 06/15] 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 6d1c411..47a05e1 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 faac578b81477fe1d146b7cf215b976a20ea670e 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 07/15] 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 47a05e1..2388aa7 100644 --- a/postfix.spec +++ b/postfix.spec @@ -57,7 +57,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 3.9.1 -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 @@ -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 +* Fri May 09 2025 Zbigniew Jedrzejewski-Szmek - 2:3.9.1-5 +- Make sure the /usr/sbin/sendmail symlink is created on unmerged systems + Resolves: rhbz#2360491 + * Sat Jan 18 2025 Fedora Release Engineering - 2:3.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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