aboutsummaryrefslogtreecommitdiffstats
path: root/security/clamav-unofficial-sigs/files
diff options
context:
space:
mode:
authorpi <pi@FreeBSD.org>2016-04-02 13:55:08 +0800
committerpi <pi@FreeBSD.org>2016-04-02 13:55:08 +0800
commitb20da23c84698bac92b36f4b215799569af5b0c0 (patch)
treef31dd7f55570b9616f701179028bda9bad250996 /security/clamav-unofficial-sigs/files
parent8528b8119fd5caee1bb16a6b53dc3fc58e03c553 (diff)
downloadfreebsd-ports-gnome-b20da23c84698bac92b36f4b215799569af5b0c0.tar.gz
freebsd-ports-gnome-b20da23c84698bac92b36f4b215799569af5b0c0.tar.zst
freebsd-ports-gnome-b20da23c84698bac92b36f4b215799569af5b0c0.zip
security/clamav-unofficial-sigs: 5.0.4 -> 5.0.5
Changes: https://github.com/extremeshok/clamav-unofficial-sigs/releases/tag/5.0.5 PR: 208459 Submitted by: Marko Njezic <sf@maxempire.com> (maintainer)
Diffstat (limited to 'security/clamav-unofficial-sigs/files')
-rw-r--r--security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh29
-rw-r--r--security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf8
-rw-r--r--security/clamav-unofficial-sigs/files/patch-config_user.conf11
3 files changed, 26 insertions, 22 deletions
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 616f4f644ccd..b778da5aa23a 100644
--- a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
+++ b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
@@ -1,15 +1,15 @@
---- clamav-unofficial-sigs.sh.orig 2016-03-31 14:38:13 UTC
+--- clamav-unofficial-sigs.sh.orig 2016-04-02 05:47:26 UTC
+++ clamav-unofficial-sigs.sh
-@@ -158,7 +158,7 @@ minimum_required_config_version="56"
- version_date="31 March 2016"
+@@ -187,7 +187,7 @@ script_version_date="02 April 2016"
+ minimum_required_config_version="56"
#default config files
-config_dir="/etc/clamav-unofficial-sigs"
+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
config_files=("$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf")
-
-@@ -542,6 +542,8 @@ make_signature_database_from_ascii_file
+ #Initialise
+@@ -627,6 +627,8 @@ make_signature_database_from_ascii_file
#Remove the clamav-unofficial-sigs script
remove_script () {
echo ""
@@ -18,15 +18,28 @@
if [ -n "$pkg_mgr" -a -n "$pkg_rm" ] ; then
echo " This script (clamav-unofficial-sigs) was installed on the system"
echo " via '$pkg_mgr', use '$pkg_rm' to remove the script"
-@@ -1088,9 +1090,9 @@ if [ "$sanesecurity_enabled" == "yes" ]
+@@ -1175,22 +1177,13 @@ if [ "$sanesecurity_enabled" == "yes" ]
db_file=""
-
xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
+
- sanesecurity_mirror_ips=`dig +ignore +short $sanesecurity_url`
+- #add fallback to host if dig returns no records
+- if [ `xshok_array_count "$sanesecurity_mirror_ips"` -lt 1 ] ; then
+- sanesecurity_mirror_ips=`host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p}'`
+- fi
+ sanesecurity_mirror_ips=`host $sanesecurity_url | sed 's/.*\s//'`
+
+ if [ `xshok_array_count "$sanesecurity_mirror_ips"` -ge "1" ] ; then
+
+
for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
+- sanesecurity_mirror_name=""
- sanesecurity_mirror_name=`dig +short -x $sanesecurity_mirror_ip | command sed 's/\.$//'`
+- #add fallback to host if dig returns no records
+- if [ "$sanesecurity_mirror_name" == "" ] ; then
+- sanesecurity_mirror_name=`host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*/\1/;p}'`
+- fi
+ sanesecurity_mirror_name=`host $sanesecurity_mirror_ip | sed 's/.*\s//' | 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"
- rsync $rsync_output_level $no_motd --files-from=$sanesecurity_include_dbs -ctuz $connect_timeout --timeout="$rsync_max_time" --stats rsync://$sanesecurity_mirror_ip/sanesecurity $sanesecurity_dir 2>/dev/null
+ $rsync_bin $rsync_output_level $no_motd --files-from=$sanesecurity_include_dbs -ctuz $connect_timeout --timeout="$rsync_max_time" --stats rsync://$sanesecurity_mirror_ip/sanesecurity $sanesecurity_dir 2>/dev/null
diff --git a/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf b/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf
index cdc9981b9e1f..ade8ef67ef08 100644
--- a/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf
+++ b/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf
@@ -1,6 +1,6 @@
---- config/os.freebsd.conf.orig 2016-03-31 01:16:02 UTC
+--- config/os.freebsd.conf.orig 2016-04-01 23:10:24 UTC
+++ config/os.freebsd.conf
-@@ -32,11 +32,6 @@ clamd_pid="/var/run/clamav/clamd.pid"
+@@ -32,13 +32,8 @@ clamd_pid="/var/run/clamav/clamd.pid"
work_dir="/var/db/clamav-unofficial-sigs"
@@ -9,6 +9,8 @@
clamd_restart_opt="service clamav-clamd reload"
#clamd_socket="/var/run/clamav/clamd.sock"
--
+
-pkg_mgr="FreeBSD ports"
-pkg_rm="pkg remove"
+-
+ # https://eXtremeSHOK.com ######################################################
diff --git a/security/clamav-unofficial-sigs/files/patch-config_user.conf b/security/clamav-unofficial-sigs/files/patch-config_user.conf
deleted file mode 100644
index 1ab887d9367b..000000000000
--- a/security/clamav-unofficial-sigs/files/patch-config_user.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/user.conf.orig 2016-03-31 01:16:02 UTC
-+++ config/user.conf
-@@ -20,6 +20,8 @@
- # SEE MASTER.CONF FOR CONFIG EXPLAINATIONS
- ################################################################################
-
-+# IMPORTANT: Logging options should only be changed in master.conf file!
-+
- # Values in this file will always override those in the master.conf and os.conf files.
- # This is useful to specify your authorisation/receipt codes and to always force certain options.
- # Please note, it is your responsibility to manage the contents of this file.