v4.0.2-7 update MailWatchConf.pm

Former-commit-id: df8a655

rpmbuild/SOURCES/eFa-4.0.2/updates/update-4.0.2.sh

@@ -140,6 +140,9 @@ if [[ -z $(grep geoip2_default_db_path /etc/MailScanner/spamassassin.conf) ]]; t
   echo 'endif' >> /etc/MailScanner/spamassassin.conf
 fi
 
+# Update MailWatchConf.pm
+sed -i "/^my (\$db_pass) = 'mailwatch';$/ c\my (\$fh);\nmy (\$pw_config) = '/etc/eFa/MailWatch-Config';\nopen(\$fh, \"<\", \$pw_config);\nif(\!\$fh) {\n  MailScanner::Log::WarnLog(\"Unable to open %s to retrieve password\", \$pw_config);\n  return;\n}\nmy (\$db_pass) = grep(/^MAILWATCHSQLPWD/,<\$fh>);\n\$db_pass =~ s/MAILWATCHSQLPWD://;\n\$db_pass =~ s/\\\n//;\nclose(\$fh);" /usr/share/MailScanner/perl/custom/MailWatchConf.pm
+
 # Enable RelayCountry Plugin
 sed -i "/^# loadplugin Mail::SpamAssassin::Plugin::RelayCountry/ c\loadplugin Mail::SpamAssassin::Plugin::RelayCountry" /etc/mail/spamassassin/init.pre
 

rpmbuild/SPECS/eFa4.spec

@@ -26,7 +26,7 @@
 Name:      eFa
 Summary:   eFa Maintenance rpm
 Version:   4.0.2
-Release:   6.eFa%{?dist}
+Release:   7.eFa%{?dist}
 Epoch:     1
 Group:     Applications/System
 URL:       https://efa-project.org
@@ -570,6 +570,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %{_sysconfdir}/logrotate.d/eFa-logrotate
 
 %changelog
+* Sat Feb 08 2020 eFa Project <[email protected]> - 4.0.2-7
+- Update MailWatchConf.pm after updating MailWatch
+
 * Sat Feb 08 2020 eFa Project <[email protected]> - 4.0.2-6
 - Updates for MailWatch