|
Lines 1-4
Link Here
|
| 1 |
--- clamav-unofficial-sigs.sh.orig 2016-06-03 09:51:21 UTC |
1 |
--- clamav-unofficial-sigs.sh.orig 2016-11-18 10:05:40 UTC |
| 2 |
+++ clamav-unofficial-sigs.sh |
2 |
+++ clamav-unofficial-sigs.sh |
| 3 |
@@ -753,6 +753,8 @@ function make_signature_database_from_as |
3 |
@@ -753,6 +753,8 @@ function make_signature_database_from_as |
| 4 |
#Remove the clamav-unofficial-sigs script |
4 |
#Remove the clamav-unofficial-sigs script |
|
Lines 27-33
Link Here
|
| 27 |
- if [ "$(xshok_array_count "$sanesecurity_mirror_ips")" -lt 1 ] ; then |
27 |
- if [ "$(xshok_array_count "$sanesecurity_mirror_ips")" -lt 1 ] ; then |
| 28 |
- sanesecurity_mirror_ips=$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}') |
28 |
- sanesecurity_mirror_ips=$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}') |
| 29 |
- fi |
29 |
- fi |
| 30 |
+ sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*\s//') |
30 |
+ sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//') |
| 31 |
|
31 |
|
| 32 |
if [ "$(xshok_array_count "$sanesecurity_mirror_ips")" -ge "1" ] ; then |
32 |
if [ "$(xshok_array_count "$sanesecurity_mirror_ips")" -ge "1" ] ; then |
| 33 |
for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do |
33 |
for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do |
|
Lines 37-43
Link Here
|
| 37 |
- if [ "$sanesecurity_mirror_name" == "" ] ; then |
37 |
- if [ "$sanesecurity_mirror_name" == "" ] ; then |
| 38 |
- sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}') |
38 |
- sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}') |
| 39 |
- fi |
39 |
- fi |
| 40 |
+ sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*\s//' | sed 's/\.$//') |
40 |
+ sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//') |
| 41 |
sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip" |
41 |
sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip" |
| 42 |
xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info" |
42 |
xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info" |
| 43 |
$rsync_bin $rsync_output_level $no_motd --files-from="$sanesecurity_include_dbs" -ctuz $connect_timeout --timeout="$rsync_max_time" "rsync://$sanesecurity_mirror_ip/sanesecurity" "$work_dir_sanesecurity" 2>/dev/null |
43 |
$rsync_bin $rsync_output_level $no_motd --files-from="$sanesecurity_include_dbs" -ctuz $connect_timeout --timeout="$rsync_max_time" "rsync://$sanesecurity_mirror_ip/sanesecurity" "$work_dir_sanesecurity" 2>/dev/null |