Attachment #168883 for bug #208459

View | Details | Raw Unified | Return to bug 208459
Collapse All | Expand All

Lines 2-9 Link Here

(-)clamav-unofficial-sigs/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 412349 2016-04-01 14:25:16Z mat $	2	# $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 412349 2016-04-01 14:25:16Z mat $
3		3
4	PORTNAME= clamav-unofficial-sigs	4	PORTNAME= clamav-unofficial-sigs
5	PORTVERSION= 5.0.4	5	PORTVERSION= 5.0.5
6	PORTREVISION= 1
7	CATEGORIES= security	6	CATEGORIES= security
8		7
9	MAINTAINER= sf@maxempire.com	8	MAINTAINER= sf@maxempire.com

Lines 1-2 Link Here

(-)clamav-unofficial-sigs/distinfo (-2 / +2 lines)
1	SHA256 (extremeshok-clamav-unofficial-sigs-5.0.4_GH0.tar.gz) = 156ddea8fbb2612fac1d5f4baa0902d325821040f4b794acf81c7d7e8525f35b	1	SHA256 (extremeshok-clamav-unofficial-sigs-5.0.5_GH0.tar.gz) = 2aeba3f281511f5acc1d79b5f3460440cd579c75ae23b28d1dabde8321a87570
2	SIZE (extremeshok-clamav-unofficial-sigs-5.0.4_GH0.tar.gz) = 31931	2	SIZE (extremeshok-clamav-unofficial-sigs-5.0.5_GH0.tar.gz) = 34027




--- clamav-unofficial-sigs.sh.orig	2016-04-01 14:36:00.000000000 +0200
+++ clamav-unofficial-sigs.sh	2016-04-01 18:14:26.000000000 +0200
@@ -187,7 +187,7 @@
 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")
 
 #Initialise 
@@ -627,6 +627,8 @@
 #Remove the clamav-unofficial-sigs script
 remove_script () {
 	echo ""

 	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"
@@ -1175,22 +1177,13 @@
 		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_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

Lines 1-6 Link Here

(-)clamav-unofficial-sigs/files/patch-config_os.freebsd.conf (-4 / +6 lines)
1	--- config/os.freebsd.conf.orig 2016-03-31 01:16:02 UTC	1	--- config/os.freebsd.conf.orig 2016-04-01 23:44:00.000000000 +0200
2	+++ config/os.freebsd.conf	2	+++ config/os.freebsd.conf 2016-04-01 23:05:01.000000000 +0200
3	@@ -32,11 +32,6 @@ clamd_pid="/var/run/clamav/clamd.pid"	3	@@ -32,13 +32,8 @@
4		4
5	work_dir="/var/db/clamav-unofficial-sigs"	5	work_dir="/var/db/clamav-unofficial-sigs"
6		6
Lines 9-14 Link Here
9	clamd_restart_opt="service clamav-clamd reload"	9	clamd_restart_opt="service clamav-clamd reload"
10		10
11	#clamd_socket="/var/run/clamav/clamd.sock"	11	#clamd_socket="/var/run/clamav/clamd.sock"
12	-	12
13	-pkg_mgr="FreeBSD ports"	13	-pkg_mgr="FreeBSD ports"
14	-pkg_rm="pkg remove"	14	-pkg_rm="pkg remove"
		15	-
		16	# https://eXtremeSHOK.com ######################################################

Lines 1-11 Link Here

(-)clamav-unofficial-sigs/files/patch-config_user.conf (-11 lines)
1	--- config/user.conf.orig 2016-03-31 01:16:02 UTC
2	+++ config/user.conf
3	@@ -20,6 +20,8 @@
4	# SEE MASTER.CONF FOR CONFIG EXPLAINATIONS
5	################################################################################
6
7	+# IMPORTANT: Logging options should only be changed in master.conf file!
8	+
9	# Values in this file will always override those in the master.conf and os.conf files.
10	# This is useful to specify your authorisation/receipt codes and to always force certain options.
11	# Please note, it is your responsibility to manage the contents of this file.

Return to bug 208459

Lines 1-15 Link Here

(-)clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh (-9 / +22 lines)
1	--- clamav-unofficial-sigs.sh.orig 2016-03-31 14:38:13 UTC	1	--- clamav-unofficial-sigs.sh.orig 2016-04-01 14:36:00.000000000 +0200
2	+++ clamav-unofficial-sigs.sh	2	+++ clamav-unofficial-sigs.sh 2016-04-01 18:14:26.000000000 +0200
3	@@ -158,7 +158,7 @@ minimum_required_config_version="56"	3	@@ -187,7 +187,7 @@
4	version_date="31 March 2016"	4	minimum_required_config_version="56"
5		5
6	#default config files	6	#default config files
7	-config_dir="/etc/clamav-unofficial-sigs"	7	-config_dir="/etc/clamav-unofficial-sigs"
8	+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"	8	+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
9	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")
10		10
11		11	#Initialise
12	@@ -542,6 +542,8 @@ make_signature_database_from_ascii_file	12	@@ -627,6 +627,8 @@
13	#Remove the clamav-unofficial-sigs script	13	#Remove the clamav-unofficial-sigs script
14	remove_script () {	14	remove_script () {
15	echo ""	15	echo ""
Lines 18-32 Link Here
18	if [ -n "$pkg_mgr" -a -n "$pkg_rm" ] ; then	18	if [ -n "$pkg_mgr" -a -n "$pkg_rm" ] ; then
19	echo " This script (clamav-unofficial-sigs) was installed on the system"	19	echo " This script (clamav-unofficial-sigs) was installed on the system"
20	echo " via '$pkg_mgr', use '$pkg_rm' to remove the script"	20	echo " via '$pkg_mgr', use '$pkg_rm' to remove the script"
21	@@ -1088,9 +1090,9 @@ if [ "$sanesecurity_enabled" == "yes" ]	21	@@ -1175,22 +1177,13 @@
22	db_file=""	22	db_file=""
23
24	xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="	23	xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
		24
25	- sanesecurity_mirror_ips=`dig +ignore +short $sanesecurity_url`	25	- sanesecurity_mirror_ips=`dig +ignore +short $sanesecurity_url`
		26	- #add fallback to host if dig returns no records
		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}'`
		29	- fi
26	+ sanesecurity_mirror_ips=`host $sanesecurity_url \| sed 's/.*\s//'`	30	+ sanesecurity_mirror_ips=`host $sanesecurity_url \| sed 's/.*\s//'`
		31
		32	if [ `xshok_array_count "$sanesecurity_mirror_ips"` -ge "1" ] ; then
		33
		34
27	for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do	35	for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
		36	- sanesecurity_mirror_name=""
28	- sanesecurity_mirror_name=`dig +short -x $sanesecurity_mirror_ip \| command sed 's/\.$//'`	37	- sanesecurity_mirror_name=`dig +short -x $sanesecurity_mirror_ip \| command sed 's/\.$//'`
		38	- #add fallback to host if dig returns no records
		39	- if [ "$sanesecurity_mirror_name" == "" ] ; then
		40	- sanesecurity_mirror_name=`host "$sanesecurity_mirror_ip" \| sed -n '/name pointer/{s/.pointer \([^ ]\).*/\1/;p}'`
		41	- fi
29	+ sanesecurity_mirror_name=`host $sanesecurity_mirror_ip \| sed 's/.*\s//' \| sed 's/\.$//'`	42	+ sanesecurity_mirror_name=`host $sanesecurity_mirror_ip \| sed 's/.*\s//' \| sed 's/\.$//'`
30	sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"	43	sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
31	xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info"	44	xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info"
32	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	45	$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