Compare commits
13 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e824a6f4d | ||
|
|
f16c090bcb | ||
|
|
3918747068 | ||
|
|
1c1719b4aa | ||
|
|
ad919ada0b | ||
|
|
4e80d80dc3 | ||
|
|
7523aed70a | ||
|
|
8d5320c3f5 | ||
|
|
65a051a0ae | ||
|
|
392ad127bd | ||
|
|
0fe7b88318 | ||
|
|
ef0ff45825 | ||
|
|
a6b853cc32 |
7 changed files with 63 additions and 73 deletions
|
|
@ -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";
|
||||
|
|
@ -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*$/;
|
||||
|
|
@ -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) {
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/conf/main.cf b/conf/main.cf
|
||||
index 2ee7996..336bd7b 100644
|
||||
index 3687c85..ae3af9e 100644
|
||||
--- a/conf/main.cf
|
||||
+++ b/conf/main.cf
|
||||
@@ -136,6 +136,10 @@ mail_owner = postfix
|
||||
|
|
@ -40,11 +40,13 @@ index 2ee7996..336bd7b 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
|
||||
|
|
@ -79,11 +81,13 @@ index 2ee7996..336bd7b 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
|
||||
+#
|
||||
|
|
@ -123,10 +127,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
|
||||
|
|
@ -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 <tls_proxy.h>
|
||||
-#include <openssl/engine.h>
|
||||
+#include <openssl/bio.h>
|
||||
+#include <openssl/ssl.h>
|
||||
+#include <openssl/x509.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
65
postfix.spec
65
postfix.spec
|
|
@ -56,8 +56,8 @@
|
|||
|
||||
Name: postfix
|
||||
Summary: Postfix Mail Transport Agent
|
||||
Version: 3.9.1
|
||||
Release: 5%{?dist}
|
||||
Version: 3.10.7
|
||||
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
|
||||
|
|
@ -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
|
||||
|
|
@ -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,19 +96,14 @@ Source101: postfix-pam.conf
|
|||
|
||||
# Patches
|
||||
|
||||
Patch1: postfix-3.8.0-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
|
||||
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
|
||||
# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine
|
||||
Patch14: postfix-3.9.0-openssl-no-engine.patch
|
||||
Patch9: pflogsumm-1.1.6-syslog-name-underscore-fix.patch
|
||||
Patch11: postfix-3.4.4-chroot-example-fix.patch
|
||||
|
||||
# Optional patches - set the appropriate environment variables to include
|
||||
# them when building the package/spec file
|
||||
|
|
@ -274,13 +269,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
|
||||
sed -i makedefs -e '\@Linux\.@s|345|3456|'
|
||||
|
|
@ -474,7 +466,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,10 +846,47 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri May 09 2025 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 2:3.9.1-5
|
||||
* Fri Jan 02 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.10.7-1
|
||||
- New version
|
||||
Resolves: rhbz#2417154
|
||||
|
||||
* Thu Oct 30 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 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 <jskarvad@redhat.com> - 2:3.10.4-1
|
||||
- New version
|
||||
Resolves: rhbz#2389310
|
||||
|
||||
* Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 2:3.10.3-3
|
||||
- Rebuilt for icu 77.1
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.10.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jul 10 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 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 <jskarvad@redhat.com> - 2:3.10.2-3
|
||||
- Updated pflogsumm to 1.1.6
|
||||
Resolves: rhbz#2368396
|
||||
|
||||
* Thu May 08 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 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 <jskarvad@redhat.com> - 2:3.10.2-1
|
||||
- New version
|
||||
Resolves: rhbz#2361704
|
||||
|
||||
* Thu Mar 6 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.10.1-1
|
||||
- New version
|
||||
Resolves: rhbz#2346039
|
||||
|
||||
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.9.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
|
||||
SHA512 (postfix-3.9.1.tar.gz) = 79109d9f19e51d9089a0f2b5c6134972148a6e1a7e385aabc79c0a32e09c78715ad94a93ae3eca1171b770c62d6bf3b8e079b94183ae851001db1a0cf21fff15
|
||||
SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630
|
||||
SHA512 (postfix-3.10.7.tar.gz) = 28d7c05bfd6fb15f906c67cca989c4b47640ec631b640943deb66d91e44a6684deb79af95f0d4ba4dd362d9ba59179e5ed268942384e5e35ba472c91cf366e4c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue