Merge pull request #409 from E-F-A/3.0.2.6

3.0.2.6

CHANGELOG

@@ -2,8 +2,24 @@
 EFA Version 3.0.2.6 Changes
 ############################################################
 
-Issue #396 Bug - Fix case-sensitive strings in Let's Encrypt
-
+Issue #345 Bug         - Numeric phishing default ruleset needed
+Issue #360 Enhancement - Update option -- Are you Sure?
+Issue #364 Enhancement - Edit transport destinations
+Issue #374 Enhancement - Option to bypass db backup during update
+Issue #382 Bug         - Allow square brackets in EFA-Configure
+Issue #395 Bug         - postmap postfix configs during system restore
+Issue #396 Bug         - Fix case-sensitive strings in Let's Encrypt
+Issue #397 Enhancement - Include hostname in upgrade email notices
+Issue #399 Bug         - POSTMASTEREMAIL undefined on some instances
+Issue #400 Bug         - Identical files scanning bug in multiple attached archives
+Issue #401 Enhancement - Better kernel update detection
+Issue #402 Bug         - /usr/bin/clamav-unofficial-sigs.sh config version not updated to required version
+Issue #403 Bug         - MailGraph image in footer causing mixed content messages
+Issue #405 Enhancement - Update hosts file when Outbound Relay is added
+
+Enhancement -- sort friendly backup names
+Enhancement -- remote-build.bash script for vps/remote builds
+MailScanner updated to 5.0.7-1
 
 ############################################################
 EFA Version 3.0.2.5 Changes

RELEASENOTES

@@ -1,7 +1,7 @@
 ######################################################################
-# EFA 3.0.2.5 RELEASE NOTES
+# EFA 3.0.2.6 RELEASE NOTES
 ######################################################################
-# Copyright (C) 2015-2017  https://efa-project.org
+# Copyright (C) 2015-2018  https://efa-project.org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,17 +17,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #######################################################################
 
-Welcome to EFA Version 3.0.2.5!
+Welcome to EFA Version 3.0.2.6!
 
 Many thanks goes to the developers of EFA and maintainers of all
 3rd party packages!
 
-These release notes will help guide you through the 3.0.2.5 update.
+These release notes will help guide you through the 3.0.2.6 update.
 
 Many fixes and enhancements have been made to EFA.  Please review the
 CHANGELOG for further information.
 
-https://raw.githubusercontent.com/E-F-A/v3/3.0.2.5/CHANGELOG
+https://raw.githubusercontent.com/E-F-A/v3/3.0.2.6/CHANGELOG
 
 ###################### How To Update ##################################
 
@@ -49,7 +49,7 @@ Choose option 14) Update Now
 The first time you run this update, the kernel may update. If this
 happens, the script will halt to give you an opportunity to restart.
 After restarting and booting to the new kernel, rerun EFA-Update to
-continue the update process to 3.0.2.5.
+continue the update process to 3.0.2.6.
 
 EFA-Update will not proceed until you are running on the latest
 kernel.  This is to ensure that open-vm-tools updates appropriately
@@ -69,7 +69,7 @@ elevate and downgrade privileges of other admins and domain admins.
 ################ Important Info -- Custom Tweaks ######################
 
 Many EFA users have modified their EFA installations and made tweaks
-that may "disappear" after an update to 3.0.2.5.
+that may "disappear" after an update to 3.0.2.6.
 
 Updated files have been automatically backed up to the following
 location:
@@ -79,22 +79,31 @@ location:
 (Other versions may be present if updating from an older version)
 
 Users who had prior 3rd party certs in-place on eFa 3.0.2.4 or lower
-are overridden by the upgrade to eFa 3.0.2.5. This is due to the 
+are overridden by the upgrade to eFa 3.0.2.6. This is due to the 
 regeneration of the self-signed cert. After the upgrade, and if you
 were using a 3rd party cert, please make sure to update your paths 
 accordingly for Postfix and Apache to reflect the original paths.
-Future updates beyond 3.0.2.5 will leave exisitng cert paths alone,
+Future updates beyond 3.0.2.6 will leave exisitng cert paths alone,
 pending no major security tweaks required to secure systems. 
 
 ########################## Known Issues ###############################
 
 1)  If you are running commercial VMware-Tools, open-vm-tools may
-install itself after updating to 3.0.2.5.  Reapply VMware-Tools
-after updating to 3.0.2.5.  Run the following command to remove
+install itself after updating to 3.0.2.6.  Reapply VMware-Tools
+after updating to 3.0.2.6.  Run the following command to remove
 open-vm-tools:
 
 sudo rpm -e open-vm-tools
 
