From owner-svn-ports-all@FreeBSD.ORG  Sun Jan  5 01:16:34 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BCCAB479;
 Sun,  5 Jan 2014 01:16:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A91C3127B;
 Sun,  5 Jan 2014 01:16:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s051GYLk002352;
 Sun, 5 Jan 2014 01:16:34 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s051GY7v002351;
 Sun, 5 Jan 2014 01:16:34 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401050116.s051GY7v002351@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 5 Jan 2014 01:16:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338729 - head/Mk
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jan 2014 01:16:34 -0000

Author: bapt
Date: Sun Jan  5 01:16:34 2014
New Revision: 338729
URL: http://svnweb.freebsd.org/changeset/ports/338729

Log:
  Reinvokes portaudit a second time in case a problem has been reported. So if a refetch (or another temporary problem) caused the error it will succeed on a second attempt, while a correctly detected vulnerability will be detected a second time.
  
  PR:		ports/168479
  Submitted by:	Michael Gmelin <freebsd@grem.de>

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Jan  5 01:06:11 2014	(r338728)
+++ head/Mk/bsd.port.mk	Sun Jan  5 01:16:34 2014	(r338729)
@@ -3338,6 +3338,11 @@ check-vulnerable:
 			vlist=`${LOCALBASE}/sbin/portaudit -X 14 "${PKGNAME}" \
 				2>&1 | grep -vE '^[0-9]+ problem\(s\) found.' \
 				|| true`; \
+			if [ -n "$$vlist" ]; then \
+				vlist=`${LOCALBASE}/sbin/portaudit -X 14 "${PKGNAME}" \
+					2>&1 | grep -vE '^[0-9]+ problem\(s\) found.' \
+					|| true`; \
+			fi ; \
 		else \
 			${ECHO_MSG} "===>  portaudit database exists, however, portaudit is not installed!"; \
 		fi; \