From owner-svn-ports-head@freebsd.org Thu Dec 15 06:33:35 2016 Return-Path: Delivered-To: svn-ports-head@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 DD920C80D52; Thu, 15 Dec 2016 06:33:35 +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 A009EC92; Thu, 15 Dec 2016 06:33:35 +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 uBF6XYYt048657; Thu, 15 Dec 2016 06:33:34 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBF6XYeG048655; Thu, 15 Dec 2016 06:33:34 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201612150633.uBF6XYeG048655@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 15 Dec 2016 06:33:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428603 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2016 06:33:36 -0000 Author: pi Date: Thu Dec 15 06:33:34 2016 New Revision: 428603 URL: https://svnweb.freebsd.org/changeset/ports/428603 Log: security/clamav-unofficial-sigs: fix regexp problems PR: 214573 Submitted by: Marko Njezic (maintainer) Reported by: freebsdbug@patpro.net Modified: head/security/clamav-unofficial-sigs/Makefile head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Modified: head/security/clamav-unofficial-sigs/Makefile ============================================================================== --- head/security/clamav-unofficial-sigs/Makefile Thu Dec 15 04:18:30 2016 (r428602) +++ head/security/clamav-unofficial-sigs/Makefile Thu Dec 15 06:33:34 2016 (r428603) @@ -3,6 +3,7 @@ PORTNAME= clamav-unofficial-sigs PORTVERSION= 5.3.2 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= sf@maxempire.com Modified: head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Thu Dec 15 04:18:30 2016 (r428602) +++ head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Thu Dec 15 06:33:34 2016 (r428603) @@ -1,4 +1,4 @@ ---- clamav-unofficial-sigs.sh.orig 2016-06-03 09:51:21 UTC +--- clamav-unofficial-sigs.sh.orig 2016-11-18 10:05:40 UTC +++ clamav-unofficial-sigs.sh @@ -753,6 +753,8 @@ function make_signature_database_from_as #Remove the clamav-unofficial-sigs script @@ -27,7 +27,7 @@ - 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//') ++ sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//') if [ "$(xshok_array_count "$sanesecurity_mirror_ips")" -ge "1" ] ; then for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do @@ -37,7 +37,7 @@ - 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_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | 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" "rsync://$sanesecurity_mirror_ip/sanesecurity" "$work_dir_sanesecurity" 2>/dev/null