View | Details | Raw Unified | Return to bug 243556 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/clamav-unofficial-sigs/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 511592 2019-09-08 19:37:27Z pi $
2
# $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 511592 2019-09-08 19:37:27Z pi $
3
3
4
PORTNAME=	clamav-unofficial-sigs
4
PORTNAME=	clamav-unofficial-sigs
5
PORTVERSION=	6.1.1
5
PORTVERSION=	7.0.1
6
CATEGORIES=	security
6
CATEGORIES=	security
7
7
8
MAINTAINER=	ports@FreeBSD.org
8
MAINTAINER=	ports@FreeBSD.org
(-)b/security/clamav-unofficial-sigs/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1567631464
1
TIMESTAMP = 1580043997
2
SHA256 (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f
2
SHA256 (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 20e1bd6da863513ec1dc42c3f498ca1dfe1c1845110442c2e4595df6ab8341ed
3
SIZE (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = 55340
3
SIZE (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 59517
(-)b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh (-21 / +28 lines)
Lines 1-37 Link Here
1
--- clamav-unofficial-sigs.sh.orig	2019-09-02 22:41:48 UTC
1
--- clamav-unofficial-sigs.sh.orig	2020-01-25 12:02:06 UTC
2
+++ clamav-unofficial-sigs.sh
2
+++ clamav-unofficial-sigs.sh
3
@@ -1422,25 +1422,14 @@ force_wget="no"
3
@@ -1541,26 +1541,10 @@ force_wget="no"
4
 enable_log="no"
4
 enable_log="no"
5
 custom_config="no"
5
 custom_config="no"
6
 we_have_a_config="0"
6
 we_have_a_config="0"
7
+pkg_mgr="FreeBSD ports"
7
+pkg_mgr="FreeBSD ports"
8
+pkg_rm="pkg delete"
8
+pkg_rm="pkg delete"
9
 
9
 
10
-
10
 
11
-# Attempt to scan for a valid config dir
11
-# Attempt to scan for a valid config dir
12
-if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then
12
-if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then
13
-  config_dir="/etc/clamav-unofficial-sigs"
13
-  config_dir="/etc/clamav-unofficial-sigs"
14
-elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then
14
-elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then
15
-  config_dir="/usr/local/etc/clamav-unofficial-sigs/"
15
-  config_dir="/usr/local/etc/clamav-unofficial-sigs/"
16
-elif [ -f "/opt/zimbra/config/clamav-unofficial-sigs/master.conf" ] ; then
16
-elif [ -f "/opt/zimbra/conf/clamav-unofficial-sigs/master.conf" ] ; then
17
-  config_dir="/opt/zimbra/config/clamav-unofficial-sigs/"
17
-  config_dir="/opt/zimbra/conf/clamav-unofficial-sigs/"
18
-else
18
-else
19
-  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found"
19
-  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found"
20
-  exit 1
20
-  exit 1
21
-fi
21
-fi
22
 # Default config files
22
-# Default config files
23
+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
23
-if [ -r "${config_dir}/master.conf" ] ; then
24
 config_files=("${config_dir}/master.conf")
24
-	config_files+=( "${config_dir}/master.conf" )
25
-#find the a suitable os.conf or os.*.conf file
25
-else
26
-config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
26
-	xshok_pretty_echo_and_log "ERROR: ${config_dir}/master.conf is not readable"
27
-if [ -r "${config_file}" ]; then
27
-	exit 1
28
-	config_files+=( "${config_file}" )
28
-fi
29
+if [ -r "${config_dir}/os.conf" ] ; then
29
 if [ -r "${config_dir}/os.conf" ] ; then
30
+	config_files+=( "${config_dir}/os.conf" )
30
 	config_files+=( "${config_dir}/os.conf" )
31
 fi
31
 else
32
 if [ -r "${config_dir}/user.conf" ] ; then
32
@@ -1718,10 +1702,8 @@ if [ "$custom_config" != "no" ] ; then
33
 	config_files+=( "${config_dir}/user.conf" )
34
@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then
35
 		else
33
 		else
36
 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found"
34
 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found"
37
 		fi
35
 		fi
Lines 44-50 Link Here
44
 		else
42
 		else
45
 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
43
 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
46
 		fi
44
 		fi
47
@@ -1625,7 +1612,7 @@ for config_file in "${config_files[@]}" ; do
45
@@ -1767,7 +1749,7 @@ for config_file in "${config_files[@]}" ; do
48
       # Delete both trailing and leading whitespace
46
       # Delete both trailing and leading whitespace
49
       # Delete all trailing whitespace
47
       # Delete all trailing whitespace
50
       # Delete all empty lines
48
       # Delete all empty lines
Lines 53-59 Link Here
53
     fi
51
     fi
54
 
52
 
55
     #fix eval of |
53
     #fix eval of |
56
@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do
54
@@ -1782,7 +1764,7 @@ for config_file in "${config_files[@]}" ; do
57
     fi
55
     fi
58
 
56
 
59
     # Check there is an = for every set of "" optional whitespace \s* between = and "
57
     # Check there is an = for every set of "" optional whitespace \s* between = and "
Lines 62-68 Link Here
62
 
60
 
63
     if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
61
     if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
64
       xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
62
       xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
65
@@ -2316,24 +2303,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
63
@@ -2504,24 +2486,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
66
         echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt"
64
         echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt"
67
         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
65
         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
68
         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
66
         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
Lines 90-92 Link Here
90
             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
88
             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
91
             xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}"
89
             xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}"
92
             # shellcheck disable=SC2086
90
             # shellcheck disable=SC2086
91
@@ -2834,7 +2804,7 @@ if [ "$linuxmalwaredetect_enabled" == "yes" ] ; then
92
           ret="$?"
93
           if [ "$ret" -eq 0 ] ; then
94
 						# shellcheck disable=SC2035
95
-            $tar_bin --strip-components=1 --wildcards --overwrite -xzf "${work_dir_linuxmalwaredetect}/sigpack.tgz" --directory "${work_dir_linuxmalwaredetect}" */rfxn.*
96
+            $tar_bin --strip-components=1 -xzf "${work_dir_linuxmalwaredetect}/sigpack.tgz" --directory "${work_dir_linuxmalwaredetect}" "*/rfxn.*"
97
             for db_file in "${linuxmalwaredetect_dbs[@]}" ; do
98
               if [ "$loop" == "1" ] ; then
99
                 xshok_pretty_echo_and_log "---"
(-)b/security/clamav-unofficial-sigs/files/patch-config_master.conf (-3 / +3 lines)
Lines 1-6 Link Here
1
--- config/master.conf.orig	2019-09-02 22:41:48 UTC
1
--- config/master.conf.orig	2020-01-25 12:02:06 UTC
2
+++ config/master.conf
2
+++ config/master.conf
3
@@ -63,8 +63,8 @@ clamd_reload_opt="clamdscan --reload"
3
@@ -59,8 +59,8 @@ clamd_reload_opt="clamdscan --reload"
4
 work_dir="/var/lib/clamav-unofficial-sigs"   #Top level working directory
4
 work_dir="/var/lib/clamav-unofficial-sigs"   #Top level working directory
5
 
5
 
6
 # Log update information to '$log_file_path/$log_file_name'.
6
 # Log update information to '$log_file_path/$log_file_name'.
Lines 11-17 Link Here
11
 log_file_name="clamav-unofficial-sigs.log"
11
 log_file_name="clamav-unofficial-sigs.log"
12
 ## Use a program to log messages
12
 ## Use a program to log messages
13
 #log_pipe_cmd="/usr/bin/logger -it 'clamav-unofficial-sigs'"
13
 #log_pipe_cmd="/usr/bin/logger -it 'clamav-unofficial-sigs'"
14
@@ -487,8 +487,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors
14
@@ -618,8 +618,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors
15
 #rsync_proxy="username:password@proxy_host:proxy_port"
15
 #rsync_proxy="username:password@proxy_host:proxy_port"
16
 #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
16
 #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
17
 #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
17
 #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
(-)b/security/clamav-unofficial-sigs/files/patch-config_user.conf (-5 / +4 lines)
Lines 1-6 Link Here
1
--- config/user.conf.orig	2019-09-02 22:41:48 UTC
1
--- config/user.conf.orig	2020-01-25 12:02:06 UTC
2
+++ config/user.conf
2
+++ config/user.conf
3
@@ -49,14 +49,12 @@
3
@@ -54,13 +54,11 @@
4
 #) #END ADDITIONAL DATABASES
4
 #) #END ADDITIONAL DATABASES
5
 
5
 
6
 # Uncomment the following line to enable the script
6
 # Uncomment the following line to enable the script
Lines 9-18 Link Here
9
 
9
 
10
 # Proxy Support
10
 # Proxy Support
11
 # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
11
 # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
12
 #rsync_proxy="username:password@proxy_host:proxy_port"
13
 #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
12
 #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
14
 #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
15
-#dig_proxy="@proxy_host -p proxy_host:proxy_port"
13
-#dig_proxy="@proxy_host -p proxy_host:proxy_port"
16
-#host_proxy="@proxy_host" #does not support port
14
-#host_proxy="@proxy_host" #does not support port
15
 #rsync_proxy="username:password@proxy_host:proxy_port"
16
 #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
17
 
17
 
18
 # https://eXtremeSHOK.com ######################################################

Return to bug 243556