From nobody Tue Nov 15 19:28:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NBbnS05QNz4hYf6; Tue, 15 Nov 2022 19:28:28 +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 4NBbnR6j34z4Jjp; Tue, 15 Nov 2022 19:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668540507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gnF0qUwVjizYDa/oQxP+EqbGvwohmAy3LkGljcFNJ00=; b=uZC6NolWV4V6+DIHqLTnuK0G6eu9Ntl8AaqiRcwR5SWCWAkhcCvRzJccVfjX/nOyFCUpli HLKLKGafjCNDAahzfO5sphQWo3FF0znb9HtWBRq3vtcJ/8QAteLQwgrLH2drjKgJaS0qV3 zY7fj8RXf54drzOcjZTdh5P3mBK0oKBM2S920Qf2ks96BOFwKBQf3gsoUaBQuKXndeAuJ/ kv7fzsupoLpqkQf5DQoGZQ3mYswgKnwMUOBDg2Y+gCkHjlNhAOmaW+UtiIT24+7+NxAOla ezmaMEjgv7DDwueyuyE3eg11xi/AzNUz512OIpCw6NKlj772dJVePprUQjocmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668540507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gnF0qUwVjizYDa/oQxP+EqbGvwohmAy3LkGljcFNJ00=; b=ota2gAqnSLrezeqzhssJcJRf0SkySEcx9aiyh2MIy73cX0qNTtxFRvJeg76VS202u5K18W Va6xXruQcjS38pQZrKVQmY8uhW+MY2V1oTRwBDmmDOdEOPCABmV2qAQmf0gCIm9YFWEkO1 74+74dveiXMMa2QD/wPRcW1wDK0X3agdVefataHwXGgTvsTToTDftSmKVrBNZIiVrQFmFI W0xSioBYUldczP4DisNuhtMRUoUmjM65GMcJ6fWLX2wripwjoFTCFKjgjSLyZ8zjd5T1R3 cX4cDq0PBTb+Xh8VVeEgx/WLUDQtwzzHgXEFhM9MfN7hmtaqIrtwFSTEOU2ufg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668540507; a=rsa-sha256; cv=none; b=J/IgOBfQ1nqAM/BLWOlJGsDSX6TGaP2agj5xcf7dZSgyX58+S7ZWJCPzGwPtFJubmqGK5s oghZoMZELMjZ2gzo5Uy+0KG0hzg33vbAXpdWYDTTM6JG9A+BOZL7+nK0y+Ou9kM3K6kv+Z 5k9pPat6HPr5OCZgyhymMLLd7OCcg8Mc8O1IwwDKlE8f4oD1k5/xEzClAPUaXa52rpXclK rkcJm3yEsNQItQBWYvrhKVlbMlIQ2+sBf7Ol65J/75Z3q3MAH29YHfMc/j1+xz4lwLVME4 0V01Qbfy02NzB4p6HJPM2SvpFl5D1PiW4e415neV6U0J+A8hzhaSP3/Mzadzug== 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 4NBbnR5YlVzYy5; Tue, 15 Nov 2022 19:28:27 +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 2AFJSR1U072416; Tue, 15 Nov 2022 19:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFJSRqf072415; Tue, 15 Nov 2022 19:28:27 GMT (envelope-from git) Date: Tue, 15 Nov 2022 19:28:27 GMT Message-Id: <202211151928.2AFJSRqf072415@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 87748de634d7 - main - security/vuxml: re-organize port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87748de634d7bee7e7fe431254f26d58e86f72b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=87748de634d7bee7e7fe431254f26d58e86f72b2 commit 87748de634d7bee7e7fe431254f26d58e86f72b2 Author: Rene Ladan AuthorDate: 2022-11-15 19:12:12 +0000 Commit: Rene Ladan CommitDate: 2022-11-15 19:27:34 +0000 security/vuxml: re-organize port - move vuln-YYYY.xml files into vuln/ as just YYYY.xml - this prevents problems with the new check_files hook when 2023 arrives. --- security/vuxml/Makefile | 8 ++--- security/vuxml/files/tidy.xsl | 40 ++++++++++++------------- security/vuxml/vuln.xml | 40 ++++++++++++------------- security/vuxml/{vuln-2003.xml => vuln/2003.xml} | 0 security/vuxml/{vuln-2004.xml => vuln/2004.xml} | 0 security/vuxml/{vuln-2005.xml => vuln/2005.xml} | 0 security/vuxml/{vuln-2006.xml => vuln/2006.xml} | 0 security/vuxml/{vuln-2007.xml => vuln/2007.xml} | 0 security/vuxml/{vuln-2008.xml => vuln/2008.xml} | 0 security/vuxml/{vuln-2009.xml => vuln/2009.xml} | 0 security/vuxml/{vuln-2010.xml => vuln/2010.xml} | 0 security/vuxml/{vuln-2011.xml => vuln/2011.xml} | 0 security/vuxml/{vuln-2012.xml => vuln/2012.xml} | 0 security/vuxml/{vuln-2013.xml => vuln/2013.xml} | 0 security/vuxml/{vuln-2014.xml => vuln/2014.xml} | 0 security/vuxml/{vuln-2015.xml => vuln/2015.xml} | 0 security/vuxml/{vuln-2016.xml => vuln/2016.xml} | 0 security/vuxml/{vuln-2017.xml => vuln/2017.xml} | 0 security/vuxml/{vuln-2018.xml => vuln/2018.xml} | 0 security/vuxml/{vuln-2019.xml => vuln/2019.xml} | 0 security/vuxml/{vuln-2020.xml => vuln/2020.xml} | 0 security/vuxml/{vuln-2021.xml => vuln/2021.xml} | 0 security/vuxml/{vuln-2022.xml => vuln/2022.xml} | 0 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile index 1b75dcb8748a..11132d8c65d5 100644 --- a/security/vuxml/Makefile +++ b/security/vuxml/Makefile @@ -1,6 +1,6 @@ PORTNAME= vuxml PORTVERSION= 1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security textproc MASTER_SITES= http://www.vuxml.org/dtd/vuxml-1/ DISTFILES= vuxml-10.dtd vuxml-model-10.mod \ @@ -32,7 +32,7 @@ dir_DTD= share/xml/dtd/vuxml VUXML_FILE?= ${PKGDIR}/vuln.xml VUXML_FLAT_FILE?= ${PKGDIR}/vuln-flat.xml _YEAR!= date +%Y -VUXML_CURRENT_FILE?= ${PKGDIR}/vuln-${_YEAR}.xml +VUXML_CURRENT_FILE?= ${PKGDIR}/vuln/${_YEAR}.xml post-clean: @${RM} "${VUXML_FILE}.tidy" @@ -53,10 +53,10 @@ do-install: do-test: @${MKDIR} ${WRKDIR}/test - @${CP} ${.CURDIR}/vuln*.xml ${WRKDIR}/test + @${CP} -R ${.CURDIR}/vuln.xml ${.CURDIR}/vuln ${WRKDIR}/test @cd ${.CURDIR} && make validate PKGDIR=${WRKDIR}/test -${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln-20??.xml +${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln/*.xml xmllint -noent ${.ALLSRC:[1]} > ${.TARGET} validate: tidy diff --git a/security/vuxml/files/tidy.xsl b/security/vuxml/files/tidy.xsl index e48c36c691c2..c912c0b4f7a1 100644 --- a/security/vuxml/files/tidy.xsl +++ b/security/vuxml/files/tidy.xsl @@ -25,26 +25,26 @@ result in more namespace declarations than we wish. - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ]> ]]> diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index 845b3df9e509..d181901f3970 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ]>