diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile index 36f48e6967a2..96b41a078d51 100644 --- a/security/clamav-unofficial-sigs/Makefile +++ b/security/clamav-unofficial-sigs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 511592 2019-09-08 19:37:27Z pi $ PORTNAME= clamav-unofficial-sigs -PORTVERSION= 6.1.1 +PORTVERSION= 7.0.1 CATEGORIES= security MAINTAINER= ports@FreeBSD.org diff --git a/security/clamav-unofficial-sigs/distinfo b/security/clamav-unofficial-sigs/distinfo index 6556f6e14c81..d36274abfa00 100644 --- a/security/clamav-unofficial-sigs/distinfo +++ b/security/clamav-unofficial-sigs/distinfo @@ -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 = 1580043997 +SHA256 (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 20e1bd6da863513ec1dc42c3f498ca1dfe1c1845110442c2e4595df6ab8341ed +SIZE (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 59517 diff --git a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh index ef1b00671ea9..775a22468390 100644 --- a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh +++ b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh @@ -1,37 +1,35 @@ ---- clamav-unofficial-sigs.sh.orig 2019-09-02 22:41:48 UTC +--- clamav-unofficial-sigs.sh.orig 2020-01-25 12:02:06 UTC +++ clamav-unofficial-sigs.sh -@@ -1422,25 +1422,14 @@ force_wget="no" +@@ -1541,26 +1541,10 @@ 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 -+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" ) - fi - if [ -r "${config_dir}/user.conf" ] ; then - config_files+=( "${config_dir}/user.conf" ) -@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then +-# 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 + if [ -r "${config_dir}/os.conf" ] ; then + config_files+=( "${config_dir}/os.conf" ) + else +@@ -1718,10 +1702,8 @@ if [ "$custom_config" != "no" ] ; then else xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found" fi @@ -44,7 +42,7 @@ 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 +1749,7 @@ for config_file in "${config_files[@]}" ; do # Delete both trailing and leading whitespace # Delete all trailing whitespace # Delete all empty lines @@ -53,7 +51,7 @@ fi #fix eval of | -@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do +@@ -1782,7 +1764,7 @@ for config_file in "${config_files[@]}" ; do fi # Check there is an = for every set of "" optional whitespace \s* between = and " @@ -62,7 +60,7 @@ 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 +2486,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..." @@ -90,3 +88,12 @@ 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 +2804,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 "---" diff --git a/security/clamav-unofficial-sigs/files/patch-config_master.conf b/security/clamav-unofficial-sigs/files/patch-config_master.conf index 8da0aa55749a..b99df00bdf1e 100644 --- a/security/clamav-unofficial-sigs/files/patch-config_master.conf +++ b/security/clamav-unofficial-sigs/files/patch-config_master.conf @@ -1,6 +1,6 @@ ---- 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'. @@ -11,7 +11,7 @@ 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 +@@ -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" diff --git a/security/clamav-unofficial-sigs/files/patch-config_user.conf b/security/clamav-unofficial-sigs/files/patch-config_user.conf index 0d9405cd9576..cab2825783e9 100644 --- a/security/clamav-unofficial-sigs/files/patch-config_user.conf +++ b/security/clamav-unofficial-sigs/files/patch-config_user.conf @@ -1,6 +1,6 @@ ---- 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 @@ -9,10 +9,9 @@ # 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 ######################################################