Update to 7.0.1

4 files changed, 24 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4dfcc66a747..fca9739cd944 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clamav-unofficial-sigs
 	pkgdesc = ClamAV Unofficial Signatures Updater maintained by eXtremeSHOK.com
-	pkgver = 6.1.1
+	pkgver = 7.0.1
 	pkgrel = 1
 	url = https://github.com/extremeshok/clamav-unofficial-sigs
 	install = clamav-unofficial-sigs.install
@@ -11,16 +11,16 @@ pkgbase = clamav-unofficial-sigs
 	depends = bind-tools
 	depends = curl
 	backup = etc/clamav-unofficial-sigs/user.conf
-	source = clamav-unofficial-sigs-6.1.1.tar.gz::https://github.com/extremeshok/clamav-unofficial-sigs/archive/6.1.1.tar.gz
+	source = clamav-unofficial-sigs-7.0.1.tar.gz::https://github.com/extremeshok/clamav-unofficial-sigs/archive/7.0.1.tar.gz
 	source = clamav-unofficial-sigs.logrotate
 	source = clamav-unofficial-sigs.tmpfiles
 	source = clamav-unofficial-sigs.8
 	source = os.conf
-	sha256sums = bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f
+	sha256sums = 20e1bd6da863513ec1dc42c3f498ca1dfe1c1845110442c2e4595df6ab8341ed
 	sha256sums = 0564ecac9ea02376b627fed158c9ea899c58b528d276d6d962f9e642e060239e
 	sha256sums = d5441953dbfafb14764ca30b75ad1ae48dbe8a9cace6d3f72ecb9fbe82aa36ca
-	sha256sums = 983b40a2dcf1bf25a2e0ad5c8c971de609532a633879d051e08a0d484ad1ed27
-	sha256sums = 84b71e4db873b0aa85886b53ed46d1fc13323f04d8997b3e36b5acc524fb2d83
+	sha256sums = bc5409c3d7006207bf83b7b30cb4c9fcd2aacb68c6cfbf3c5063bd265f47fcb3
+	sha256sums = 434000ac8572890913775451e678ec6b23cb6570828aec8ab4c690eb3f603bfb
 
 pkgname = clamav-unofficial-sigs
 
diff --git a/PKGBUILD b/PKGBUILD
index a612860ed8d3..e5f3da7e7f55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: sinkuu <sinkuupump@gmail.com>
 
 pkgname="clamav-unofficial-sigs"
-pkgver="6.1.1"
+pkgver="7.0.1"
 pkgrel="1"
 pkgdesc="ClamAV Unofficial Signatures Updater maintained by eXtremeSHOK.com"
 url="https://github.com/extremeshok/clamav-unofficial-sigs"
@@ -16,18 +16,18 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/extremeshok/clamav-unof
     'clamav-unofficial-sigs.8'
     'os.conf'
 )
