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

Collapse All | Expand All

(-)clamav-unofficial-sigs/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1464946787
1
TIMESTAMP = 1504458824
2
SHA256 (extremeshok-clamav-unofficial-sigs-5.3.2_GH0.tar.gz) = 3abe1c22133d879318cebc18d3224a820ea1747524425d4a2efd337749596589
2
SHA256 (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 233404d767fcb7d2b82defef831d584cbbcc7105f6bbc586d69a0a960bc0d4df
3
SIZE (extremeshok-clamav-unofficial-sigs-5.3.2_GH0.tar.gz) = 113714
3
SIZE (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 50931
(-)clamav-unofficial-sigs/files/manpage.conf (-2 / +3 lines)
Lines 6-10 Link Here
6
man_dir="%%WRKSRC%%"
6
man_dir="%%WRKSRC%%"
7
enable_locking="no"
7
enable_locking="no"
8
setmode="no"
8
setmode="no"
9
clam_user="nobody"
9
clam_user="clamav"
10
clam_group="nobody"
10
clam_group="clamav"
11
clam_dbs="/var/db/clamav"
(-)clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh (-25 / +16 lines)
Lines 1-43 Link Here
1
--- clamav-unofficial-sigs.sh.orig	2016-11-18 10:05:40 UTC
1
--- clamav-unofficial-sigs.sh.orig	2017-09-03 19:06:06 UTC
2
+++ clamav-unofficial-sigs.sh
2
+++ clamav-unofficial-sigs.sh
3
@@ -753,6 +753,8 @@ function make_signature_database_from_as
3
@@ -1290,7 +1290,7 @@ minimum_required_config_version="72"
4
 #Remove the clamav-unofficial-sigs script
5
 function remove_script () {
6
   echo ""
7
+  pkg_mgr="FreeBSD ports"
8
+  pkg_rm="pkg delete"
9
   if [ -n "$pkg_mgr" ] && [ -n "$pkg_rm" ] ; then
10
     echo "This script (clamav-unofficial-sigs) was installed on the system via '$pkg_mgr'"
11
     echo "use '$pkg_rm' to remove the script and all of its associated files and databases from the system."
12
@@ -1151,7 +1153,7 @@ minimum_required_config_version="65"
13
 minimum_yara_clamav_version="0.99"
4
 minimum_yara_clamav_version="0.99"
14
 
5
 
15
 #default config files
6
 # Default config files
16
-config_dir="/etc/clamav-unofficial-sigs"
7
-config_dir="/etc/clamav-unofficial-sigs"
17
+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
8
+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
18
 config_files=("$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf")
9
 config_files=( "$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf" )
19
 
10
 
20
 #Initialise 
11
 # Initialise
21
@@ -1879,20 +1881,11 @@ if [ "$sanesecurity_enabled" == "yes" ] 
12
@@ -2131,20 +2131,11 @@ if [ "$sanesecurity_enabled" == "yes" ] 
22
         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
13
         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
23
         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
14
         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
24
 
15
 
25
-        sanesecurity_mirror_ips=$(dig +ignore +short "$sanesecurity_url")
16
-        sanesecurity_mirror_ips="$(dig +ignore +short "$sanesecurity_url")"
26
-        #add fallback to host if dig returns no records
17
-        # Add fallback to host if dig returns no records
27
-        if [ "$(xshok_array_count  "$sanesecurity_mirror_ips")" -lt 1 ] ; then
18
-        if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then
28
-          sanesecurity_mirror_ips=$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')
19
-          sanesecurity_mirror_ips="$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
29
-        fi
20
-        fi
30
+        sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//')
21
+        sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//')
31
 
22
 
32
         if [ "$(xshok_array_count  "$sanesecurity_mirror_ips")" -ge "1" ] ; then
23
         if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then
33
           for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
24
           for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
34
-            sanesecurity_mirror_name=""
25
-            sanesecurity_mirror_name=""
35
-            sanesecurity_mirror_name=$(dig +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')
26
-            sanesecurity_mirror_name="$(dig +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
36
-            #add fallback to host if dig returns no records
27
-            # Add fallback to host if dig returns no records
37
-            if [ "$sanesecurity_mirror_name" == "" ] ; then
28
-            if [ -z "$sanesecurity_mirror_name" ] ; then
38
-              sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')
29
-              sanesecurity_mirror_name="$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
39
-            fi
30
-            fi
40
+            sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//')
31
+            sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//')
41
             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
32
             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
42
             xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info"
33
             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
34
             # shellcheck disable=SC2086
(-)clamav-unofficial-sigs/files/patch-config_master.conf (-20 / +11 lines)
Lines 1-22 Link Here
1
--- config/master.conf.orig	2016-05-23 23:38:56 UTC
1
--- config/master.conf.orig	2017-03-18 11:57:29 UTC
2
+++ config/master.conf
2
+++ config/master.conf
3
@@ -58,8 +58,8 @@ reload_dbs="yes"
3
@@ -508,8 +508,8 @@ selinux_fixes="no" # Default is "no" ign
4
 work_dir="/var/lib/clamav-unofficial-sigs"   #Top level working directory
4
 # prevent the script from removing itself with the '-r' flag
5
 # If the script was installed via a package manager like yum, apt, pkg, etc.
6
 # The script will instead provide feedback to the user about how to uninstall the package.
7
-#pkg_mgr="" #the package manager name
8
-#pkg_rm="" #the package manager command to remove the script
9
+pkg_mgr="FreeBSD PKGNG" #the package manager name
10
+pkg_rm="pkg delete" #the package manager command to remove the script
5
 
11
 
6
 # Log update information to '$log_file_path/$log_file_name'.
12
 # Custom full working directory paths, these are detected and only used if you want to override
7
-logging_enabled="yes"
13
 # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers
8
-log_file_path="/var/log/clamav-unofficial-sigs"
9
+logging_enabled="no"
10
+log_file_path="/var/log"
11
 log_file_name="clamav-unofficial-sigs.log"
12
 
13
 
14
@@ -120,7 +120,7 @@ yararulesproject_enabled="yes"   # Yara-
15
 additional_enabled="yes"   # Additional Databases
16
 
17
 ## Disabling this will also cause the yararulesproject to be disabled.
18
-enable_yararules="yes"   #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99
19
+enable_yararules="no"   #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99
20
 
21
 # ========================
22
 # eXtremeSHOK Database format
(-)clamav-unofficial-sigs/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 428603 2016-12-15 06:33:34Z pi $
2
# $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 428603 2016-12-15 06:33:34Z pi $
3
3
4
PORTNAME=	clamav-unofficial-sigs
4
PORTNAME=	clamav-unofficial-sigs
5
PORTVERSION=	5.3.2
5
PORTVERSION=	5.6.2
6
PORTREVISION=	1
7
CATEGORIES=	security
6
CATEGORIES=	security
8
7
9
MAINTAINER=	sf@maxempire.com
8
MAINTAINER=	sf@maxempire.com
Lines 25-30 Link Here
25
24
26
USES=		perl5 shebangfix
25
USES=		perl5 shebangfix
27
SHEBANG_FILES=	clamav-unofficial-sigs.sh
26
SHEBANG_FILES=	clamav-unofficial-sigs.sh
27
28
USE_PERL5=	run
28
USE_PERL5=	run
29
29
30
SUB_FILES=	pkg-message
30
SUB_FILES=	pkg-message

Return to bug 222032