Index: head/security/clamav-unofficial-sigs/Makefile
===================================================================
--- head/security/clamav-unofficial-sigs/Makefile	(revision 525668)
+++ head/security/clamav-unofficial-sigs/Makefile	(revision 525669)
@@ -1,53 +1,53 @@
 # Created by: Marko Njezic <sf@maxempire.com>
 # $FreeBSD$
 
 PORTNAME=	clamav-unofficial-sigs
-PORTVERSION=	6.1.1
+PORTVERSION=	7.0.1
 CATEGORIES=	security
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@mnd.sc
 COMMENT=	Update script for third-party ClamAV databases
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 COMMON_DEPENDS=	clamscan:security/clamav \
 		rsync:net/rsync \
 		curl:ftp/curl \
 		gpg:security/gnupg \
 		bash:shells/bash
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	extremeshok
 SHEBANG_FILES=	clamav-unofficial-sigs.sh
 USE_PERL5=	run
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${CP} ${FILESDIR}/manpage.conf ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' ${WRKSRC}/manpage.conf
 
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/clamav-unofficial-sigs.sh
 
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/bash ./clamav-unofficial-sigs.sh -c manpage.conf --install-man)
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/clamav-unofficial-sigs.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/clamav-unofficial-sigs.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/master.conf ${STAGEDIR}${ETCDIR}/master.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/config/os/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/config/user.conf ${STAGEDIR}${ETCDIR}/user.conf.sample
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} INSTALL.md LICENSE README.md ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/security/clamav-unofficial-sigs/distinfo
===================================================================
--- head/security/clamav-unofficial-sigs/distinfo	(revision 525668)
+++ head/security/clamav-unofficial-sigs/distinfo	(revision 525669)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567631464
-SHA256 (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f
-SIZE (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = 55340
+TIMESTAMP = 1581201339
+SHA256 (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 20e1bd6da863513ec1dc42c3f498ca1dfe1c1845110442c2e4595df6ab8341ed
+SIZE (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 59517
Index: head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
===================================================================
--- head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh	(revision 525668)
+++ head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh	(revision 525669)
@@ -1,92 +1,123 @@
---- clamav-unofficial-sigs.sh.orig	2019-09-02 22:41:48 UTC
+--- clamav-unofficial-sigs.sh.orig	2020-02-08 22:48:12 UTC
 +++ clamav-unofficial-sigs.sh
-@@ -1422,25 +1422,14 @@ force_wget="no"
+@@ -1541,48 +1541,17 @@ force_wget="no"
  enable_log="no"
  custom_config="no"
  we_have_a_config="0"
 +pkg_mgr="FreeBSD ports"
 +pkg_rm="pkg delete"
  
 -
 -# Attempt to scan for a valid config dir
 -if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then
 -  config_dir="/etc/clamav-unofficial-sigs"
 -elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then
 -  config_dir="/usr/local/etc/clamav-unofficial-sigs/"
--elif [ -f "/opt/zimbra/config/clamav-unofficial-sigs/master.conf" ] ; then
--  config_dir="/opt/zimbra/config/clamav-unofficial-sigs/"
+-elif [ -f "/opt/zimbra/conf/clamav-unofficial-sigs/master.conf" ] ; then
+-  config_dir="/opt/zimbra/conf/clamav-unofficial-sigs/"
 -else
 -  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found"
 -  exit 1
 -fi
  # Default config files
+-if [ -r "${config_dir}/master.conf" ] ; then
+-	config_files+=( "${config_dir}/master.conf" )
+-else
+-	xshok_pretty_echo_and_log "ERROR: ${config_dir}/master.conf is not readable"
+-	exit 1
+-fi
 +config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
- config_files=("${config_dir}/master.conf")
--#find the a suitable os.conf or os.*.conf file
--config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
--if [ -r "${config_file}" ]; then
--	config_files+=( "${config_file}" )
-+if [ -r "${config_dir}/os.conf" ] ; then
-+	config_files+=( "${config_dir}/os.conf" )
++config_files=("${config_dir}/master.conf")
+ if [ -r "${config_dir}/os.conf" ] ; then
+ 	config_files+=( "${config_dir}/os.conf" )
+-else
+-	#find the a suitable os.*.conf file
+-	os_config_number=$(find "$config_dir" -type f -iname "os.*.conf" | wc -l)
+-	if [ "$os_config_number" == "0" ] ; then
+-		xshok_pretty_echo_and_log "WARNING: no os.conf or os.*.conf found"
+-	elif [ "$os_config_number" == "1" ] ; then
+-		config_file="$(find "$config_dir" -type f -iname "os.*.conf" | head -n1)"
+-		if [ -r "${config_file}" ]; then
+-			config_files+=( "${config_file}" )
+-		else
+-			xshok_pretty_echo_and_log "WARNING: ${config_file} is not readable"
+-		fi
+-	else
+-		xshok_pretty_echo_and_log "WARNING: Too many os.*.conf configs found"
+-	fi
  fi
  if [ -r "${config_dir}/user.conf" ] ; then
  	config_files+=( "${config_dir}/user.conf" )
-@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then
+-else
+-	xshok_pretty_echo_and_log "WARNING: ${config_dir}/user.conf is not readable"
+ fi
+ 
+ # Solaris command -v function returns garbage when the program is not found
+@@ -1718,10 +1687,8 @@ if [ "$custom_config" != "no" ] ; then
  		else
  			xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found"
  		fi
 -		#find the a suitable os.conf or os.*.conf file
 -		config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
 -		if [ -r "${config_file}" ] ; then
 -			config_files+=( "${config_file}" )
 +		if [ -r "${config_dir}/os.conf" ] ; then
 +			config_files+=( "${config_dir}/os.conf" )
  		else
  			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
  		fi
-@@ -1625,7 +1612,7 @@ for config_file in "${config_files[@]}" ; do
+@@ -1767,7 +1734,7 @@ for config_file in "${config_files[@]}" ; do
        # Delete both trailing and leading whitespace
        # Delete all trailing whitespace
        # Delete all empty lines
 -      clean_config="$(command sed -e '/^#.*/d' -e 's/[[:space:]]#.*//' -e 's/#[[:space:]].*//' -e 's/^[ \t]*//;s/[ \t]*$//' -e '/^\s*$/d' "$config_file")"
 +      clean_config="$(command sed -e '/^#.*/d' -e 's/[[:space:]]#.*//' -e 's/#[[:space:]].*//' -e 's/^[[:blank:]]*//;s/[[:blank:]]*$//' -e '/^[[:space:]]*$/d' "$config_file")"
      fi
  
      #fix eval of |
-@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do
+@@ -1782,7 +1749,7 @@ for config_file in "${config_files[@]}" ; do
      fi
  
      # Check there is an = for every set of "" optional whitespace \s* between = and "
 -    config_check_vars="$(echo "$clean_config" | $grep_bin -c '=\s*\"' )"
 +    config_check_vars="$(echo "$clean_config" | $grep_bin -c '=[[:space:]]*\"' )"
  
      if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
        xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
-@@ -2316,24 +2303,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
+@@ -2504,24 +2471,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
          echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt"
          xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
          xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
 -				# shellcheck disable=SC2086
 -        sanesecurity_mirror_ips="$(dig $dig_proxy +ignore +short "$sanesecurity_url")"
 -        # Add fallback to host if dig returns no records
 -        if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then
 -					# shellcheck disable=SC2086
 -          sanesecurity_mirror_ips="$(host $host_proxy -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
 -        fi
  
 +        sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//')
 +
          if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then
            for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
 -            sanesecurity_mirror_name=""
 -						# shellcheck disable=SC2086
 -            sanesecurity_mirror_name="$(dig $dig_proxy +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
 -            # Add fallback to host if dig returns no records
 -            if [ -z "$sanesecurity_mirror_name" ] ; then
 -							# shellcheck disable=SC2086
 -              sanesecurity_mirror_name="$(host $host_proxy "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
 -            fi
 +            sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//')
              sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
              xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}"
              # shellcheck disable=SC2086
+@@ -2834,7 +2789,7 @@ if [ "$linuxmalwaredetect_enabled" == "yes" ] ; then
+           ret="$?"
+           if [ "$ret" -eq 0 ] ; then
+ 						# shellcheck disable=SC2035
+-            $tar_bin --strip-components=1 --wildcards --overwrite -xzf "${work_dir_linuxmalwaredetect}/sigpack.tgz" --directory "${work_dir_linuxmalwaredetect}" */rfxn.*
++            $tar_bin --strip-components=1 -xzf "${work_dir_linuxmalwaredetect}/sigpack.tgz" --directory "${work_dir_linuxmalwaredetect}" "*/rfxn.*"
+             for db_file in "${linuxmalwaredetect_dbs[@]}" ; do
+               if [ "$loop" == "1" ] ; then
+                 xshok_pretty_echo_and_log "---"
Index: head/security/clamav-unofficial-sigs/files/patch-config_master.conf
===================================================================
--- head/security/clamav-unofficial-sigs/files/patch-config_master.conf	(revision 525668)
+++ head/security/clamav-unofficial-sigs/files/patch-config_master.conf	(revision 525669)
@@ -1,22 +1,36 @@
---- config/master.conf.orig	2019-09-02 22:41:48 UTC
+--- config/master.conf.orig	2020-01-25 12:02:06 UTC
 +++ config/master.conf
-@@ -63,8 +63,8 @@ clamd_reload_opt="clamdscan --reload"
+@@ -59,8 +59,8 @@ clamd_reload_opt="clamdscan --reload"
  work_dir="/var/lib/clamav-unofficial-sigs"   #Top level working directory
  
  # Log update information to '$log_file_path/$log_file_name'.
 -logging_enabled="yes"
 -log_file_path="/var/log/clamav-unofficial-sigs"
 +logging_enabled="no"
 +log_file_path="/var/log"
  log_file_name="clamav-unofficial-sigs.log"
  ## Use a program to log messages
  #log_pipe_cmd="/usr/bin/logger -it 'clamav-unofficial-sigs'"
-@@ -487,8 +487,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors
+@@ -507,11 +507,11 @@ git_branch="master"
+ # Enable support for script and master.conf upgrades
+ # enbles the --upgrade command line option
+ # packagers, if required please disable or set this option to no in the os.conf
+-allow_upgrades="yes"
++allow_upgrades="no"
+ 
+ # Enable support for script and master.conf update checks
+ # packagers, if required please disable or set this option to no in the os.conf
+-allow_update_checks="yes"
++allow_update_checks="no"
+ 
+ # How often the script should check for updates
+ update_check_hours="12"# Default is 12 hours (2 checks  daily).
+@@ -618,8 +618,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors
  #rsync_proxy="username:password@proxy_host:proxy_port"
  #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
  #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
 -#dig_proxy="@proxy_host -p proxy_host:proxy_port"
 -#host_proxy="@proxy_host" #does not support port
  
  # Custom Cron install settings, these are detected and only used if you want to override
  # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers
Index: head/security/clamav-unofficial-sigs/files/patch-config_user.conf
===================================================================
--- head/security/clamav-unofficial-sigs/files/patch-config_user.conf	(revision 525668)
+++ head/security/clamav-unofficial-sigs/files/patch-config_user.conf	(revision 525669)
@@ -1,18 +1,17 @@
---- config/user.conf.orig	2019-09-02 22:41:48 UTC
+--- config/user.conf.orig	2020-01-25 12:02:06 UTC
 +++ config/user.conf
-@@ -49,14 +49,12 @@
+@@ -54,13 +54,11 @@
  #) #END ADDITIONAL DATABASES
  
  # Uncomment the following line to enable the script
 -user_configuration_complete="yes"
 +#user_configuration_complete="yes"
  
  # Proxy Support
  # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
- #rsync_proxy="username:password@proxy_host:proxy_port"
  #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
- #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
 -#dig_proxy="@proxy_host -p proxy_host:proxy_port"
 -#host_proxy="@proxy_host" #does not support port
+ #rsync_proxy="username:password@proxy_host:proxy_port"
+ #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
  
- # https://eXtremeSHOK.com ######################################################