From owner-svn-ports-all@freebsd.org Sat Apr 2 05:55:09 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C690AAEB8C5; Sat, 2 Apr 2016 05:55:09 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 883B31A42; Sat, 2 Apr 2016 05:55:09 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u325t8LL059578; Sat, 2 Apr 2016 05:55:08 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u325t8YY059574; Sat, 2 Apr 2016 05:55:08 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604020555.u325t8YY059574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 2 Apr 2016 05:55:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412381 - in head/security/clamav-unofficial-sigs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 05:55:09 -0000 Author: pi Date: Sat Apr 2 05:55:08 2016 New Revision: 412381 URL: https://svnweb.freebsd.org/changeset/ports/412381 Log: 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 (maintainer) Deleted: head/security/clamav-unofficial-sigs/files/patch-config_user.conf Modified: head/security/clamav-unofficial-sigs/Makefile head/security/clamav-unofficial-sigs/distinfo head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf Modified: head/security/clamav-unofficial-sigs/Makefile ============================================================================== --- head/security/clamav-unofficial-sigs/Makefile Sat Apr 2 05:39:14 2016 (r412380) +++ head/security/clamav-unofficial-sigs/Makefile Sat Apr 2 05:55:08 2016 (r412381) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= clamav-unofficial-sigs -PORTVERSION= 5.0.4 -PORTREVISION= 1 +PORTVERSION= 5.0.5 CATEGORIES= security MAINTAINER= sf@maxempire.com Modified: head/security/clamav-unofficial-sigs/distinfo ============================================================================== --- head/security/clamav-unofficial-sigs/distinfo Sat Apr 2 05:39:14 2016 (r412380) +++ head/security/clamav-unofficial-sigs/distinfo Sat Apr 2 05:55:08 2016 (r412381) @@ -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 Modified: head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Sat Apr 2 05:39:14 2016 (r412380) +++ head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Sat Apr 2 05:55:08 2016 (r412381) @@ -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 Modified: head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf Sat Apr 2 05:39:14 2016 (r412380) +++ head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf Sat Apr 2 05:55:08 2016 (r412381) @@ -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 ######################################################