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 01/52] 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 02/52] 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 03/52] 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 04/52] 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 05/52] 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 06/52] 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 07/52] 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 08/52] 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 09/52] 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 10/52] 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 11/52] 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 12/52] 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 13/52] 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 14/52] 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 15/52] 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 16/52] 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 17/52] 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 18/52] 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 19/52] 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 20/52] 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 21/52] 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 22/52] 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 23/52] 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 24/52] 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 25/52] 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 26/52] 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 27/52] 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 28/52] 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 29/52] 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 30/52] 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 31/52] 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 32/52] 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 33/52] 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 34/52] 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 35/52] 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 36/52] 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 37/52] 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 38/52] 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 39/52] 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 40/52] 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 41/52] 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 42/52] 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 43/52] 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 44/52] 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 45/52] 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 46/52] 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 47/52] 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 48/52] 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 49/52] 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 50/52] 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 51/52] 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 52/52] 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