+2) If you updated from versions prior to 3.0.2.5, manual intervention
+for clamav-unofficial-sigs may be necessary. Examine 
+/etc/clamav-unofficial-sigs and update conf files.
+If rpmnew files are present, move your customizations (if any) to them.
+and replace the old conf files.  For example:
+
+mv /etc/clamav-unofficial-sigs/master.conf /etc/clamav-unofficial-sigs/master.conf.old
+mv /etc/clamav-unofficial-sigs/master.conf.rpmnew /etc/clamav-unofficial-sigs/master.conf
+
 #######################################################################
 
 ########################## Reporting Issues ###########################

TESTPLAN

@@ -1,3 +1,30 @@
+############################################################
+EFA Version 3.0.2.6 TEST PLAN
+############################################################
+
+Confirm EFA-Configure Functionality
+    Edit transport destinations PASSED
+    Are you sure for Update Now PASSED
+    Brackets accepted in transport edits PASSED
+    Option to add to hosts file during Outbound Relay setup PASSED
+    DKIM menus and settings function PASSED
+Confirm EFA-Backup
+    Backs up trim-awl PASSED
+    Date ordering sort friendly PASSED
+Confirm EFA-Restore
+    Executes postmaps PASSED
+Confirm NOBACKUP env set skips backup on update PASSED
+Confirm MailScanner
+    Update successful PASSED
+    Numeric Phishing ruleset PASSED
+Confirm MailGraph
+    Footer GIF Removed PASSED
+Confirm EFA-Init
+    New Email Options PASSED
+Confirm Update reports FQDN on completion notice PASSED
+Confirm Let's encrypt upper case ok PASSED
+Confirm remote-build.bash PASSED
+
 ############################################################
 EFA Version 3.0.2.5 TEST PLAN
 ############################################################

build/EFA/EFA-Backup

@@ -3,7 +3,7 @@
 # EFA Backup
 # Version 20140201
 # +--------------------------------------------------------------------+
-# Copyright (C) 2012~2017  http://www.efa-project.org
+# Copyright (C) 2012~2018  http://www.efa-project.org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -134,6 +134,10 @@ function start_backup()
   # Issue #227 Include local.cf in EFA-Backup
   mkdir -p $WORKINGDIR/etc/mail/spamassassin
   cp -a /etc/mail/spamassassin/local.cf $WORKINGDIR/etc/mail/spamassassin
+
+  # Issue #395
+  mkdir -p $WORKINGDIR/usr/sbin
+  cp -a /usr/sbin/trim-awl $WORKINGDIR/usr/sbin
 
   # Gzip tarball the collection
   tar -cpzf $TMPDIR/backup-$CDATE-$CTIME.tar.gz -C $TMPDIR/$CDATE$CTIME .

build/EFA/EFA-Configure

@@ -3,7 +3,7 @@
 # EFA-Configure
 # Version 20171004
 # +--------------------------------------------------------------------+
-# Copyright (C) 2012~2017  https://www.efa-project.org
+# Copyright (C) 2012~2018  https://www.efa-project.org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ show_menu() {
                    14) func_update-now ;;
                    15) func_maintenance-mode ;;
                    16) func_lets-encrypt ;;
-				   17) func_dkim-dmarc ;;
+                   17) func_dkim-dmarc ;;
                     *) echo -e "Error \"$choice\" is not an option..." && sleep 2
       esac
     done
@@ -181,7 +181,12 @@ func_halt() {
 # Update Now function
 # +---------------------------------------------------+
 func_update-now() {
-  /usr/local/sbin/EFA-Update -update
+  echo ""
+  local yesno
+  read -p "Update now, are you sure? (y/N): " yesno
+  if [[ $yesno =~ ^[Yy] ]]; then
+    /usr/local/sbin/EFA-Update -update
+  fi
   pause
 }
 # +---------------------------------------------------+

build/EFA/EFA-Init

@@ -3,7 +3,7 @@
 # EFA-Init
 # Version 20170916
 # +--------------------------------------------------------------------+
-# Copyright (C) 2012~2017 https://www.efa-project.org
+# Copyright (C) 2012~2018 https://www.efa-project.org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@ function func_ask-postmasteremail() {
      if [[ $POSTMASTEREMAIL =~ ^[-_.@Aa-zA-Z0-9]{2,256}+[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-z]{2,6}$ ]]
       then
         postmasteremailcheck=0
-		     # Change postfix configuration
+            # Change postfix configuration
              postconf -e notify_classes="resource, software, delay, bounce"
              postconf -e 2bounce_notice_recipient="$POSTMASTEREMAIL"
              postconf -e bounce_notice_recipient="$POSTMASTEREMAIL"
@@ -737,11 +737,11 @@ function func_verify-settings() {
                         ;;
                 20)       func_ask-updates
                         ;;
-				21)       func_ask-mailwatchemail
+                21)       func_ask-mailwatchemail
                         ;;
-				22)       func_ask-postmasteremail
+                22)       func_ask-postmasteremail
                         ;;
-				23)       func_ask-cronsourceemail
+                23)       func_ask-cronsourceemail
                         ;;
                 OK)       verifymenu=0
                         ;;