From owner-dev-commits-ports-all@freebsd.org Wed Jul 14 16:19:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DA7064FC1F; Wed, 14 Jul 2021 16:19:40 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQ2lG2MBlz4hrD; Wed, 14 Jul 2021 16:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9E06C190DA; Wed, 14 Jul 2021 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16EGJYxK012293; Wed, 14 Jul 2021 16:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16EGJYWQ012292; Wed, 14 Jul 2021 16:19:34 GMT (envelope-from git) Date: Wed, 14 Jul 2021 16:19:34 GMT Message-Id: <202107141619.16EGJYWQ012292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 069e58611c79 - main - security/vuxml: Fix make test MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 069e58611c7933431ec82b0b9c119677e8d6cc21 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 16:19:40 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=069e58611c7933431ec82b0b9c119677e8d6cc21 commit 069e58611c7933431ec82b0b9c119677e8d6cc21 Author: Po-Chuan Hsieh AuthorDate: 2021-07-14 16:03:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-07-14 16:10:51 +0000 security/vuxml: Fix make test - Respect VUXML_FILE and VUXML_FLAT_FILE [1] It allows run "make test" on read-only media (e.g. poudriere jail) - Copy all vuln XML file to the test directory [2] Since vuln.xml has been split into multiple XML files, all of them must be copied to the test directory. Without [1], the error message is as follows: ===> Testing for vuxml-1.1_5 xmllint -noent vuln.xml > vuln-flat.xml /bin/sh: cannot create vuln-flat.xml: Read-only file system *** Error code 2 Stop. Without [2], the error message is as follows: ===> Testing for vuxml-1.1_5 xmllint -noent /wrkdirs/usr/ports/security/vuxml/work/test/vuln.xml > /wrkdirs/usr/ports/security/vuxml/work/test/vuln-flat.xml warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2021.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2020.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2019.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2018.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2017.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2016.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2015.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2014.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2013.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2012.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2011.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2010.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2009.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2008.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2007.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2006.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2005.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2004.xml" warning: failed to load external entity "/wrkdirs/usr/ports/security/vuxml/work/test/vuln-2003.xml" ... *** Error code 1 Stop. Approved by: delphij (ports-secteam) --- security/vuxml/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile index 4732225cf974..10657336a971 100644 --- a/security/vuxml/Makefile +++ b/security/vuxml/Makefile @@ -53,10 +53,10 @@ do-install: do-test: @${MKDIR} ${WRKDIR}/test - @${CP} ${.CURDIR}/vuln.xml ${WRKDIR}/test + @${CP} ${.CURDIR}/vuln*.xml ${WRKDIR}/test @cd ${.CURDIR} && make validate PKGDIR=${WRKDIR}/test -vuln-flat.xml: vuln.xml vuln-20??.xml +${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln-20??.xml xmllint -noent ${.ALLSRC:[1]} > ${.TARGET} validate: tidy @@ -82,7 +82,7 @@ validate: tidy fi ${PYTHON_CMD} ${FILESDIR}/extra-validation.py ${VUXML_FLAT_FILE} -tidy: vuln-flat.xml +tidy: ${VUXML_FLAT_FILE} @if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \ then \ echo "Please install the VuXML port prior to running make validate/tidy."; \