Lines 1-6
Link Here
|
1 |
--- clamav-unofficial-sigs.sh.orig 2019-09-02 22:41:48 UTC |
1 |
--- clamav-unofficial-sigs.sh.orig 2020-02-08 22:48:12 UTC |
2 |
+++ clamav-unofficial-sigs.sh |
2 |
+++ clamav-unofficial-sigs.sh |
3 |
@@ -1422,25 +1422,14 @@ force_wget="no" |
3 |
@@ -1541,48 +1541,17 @@ 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" |
Lines 13-37
Link Here
|
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 |
-if [ -r "${config_dir}/master.conf" ] ; then |
24 |
- config_files+=( "${config_dir}/master.conf" ) |
25 |
-else |
26 |
- xshok_pretty_echo_and_log "ERROR: ${config_dir}/master.conf is not readable" |
27 |
- exit 1 |
28 |
-fi |
23 |
+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs" |
29 |
+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs" |
24 |
config_files=("${config_dir}/master.conf") |
30 |
+config_files=("${config_dir}/master.conf") |
25 |
-#find the a suitable os.conf or os.*.conf file |
31 |
if [ -r "${config_dir}/os.conf" ] ; then |
26 |
-config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)" |
32 |
config_files+=( "${config_dir}/os.conf" ) |
27 |
-if [ -r "${config_file}" ]; then |
33 |
-else |
28 |
- config_files+=( "${config_file}" ) |
34 |
- #find the a suitable os.*.conf file |
29 |
+if [ -r "${config_dir}/os.conf" ] ; then |
35 |
- os_config_number=$(find "$config_dir" -type f -iname "os.*.conf" | wc -l) |
30 |
+ config_files+=( "${config_dir}/os.conf" ) |
36 |
- if [ "$os_config_number" == "0" ] ; then |
|
|
37 |
- xshok_pretty_echo_and_log "WARNING: no os.conf or os.*.conf found" |
38 |
- elif [ "$os_config_number" == "1" ] ; then |
39 |
- config_file="$(find "$config_dir" -type f -iname "os.*.conf" | head -n1)" |
40 |
- if [ -r "${config_file}" ]; then |
41 |
- config_files+=( "${config_file}" ) |
42 |
- else |
43 |
- xshok_pretty_echo_and_log "WARNING: ${config_file} is not readable" |
44 |
- fi |
45 |
- else |
46 |
- xshok_pretty_echo_and_log "WARNING: Too many os.*.conf configs found" |
47 |
- fi |
31 |
fi |
48 |
fi |
32 |
if [ -r "${config_dir}/user.conf" ] ; then |
49 |
if [ -r "${config_dir}/user.conf" ] ; then |
33 |
config_files+=( "${config_dir}/user.conf" ) |
50 |
config_files+=( "${config_dir}/user.conf" ) |
34 |
@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then |
51 |
-else |
|
|
52 |
- xshok_pretty_echo_and_log "WARNING: ${config_dir}/user.conf is not readable" |
53 |
fi |
54 |
|
55 |
# Solaris command -v function returns garbage when the program is not found |
56 |
@@ -1718,10 +1687,8 @@ if [ "$custom_config" != "no" ] ; then |
35 |
else |
57 |
else |
36 |
xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found" |
58 |
xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found" |
37 |
fi |
59 |
fi |
Lines 44-50
Link Here
|
44 |
else |
66 |
else |
45 |
xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found" |
67 |
xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found" |
46 |
fi |
68 |
fi |
47 |
@@ -1625,7 +1612,7 @@ for config_file in "${config_files[@]}" ; do |
69 |
@@ -1767,7 +1734,7 @@ for config_file in "${config_files[@]}" ; do |
48 |
# Delete both trailing and leading whitespace |
70 |
# Delete both trailing and leading whitespace |
49 |
# Delete all trailing whitespace |
71 |
# Delete all trailing whitespace |
50 |
# Delete all empty lines |
72 |
# Delete all empty lines |
Lines 53-59
Link Here
|
53 |
fi |
75 |
fi |
54 |
|
76 |
|
55 |
#fix eval of | |
77 |
#fix eval of | |
56 |
@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do |
78 |
@@ -1782,7 +1749,7 @@ for config_file in "${config_files[@]}" ; do |
57 |
fi |
79 |
fi |
58 |
|
80 |
|
59 |
# Check there is an = for every set of "" optional whitespace \s* between = and " |
81 |
# Check there is an = for every set of "" optional whitespace \s* between = and " |
Lines 62-68
Link Here
|
62 |
|
84 |
|
63 |
if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then |
85 |
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 \"\"" |
86 |
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 |
87 |
@@ -2504,24 +2471,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then |
66 |
echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt" |
88 |
echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt" |
67 |
xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "=" |
89 |
xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "=" |
68 |
xshok_pretty_echo_and_log "Checking for Sanesecurity updates..." |
90 |
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" |
112 |
sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip" |
91 |
xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}" |
113 |
xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}" |
92 |
# shellcheck disable=SC2086 |
114 |
# shellcheck disable=SC2086 |
|
|
115 |
@@ -2834,7 +2789,7 @@ if [ "$linuxmalwaredetect_enabled" == "yes" ] ; then |
116 |
ret="$?" |
117 |
if [ "$ret" -eq 0 ] ; then |
118 |
# shellcheck disable=SC2035 |
119 |
- $tar_bin --strip-components=1 --wildcards --overwrite -xzf "${work_dir_linuxmalwaredetect}/sigpack.tgz" --directory "${work_dir_linuxmalwaredetect}" */rfxn.* |
120 |
+ $tar_bin --strip-components=1 -xzf "${work_dir_linuxmalwaredetect}/sigpack.tgz" --directory "${work_dir_linuxmalwaredetect}" "*/rfxn.*" |
121 |
for db_file in "${linuxmalwaredetect_dbs[@]}" ; do |
122 |
if [ "$loop" == "1" ] ; then |
123 |
xshok_pretty_echo_and_log "---" |