Merge pull request #248 from extremeshok/dev

6.1.1

.t/ci-test.sh

@@ -14,17 +14,28 @@ if [ -e "/var/lib/clamav/sanesecurity.ftm" ] ; then
 	rm -f /var/lib/clamav/sanesecurity.ftm
 fi
 
-echo "running script as root"
-sudo bash /usr/sbin/clamav-unofficial-sigs
+echo "running script as root and verbose and force_wget"
+sudo cp -f .t/tests/user_wget.conf /etc/clamav-unofficial-sigs/user.conf
+sudo bash /usr/sbin/clamav-unofficial-sigs --verbose
 if [ "$?" -eq "0" ] ; then
 	echo .. OK
 else
  	echo .. ERROR
   exit 1
 fi
 
-echo "running script as clamav"
-sudo -u clamav  [ -x /usr/sbin/clamav-unofficial-sigs ] && bash /usr/sbin/clamav-unofficial-sigs --force
+echo "running script as root and verbose"
+sudo cp -f .t/tests/user.conf /etc/clamav-unofficial-sigs/user.conf
+sudo bash /usr/sbin/clamav-unofficial-sigs --verbose
+if [ "$?" -eq "0" ] ; then
+	echo .. OK
+else
+ 	echo .. ERROR
+  exit 1
+fi
+
+echo "running script as clamav and silence"
+sudo -u clamav  [ -x /usr/sbin/clamav-unofficial-sigs ] && bash /usr/sbin/clamav-unofficial-sigs --force --silence
 if [ "$?" -eq "0" ] ; then
 	echo .. OK
 else

.t/tests/user_wget.conf

@@ -0,0 +1,59 @@
+###################
+# This is property of eXtremeSHOK.com
+# You are free to use, modify and distribute, however you may not remove this notice.
+# Copyright (c) Adrian Jon Kriel :: [email protected]
+# License: BSD (Berkeley Software Distribution)
+##################
+
+malwarepatrol_enabled="yes"
+malwarepatrol_receipt_code=$ci_malwarepatrol_receipt_code
+malwarepatrol_product_code=$ci_malwarepatrol_receipt_code
+malwarepatrol_list=$ci_malwarepatrol_receipt_code
+malwarepatrol_free=$ci_malwarepatrol_free
+
+securiteinfo_enabled="yes"
+securiteinfo_authorisation_signature=$ci_securiteinfo_authorisation_signature
+
+sanesecurity_enabled="yes"
+
+linuxmalwaredetect_enabled="yes"
+
+# THIS NEEDS TO BE TESTED
+yararules_enabled="no"
+enable_yararules="no"
+
+# Default dbs rating
+# valid rating: LOW, MEDIUM, HIGH
+default_dbs_rating="MEDIUM"
+
+# Per Database
+# These ratings will override the global rating for the specific database
+# valid rating: LOW, MEDIUM, HIGH, DISABLE
+sanesecurity_dbs_rating="HIGH"
+#securiteinfo_dbs_rating=""
+#linuxmalwaredetect_dbs_rating=""
+#yararulesproject_dbs_rating=""
+
+enable_gpg="no"
+
+user_configuration_complete="yes"
+
+declare -a additional_dbs=(
+https://raw.githubusercontent.com/wmetcalf/clam-punch/master/miscreantpunch099.ldb
+https://raw.githubusercontent.com/wmetcalf/clam-punch/master/MiscreantPunch099-Low.ldb
+) #END ADDITIONAL DATABASES
+
+
+declare -a securiteinfo_dbs=(
+securiteinfo.ign2|REQUIRED
+securiteinfo.hdb|LOW
+javascript.ndb|LOW
+securiteinfohtml.hdb|LOW
+securiteinfoascii.hdb|LOW
+securiteinfopdf.hdb|LOW
+securiteinfoandroid.hdb|LOW #
+spam_marketing.ndb|HIGH
+) #END SECURITEINFO DATABASES
+
+#foce wget
+force_wget="yes"

.travis.yml

@@ -28,7 +28,7 @@ dist: bionic
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y ca-certificates wget rsync p7zip-full shellcheck -qq
+  - sudo apt-get install -y ca-certificates curl wget rsync p7zip-full shellcheck -qq
   #- sudo pip install bashate
   # - "sudo mkdir -p tmp/cache/"
   # - "ls -laFh tmp/cache/clamav-dbs"

README.md

@@ -180,6 +180,20 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
   its associated files and databases from the system
 
 ## Change Log
+### Version 6.1.1 (Updated 02 September 2019)
+ - eXtremeSHOK.com Maintenance
+ - Update os.archlinux.conf, thanks @amishmm
+ - master.conf set default dbs rating to medium
+ - user.conf better suggested values
+ - Default to using curl, less logic required (lower cpu)
+ - force_curl replaced with force_wget
+ - Fix: suppress all non-error output under cron/non interactive terminal
+ - Fix: check log file is not a link before setting permissions, only set if owned by root.
+ - Fix: failed to create symbolic link
+ - Fix: curl --compress ->> curl --compressed
+ - Minor enhancement to travis-ci checks
+ - Incremented the config to version 77
+
 ### Version 6.1.0 (Updated 27 August 2019)
  - eXtremeSHOK.com Maintenance
  - Thanks Reio Remma & Oliver Nissen