Update ms-update-phishing to v0.3.1, bump version to 5.5.3-2 (#698)

MailScanner · Nov 6, 2024 · 76589ee · 76589ee
1 parent 2532a42
commit 76589ee
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.5.3-1
+5.5.3-2
diff --git a/changelog b/changelog
@@ -1,3 +1,7 @@
+11/06/2024 Changes in    v5.5.3-2
+==================================
+- Add ms-update-phishing version 0.3.1 - Courtesy of Mailborder
+
 11/06/2024 Changes in    v5.5.3-1
 ==================================
 - Check for invalid chars in recipient address (msmilter) - Thanks to alexskynet

diff --git a/common/usr/sbin/ms-update-phishing b/common/usr/sbin/ms-update-phishing
@@ -29,8 +29,6 @@ BADURL='https://phishing.mailscanner.info/phishing.bad.sites.conf.gz';
 SAFEURL='https://phishing.mailscanner.info/phishing.safe.sites.conf.gz';
 MSSTARTSCRIPT='/etc/init.d/mailscanner';
 MSSERVICENAME='mailscanner.service';
-PIDFile=`ms-peek 'PID file' $CONFIGDIR/MailScanner.conf`
-
 DEBUG=0
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/sfw/bin
@@ -113,7 +111,7 @@ fi
 bad_updated=1;
 
 if [ $CURLORWGET = 'curl' ]; then
-  curl -S -A "msv5 Update Script v0.2.0" -z $CONFIGDIR/phishing.bad.sites.conf.master.gz -o $CONFIGDIR/phishing.bad.sites.conf.master.gz $BADURL &> /dev/null
+  curl -S -A "msv5 Update Script v0.3.1" -z $CONFIGDIR/phishing.bad.sites.conf.master.gz -o $CONFIGDIR/phishing.bad.sites.conf.master.gz $BADURL &> /dev/null
   if [ "$?" = "0" ]; then
     gunzip -f $CONFIGDIR/phishing.bad.sites.conf.master.gz
     [ $DEBUG -eq 1 ] && echo Check or download phishing.bad.sites.conf.master completed OK.
@@ -152,7 +150,7 @@ fi
 
 if [ $CURLORWGET = 'wget' ]; then
   echo Trying wget....
-  wget -q --user-agent="msv5 Update Script v0.2.0" --no-check-certificate -N -O phishing.bad.sites.conf.master.gz $BADURL
+  wget -q --user-agent="msv5 Update Script v0.3.1" --no-check-certificate -N -O phishing.bad.sites.conf.master.gz $BADURL
   if [ "$?" = "0" ]; then
     gunzip -f $CONFIGDIR/phishing.bad.sites.conf.master.gz
     [ $DEBUG -eq 1 ] && echo Check or download phishing.bad.sites.conf.master completed OK.
@@ -219,7 +217,7 @@ fi
 safe_updated=1;
 
 if [ $CURLORWGET = 'curl' ]; then
-  curl -S -A "msv5 Update Script v0.2.0" -z $CONFIGDIR/phishing.safe.sites.conf.master.gz -o $CONFIGDIR/phishing.safe.sites.conf.master.gz $SAFEURL &> /dev/null
+  curl -S -A "msv5 Update Script v0.3.1" -z $CONFIGDIR/phishing.safe.sites.conf.master.gz -o $CONFIGDIR/phishing.safe.sites.conf.master.gz $SAFEURL &> /dev/null
   if [ "$?" = "0" ]; then
     gunzip -f $CONFIGDIR/phishing.safe.sites.conf.master.gz
     [ $DEBUG -eq 1 ] && echo Check or download phishing.safe.sites.conf.master completed OK.
@@ -258,7 +256,7 @@ fi
 
 if [ $CURLORWGET = 'wget' ]; then
   echo Trying wget....
-  wget -q --user-agent="msv5 Update Script v0.2.0" --no-check-certificate -N -O phishing.safe.sites.conf.master.gz $SAFEURL
+  wget -q --user-agent="msv5 Update Script v0.3.1" --no-check-certificate -N -O phishing.safe.sites.conf.master.gz $SAFEURL
   if [ "$?" = "0" ]; then
     gunzip -f $CONFIGDIR/phishing.safe.sites.conf.master.gz
     [ $DEBUG -eq 1 ] && echo Check or download phishing.safe.sites.conf.master completed OK.
@@ -324,7 +322,7 @@ updated=$(($bad_updated + $safe_updated));
 
 if [ $updated -ge 1 ]; then
   if [ "$ms_cron_ps_restart" = "1" ]; then
-    if [ ! -f /var/lock/subsys/MailScanner.off -a -f $PIDFile ]; then
+    if [ ! -f /var/lock/subsys/MailScanner.off ]; then
       logger -p $SYSLOG.info -t ms-update-phishing restart MailScanner....
       if [ -d /etc/systemd ]; then
         systemctl restart $MSSERVICENAME >/dev/null 2>&1