From c25100dd41204ea15b4b9f2c9ebe18c4bc17e15a Mon Sep 17 00:00:00 2001 From: Shawn Iverson Date: Sun, 21 Nov 2021 21:17:37 -0500 Subject: [PATCH] Update 4.0.4-25 --- rpmbuild/SOURCES/eFa-4.0.4/updates/update-4.0.4.sh | 4 ++++ rpmbuild/SPECS/MailWatch.spec | 9 ++++++--- rpmbuild/SPECS/eFa4.spec | 7 +++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/rpmbuild/SOURCES/eFa-4.0.4/updates/update-4.0.4.sh b/rpmbuild/SOURCES/eFa-4.0.4/updates/update-4.0.4.sh index 372fdcb2..9e236d00 100644 --- a/rpmbuild/SOURCES/eFa-4.0.4/updates/update-4.0.4.sh +++ b/rpmbuild/SOURCES/eFa-4.0.4/updates/update-4.0.4.sh @@ -398,6 +398,10 @@ cmd='systemctl stop mailscanner' execcmd cmd='systemctl stop mariadb' execcmd +cmd='systemctl stop postfix_relay' +execcmd +cmd='systemctl stop milter_relay' +execcmd cmd='systemctl start mariadb' execcmd cmd='systemctl start mailscanner' diff --git a/rpmbuild/SPECS/MailWatch.spec b/rpmbuild/SPECS/MailWatch.spec index 04597733..3ccb4e54 100644 --- a/rpmbuild/SPECS/MailWatch.spec +++ b/rpmbuild/SPECS/MailWatch.spec @@ -28,12 +28,12 @@ Summary: MailWatch Web Front-End for MailScanner Name: MailWatch Version: 1.2.18 Epoch: 1 -Release: 4.eFa%{?dist} +Release: 5.eFa%{?dist} License: GNU GPL v2 Group: Applications/Utilities URL: https://github.com/mailwatch/MailWatch #Source: https://github.com/mailwatch/MailWatch/archive/v%{version}.tar.gz -Source: https://github.com/shawniverson/MailWatch/archive/refs/heads/112121cherrypick.tar.gz +Source: https://github.com/shawniverson/MailWatch/archive/refs/heads/112121cherrypick2.tar.gz Source2: favicon.ico Source3: eFa4logo-79px.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -51,7 +51,7 @@ queried by MailWatch for reporting and statistics. %prep #%setup -q -n %{name}-%{version} -%setup -q -n %{name}-112121cherrypick +%setup -q -n %{name}-112121cherrypick2 %build # Nothing to do @@ -312,6 +312,9 @@ chgrp apache %{_localstatedir}/www/html/mailscanner/temp %{_localstatedir}/www/html/mailscanner/viewpart.php %changelog +* Sun Nov 21 2021 Shawn Iverson - 1.2.18-5 +- More relay fixes + * Sun Nov 21 2021 Shawn Iverson - 1.2.18-4 - Relay fixes diff --git a/rpmbuild/SPECS/eFa4.spec b/rpmbuild/SPECS/eFa4.spec index fa99bddb..02db7cae 100644 --- a/rpmbuild/SPECS/eFa4.spec +++ b/rpmbuild/SPECS/eFa4.spec @@ -26,7 +26,7 @@ Name: eFa Summary: eFa Maintenance rpm Version: 4.0.4 -Release: 24.eFa%{?dist} +Release: 25.eFa%{?dist} Epoch: 1 Group: Applications/System URL: https://efa-project.org @@ -215,7 +215,7 @@ Requires: perl-libnet >= 3.11-1 # perl-libnet # eFa # Spamassassin Requires: perl-Encoding-FixLatin >= 1.04-1 # perl-Encoding-FixLatin # eFa # MailWatch -Requires: MailWatch >= 1:1.2.18-4 +Requires: MailWatch >= 1:1.2.18-5 # MailWatch # eFa # MailWatch Frontend Requires: dcc >= 2.3.167-2 # dcc # eFa # Spamassassin, MailScanner @@ -543,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644, root, root) %{_sysconfdir}/logrotate.d/eFa-logrotate %changelog +* Sun Nov 21 2021 eFa Project - 4.0.4-25 +- MailWatch update to 1.2.18-5 more relay fixes + * Sun Nov 21 2021 eFa Project - 4.0.4-24 - MailWatch update to 1.2.18-4 relay fixes