Attachment 168883 Details for Bug 208459 – Update of the port to the version 5.0.5

[patch] Update of the port to the version 5.0.5

patch505.txt (text/plain), 5.97 KB, created by Marko Njezic on 2016-04-01 23:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marko Njezic

Created: 2016-04-01 23:45:09 UTC

Size: 5.97 KB

patch

obsolete

>diff -Naur clamav-unofficial-sigs.orig/Makefile clamav-unofficial-sigs/Makefile
>--- clamav-unofficial-sigs.orig/Makefile	2016-04-01 16:25:16.000000000 +0200
>+++ clamav-unofficial-sigs/Makefile	2016-04-01 18:19:47.000000000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
> PORTNAME=	clamav-unofficial-sigs
>-PORTVERSION=	5.0.4
>-PORTREVISION=	1
>+PORTVERSION=	5.0.5
> CATEGORIES=	security
> 
> MAINTAINER=	sf@maxempire.com
>diff -Naur clamav-unofficial-sigs.orig/distinfo clamav-unofficial-sigs/distinfo
>--- clamav-unofficial-sigs.orig/distinfo	2016-03-31 15:36:52.000000000 +0200
>+++ clamav-unofficial-sigs/distinfo	2016-04-02 00:25:33.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (extremeshok-clamav-unofficial-sigs-5.0.4_GH0.tar.gz) = 156ddea8fbb2612fac1d5f4baa0902d325821040f4b794acf81c7d7e8525f35b
>-SIZE (extremeshok-clamav-unofficial-sigs-5.0.4_GH0.tar.gz) = 31931
>+SHA256 (extremeshok-clamav-unofficial-sigs-5.0.5_GH0.tar.gz) = 2aeba3f281511f5acc1d79b5f3460440cd579c75ae23b28d1dabde8321a87570
>+SIZE (extremeshok-clamav-unofficial-sigs-5.0.5_GH0.tar.gz) = 34027
>diff -Naur clamav-unofficial-sigs.orig/files/patch-clamav-unofficial-sigs.sh clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
>--- clamav-unofficial-sigs.orig/files/patch-clamav-unofficial-sigs.sh	2016-03-31 16:56:36.000000000 +0200
>+++ clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh	2016-04-01 18:15:32.000000000 +0200
>@@ -1,15 +1,15 @@
>---- clamav-unofficial-sigs.sh.orig	2016-03-31 14:38:13 UTC
>-+++ clamav-unofficial-sigs.sh
>-@@ -158,7 +158,7 @@ minimum_required_config_version="56"
>- version_date="31 March 2016"
>+--- 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")
>  
>- 
>-@@ -542,6 +542,8 @@ make_signature_database_from_ascii_file 
>+ #Initialise 
>+@@ -627,6 +627,8 @@
>  #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 @@
>  		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 -Naur clamav-unofficial-sigs.orig/files/patch-config_os.freebsd.conf clamav-unofficial-sigs/files/patch-config_os.freebsd.conf
>--- clamav-unofficial-sigs.orig/files/patch-config_os.freebsd.conf	2016-03-31 15:36:52.000000000 +0200
>+++ clamav-unofficial-sigs/files/patch-config_os.freebsd.conf	2016-04-01 23:11:22.000000000 +0200
>@@ -1,6 +1,6 @@
>---- config/os.freebsd.conf.orig	2016-03-31 01:16:02 UTC
>-+++ config/os.freebsd.conf
>-@@ -32,11 +32,6 @@ clamd_pid="/var/run/clamav/clamd.pid"
>+--- config/os.freebsd.conf.orig	2016-04-01 23:44:00.000000000 +0200
>++++ config/os.freebsd.conf	2016-04-01 23:05:01.000000000 +0200
>+@@ -32,13 +32,8 @@
>  
>  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 -Naur clamav-unofficial-sigs.orig/files/patch-config_user.conf clamav-unofficial-sigs/files/patch-config_user.conf
>--- clamav-unofficial-sigs.orig/files/patch-config_user.conf	2016-03-31 15:36:52.000000000 +0200
>+++ clamav-unofficial-sigs/files/patch-config_user.conf	1970-01-01 01:00:00.000000000 +0100
>@@ -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.

Actions: View | Diff

Attachments on bug 208459: 168883