Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 May 2005 20:24:01 +0100
From:      Thomas Hurst <tom.hurst@clara.net>
To:        Tony Shadwick <tshadwick@goinet.com>
Cc:        freebsd-questions@freebsd.org
Subject:   Re: portaudit is being stubborn
Message-ID:  <20050521192401.GA57477@voi.aagh.net>
In-Reply-To: <20050521111200.Q11826@mail.goinet.com>
References:  <20050517144200.T26182@mail.goinet.com> <3aaaa3a05052005436414e0a3@mail.gmail.com> <20050521110951.GB27958@voi.aagh.net> <20050521111200.Q11826@mail.goinet.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--DocE+STaALJfprDB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

* Tony Shadwick (tshadwick@goinet.com) wrote:

> I'd like to see it done, but I know just enough sh scripting to be 
> dangerous. ;)
> 
> If it were perl I'd be all over it.   Any takers? :)

Well, the relevent bit is actually written in awk :)

The attached patch seems to do the trick.  Note portaudit_fixed is a
regular expression, so if you want to list multiple entries, seperate
them with |

-- 
Thomas 'Freaky' Hurst
    http://hur.st/

--DocE+STaALJfprDB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="portaudit-fixedre.diff"

--- portaudit.old	Mon Sep  6 20:18:55 2004
+++ portaudit	Sat May 21 20:18:21 2005
@@ -136,8 +136,8 @@
 		BEGIN { vul=0; fixedre="'"$fixedre"'" }
 		/^(#|\$)/ { next }
 		$2 !~ /'"$opt_restrict"'/ { next }
+		{ if (fixedre && $2 ~ fixedre) next }
 		$1 ~ /^FreeBSD[<=>!]/ {
-			if (fixedre && $2 ~ fixedre) next
 			if (!system("'"$pkg_version"' -T \"FreeBSD-'"$osversion"'\" \"" $1 "\"")) {
 				print_affected("FreeBSD-'"$osversion"'", \
 					"To disable this check add the uuid to \`portaudit_fixed'"'"' in /usr/local/etc/portaudit.conf")

--DocE+STaALJfprDB--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050521192401.GA57477>