-sha256sums=('bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f'
+sha256sums=('20e1bd6da863513ec1dc42c3f498ca1dfe1c1845110442c2e4595df6ab8341ed'
             '0564ecac9ea02376b627fed158c9ea899c58b528d276d6d962f9e642e060239e'
             'd5441953dbfafb14764ca30b75ad1ae48dbe8a9cace6d3f72ecb9fbe82aa36ca'
-            '983b40a2dcf1bf25a2e0ad5c8c971de609532a633879d051e08a0d484ad1ed27'
-            '84b71e4db873b0aa85886b53ed46d1fc13323f04d8997b3e36b5acc524fb2d83')
+            'bc5409c3d7006207bf83b7b30cb4c9fcd2aacb68c6cfbf3c5063bd265f47fcb3'
+            '434000ac8572890913775451e678ec6b23cb6570828aec8ab4c690eb3f603bfb')
 backup=('etc/clamav-unofficial-sigs/user.conf')
 install='clamav-unofficial-sigs.install'
 
 prepare() {
     cd "${pkgname}-${pkgver}"
     sed -i -e 's#/usr/local/s\?bin/#/usr/bin/#g' "systemd/${pkgname}.service"
-    sed -i -e 's#WantedBy=clamd@scan.service#WantedBy=timers.target#g' "systemd/${pkgname}.timer"
+    sed -i -e 's#WantedBy=multi-user.target#WantedBy=timers.target#g' "systemd/${pkgname}.timer"
 }
 
 package() {
diff --git a/clamav-unofficial-sigs.8 b/clamav-unofficial-sigs.8
index 204cb01103f9..7f5555e27f06 100644
--- a/clamav-unofficial-sigs.8
+++ b/clamav-unofficial-sigs.8
@@ -1,6 +1,6 @@
 
 .\" Manual page for eXtremeSHOK.com ClamAV Unofficial Signature Updater
-.TH clamav-unofficial-sigs 8 "2019-07-30" "Version: 6.0.0" "SCRIPT COMMANDS"
+.TH clamav-unofficial-sigs 8 "2020-01-25" "Version: 7.0.1" "SCRIPT COMMANDS"
 .SH NAME
 clamav-unofficial-sigs \- Download, test, and install third-party ClamAV signature databases.
 .SH SYNOPSIS
@@ -43,10 +43,12 @@ This script follows the standard GNU command line syntax.
 .TP
 \fB \-o, \-\-output\-triggered \fR If HAM directory scanning is enabled in the script's   configuration file, then output names of any third\-party   signatures that triggered during the HAM directory scan
 .TP
-\fB \-w, \-\-whitelist \fR Adds a signature whitelist entry in the newer ClamAV IGN2   format to 'my\-whitelist.ign2' in order to temporarily resolve   a false\-positive issue with a specific third\-party signature.   Script added whitelist entries will automatically be removed   if the original signature is either modified or removed from   the third\-party signature database
+\fB \-w, \-\-whitelist <signature\-name> \fR Adds a signature whitelist entry in the newer ClamAV IGN2   format to 'my\-whitelist.ign2' in order to temporarily resolve   a false\-positive issue with a specific third\-party signature.   Script added whitelist entries will automatically be removed   if the original signature is either modified or removed from   the third\-party signature database
 .TP
 \fB \-\-check\-clamav \fR If ClamD status check is enabled and the socket path is correctly   specifiedthen test to see if clamd is running or not
 .TP
+\fB \-\-upgrade \fR Upgrades this script and master.conf to the latest available version
+.TP
 \fB \-\-install\-all \fR Install and generate the cron, logroate and man files, autodetects the values   based on your config files
 .TP
 \fB \-\-install\-cron \fR Install and generate the cron file, autodetects the values   based on your config files
diff --git a/os.conf b/os.conf
index 65b9c6cbd056..00f94bd868e5 100644
--- a/os.conf
+++ b/os.conf
@@ -13,7 +13,8 @@
 # NOT COMPATIBLE WITH VERSION 3.XX / 4.XX CONFIG
 #
 ################################################################################
-# SEE MASTER.CONF FOR CONFIG EXPLAINATIONS
+# SEE MASTER.CONF FOR CONFIG EXPLANATIONS
+################################################################################
 # DO NOT MAKE ANY CHANGES to this file.
 # Use user.conf to OVERRIDE THE OPTIONS IN THIS FILE
 ################################################################################
@@ -21,17 +22,19 @@
 # Archlinux specific settings
 clam_user="clamav"
 clam_group="clamav"
+clam_dbs="/var/lib/clamav"
 clamd_pid="/run/clamav/clamd.pid"
-clamd_reload_opt="/usr/bin/systemctl reload clamav-daemon.service"
-clamd_restart_opt="/usr/bin/systemctl restart clamav-daemon.service"
+clamd_reload_opt="/usr/bin/systemctl try-reload-or-restart clamav-daemon.service"
+clamd_restart_opt="/usr/bin/systemctl try-restart clamav-daemon.service"
 clamd_socket="/run/clamav/clamd.ctl"
 pkg_mgr="pacman"
 pkg_rm="pacman"
+allow_upgrades="no"
+allow_update_checks="no"
 
 # the following are already the defaults but we still set them to make sure
 # that any change to master.conf in future does not affect Arch setup
 setmode="yes"
-clam_dbs="/var/lib/clamav"
 reload_dbs="yes"
 work_dir="/var/lib/clamav-unofficial-sigs"
 log_file_path="/var/log/clamav-unofficial-sigs"
@@ -39,9 +42,12 @@ log_file_name="clamav-unofficial-sigs.log"
 keep_db_backup="no"
 remove_bad_database="yes"
 remove_disabled_databases="no"
+debug="no"
 
 # disabled as they are currently crashing clamd (version 0.100)
 enable_yararules="no"
 
 # defaults are now good enough to run out-of-box
 user_configuration_complete="yes"
+
+# https://eXtremeSHOK.com ######################################################