From owner-svn-ports-all@freebsd.org Mon May 27 13:02:06 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B93001581A9E; Mon, 27 May 2019 13:02:06 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5D7F56C346; Mon, 27 May 2019 13:02:06 +0000 (UTC) (envelope-from bapt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D460338A; Mon, 27 May 2019 13:02:06 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4RD258k057152; Mon, 27 May 2019 13:02:05 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4RD254R057151; Mon, 27 May 2019 13:02:05 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201905271302.x4RD254R057151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 27 May 2019 13:02:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502793 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 502793 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5D7F56C346 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 27 May 2019 13:02:06 -0000 Author: bapt Date: Mon May 27 13:02:05 2019 New Revision: 502793 URL: https://svnweb.freebsd.org/changeset/ports/502793 Log: Improve vulnerability checking Use the return value of the pkg audit command instead of parsing its output The output will change in the next version of pkg Approved by: mat (portmgr) Reviewed by: mat (portmgr) Differential Revision: https://reviews.freebsd.org/D20376 Modified: head/Mk/Scripts/check-vulnerable.sh Modified: head/Mk/Scripts/check-vulnerable.sh ============================================================================== --- head/Mk/Scripts/check-vulnerable.sh Mon May 27 12:58:08 2019 (r502792) +++ head/Mk/Scripts/check-vulnerable.sh Mon May 27 13:02:05 2019 (r502793) @@ -24,9 +24,7 @@ if [ ! -x "${dp_PKG_BIN}" ]; then exit 0 fi -vlist=$(${dp_PKG_BIN} audit "${dp_PKGNAME}" || :) - -if [ "${vlist}" != "0 problem(s) in the installed packages found." ]; then +if ! vlist=$(${dp_PKG_BIN} audit "${dp_PKGNAME}"); then ${dp_ECHO_MSG} "===> ${dp_PKGNAME} has known vulnerabilities:" ${dp_ECHO_MSG} "$vlist" ${dp_ECHO_MSG} "=> Please update your ports tree and try again."