git: 87748de634d7 - main - security/vuxml: re-organize port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 15 Nov 2022 19:28:27 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=87748de634d7bee7e7fe431254f26d58e86f72b2
commit 87748de634d7bee7e7fe431254f26d58e86f72b2
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-11-15 19:12:12 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
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.
<xsl:template match="/">
<xsl:text disable-output-escaping="yes"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd" [
-<!ENTITY vuln-2003 SYSTEM "vuln-2003.xml">
-<!ENTITY vuln-2004 SYSTEM "vuln-2004.xml">
-<!ENTITY vuln-2005 SYSTEM "vuln-2005.xml">
-<!ENTITY vuln-2006 SYSTEM "vuln-2006.xml">
-<!ENTITY vuln-2007 SYSTEM "vuln-2007.xml">
-<!ENTITY vuln-2008 SYSTEM "vuln-2008.xml">
-<!ENTITY vuln-2009 SYSTEM "vuln-2009.xml">
-<!ENTITY vuln-2010 SYSTEM "vuln-2010.xml">
-<!ENTITY vuln-2011 SYSTEM "vuln-2011.xml">
-<!ENTITY vuln-2012 SYSTEM "vuln-2012.xml">
-<!ENTITY vuln-2013 SYSTEM "vuln-2013.xml">
-<!ENTITY vuln-2014 SYSTEM "vuln-2014.xml">
-<!ENTITY vuln-2015 SYSTEM "vuln-2015.xml">
-<!ENTITY vuln-2016 SYSTEM "vuln-2016.xml">
-<!ENTITY vuln-2017 SYSTEM "vuln-2017.xml">
-<!ENTITY vuln-2018 SYSTEM "vuln-2018.xml">
-<!ENTITY vuln-2019 SYSTEM "vuln-2019.xml">
-<!ENTITY vuln-2020 SYSTEM "vuln-2020.xml">
-<!ENTITY vuln-2021 SYSTEM "vuln-2021.xml">
-<!ENTITY vuln-2022 SYSTEM "vuln-2022.xml">
+<!ENTITY vuln-2003 SYSTEM "vuln/2003.xml">
+<!ENTITY vuln-2004 SYSTEM "vuln/2004.xml">
+<!ENTITY vuln-2005 SYSTEM "vuln/2005.xml">
+<!ENTITY vuln-2006 SYSTEM "vuln/2006.xml">
+<!ENTITY vuln-2007 SYSTEM "vuln/2007.xml">
+<!ENTITY vuln-2008 SYSTEM "vuln/2008.xml">
+<!ENTITY vuln-2009 SYSTEM "vuln/2009.xml">
+<!ENTITY vuln-2010 SYSTEM "vuln/2010.xml">
+<!ENTITY vuln-2011 SYSTEM "vuln/2011.xml">
+<!ENTITY vuln-2012 SYSTEM "vuln/2012.xml">
+<!ENTITY vuln-2013 SYSTEM "vuln/2013.xml">
+<!ENTITY vuln-2014 SYSTEM "vuln/2014.xml">
+<!ENTITY vuln-2015 SYSTEM "vuln/2015.xml">
+<!ENTITY vuln-2016 SYSTEM "vuln/2016.xml">
+<!ENTITY vuln-2017 SYSTEM "vuln/2017.xml">
+<!ENTITY vuln-2018 SYSTEM "vuln/2018.xml">
+<!ENTITY vuln-2019 SYSTEM "vuln/2019.xml">
+<!ENTITY vuln-2020 SYSTEM "vuln/2020.xml">
+<!ENTITY vuln-2021 SYSTEM "vuln/2021.xml">
+<!ENTITY vuln-2022 SYSTEM "vuln/2022.xml">
]>
]]></xsl:text>
<xsl:apply-templates />
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 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd" [
-<!ENTITY vuln-2003 SYSTEM "vuln-2003.xml">
-<!ENTITY vuln-2004 SYSTEM "vuln-2004.xml">
-<!ENTITY vuln-2005 SYSTEM "vuln-2005.xml">
-<!ENTITY vuln-2006 SYSTEM "vuln-2006.xml">
-<!ENTITY vuln-2007 SYSTEM "vuln-2007.xml">
-<!ENTITY vuln-2008 SYSTEM "vuln-2008.xml">
-<!ENTITY vuln-2009 SYSTEM "vuln-2009.xml">
-<!ENTITY vuln-2010 SYSTEM "vuln-2010.xml">
-<!ENTITY vuln-2011 SYSTEM "vuln-2011.xml">
-<!ENTITY vuln-2012 SYSTEM "vuln-2012.xml">
-<!ENTITY vuln-2013 SYSTEM "vuln-2013.xml">
-<!ENTITY vuln-2014 SYSTEM "vuln-2014.xml">
-<!ENTITY vuln-2015 SYSTEM "vuln-2015.xml">
-<!ENTITY vuln-2016 SYSTEM "vuln-2016.xml">
-<!ENTITY vuln-2017 SYSTEM "vuln-2017.xml">
-<!ENTITY vuln-2018 SYSTEM "vuln-2018.xml">
-<!ENTITY vuln-2019 SYSTEM "vuln-2019.xml">
-<!ENTITY vuln-2020 SYSTEM "vuln-2020.xml">
-<!ENTITY vuln-2021 SYSTEM "vuln-2021.xml">
-<!ENTITY vuln-2022 SYSTEM "vuln-2022.xml">
+<!ENTITY vuln-2003 SYSTEM "vuln/2003.xml">
+<!ENTITY vuln-2004 SYSTEM "vuln/2004.xml">
+<!ENTITY vuln-2005 SYSTEM "vuln/2005.xml">
+<!ENTITY vuln-2006 SYSTEM "vuln/2006.xml">
+<!ENTITY vuln-2007 SYSTEM "vuln/2007.xml">
+<!ENTITY vuln-2008 SYSTEM "vuln/2008.xml">
+<!ENTITY vuln-2009 SYSTEM "vuln/2009.xml">
+<!ENTITY vuln-2010 SYSTEM "vuln/2010.xml">
+<!ENTITY vuln-2011 SYSTEM "vuln/2011.xml">
+<!ENTITY vuln-2012 SYSTEM "vuln/2012.xml">
+<!ENTITY vuln-2013 SYSTEM "vuln/2013.xml">
+<!ENTITY vuln-2014 SYSTEM "vuln/2014.xml">
+<!ENTITY vuln-2015 SYSTEM "vuln/2015.xml">
+<!ENTITY vuln-2016 SYSTEM "vuln/2016.xml">
+<!ENTITY vuln-2017 SYSTEM "vuln/2017.xml">
+<!ENTITY vuln-2018 SYSTEM "vuln/2018.xml">
+<!ENTITY vuln-2019 SYSTEM "vuln/2019.xml">
+<!ENTITY vuln-2020 SYSTEM "vuln/2020.xml">
+<!ENTITY vuln-2021 SYSTEM "vuln/2021.xml">
+<!ENTITY vuln-2022 SYSTEM "vuln/2022.xml">
]>
<!--
Copyright 2003-2022 Jacques Vidrine and contributors
diff --git a/security/vuxml/vuln-2003.xml b/security/vuxml/vuln/2003.xml
similarity index 100%
rename from security/vuxml/vuln-2003.xml
rename to security/vuxml/vuln/2003.xml
diff --git a/security/vuxml/vuln-2004.xml b/security/vuxml/vuln/2004.xml
similarity index 100%
rename from security/vuxml/vuln-2004.xml
rename to security/vuxml/vuln/2004.xml
diff --git a/security/vuxml/vuln-2005.xml b/security/vuxml/vuln/2005.xml
similarity index 100%
rename from security/vuxml/vuln-2005.xml
rename to security/vuxml/vuln/2005.xml
diff --git a/security/vuxml/vuln-2006.xml b/security/vuxml/vuln/2006.xml
similarity index 100%
rename from security/vuxml/vuln-2006.xml
rename to security/vuxml/vuln/2006.xml
diff --git a/security/vuxml/vuln-2007.xml b/security/vuxml/vuln/2007.xml
similarity index 100%
rename from security/vuxml/vuln-2007.xml
rename to security/vuxml/vuln/2007.xml
diff --git a/security/vuxml/vuln-2008.xml b/security/vuxml/vuln/2008.xml
similarity index 100%
rename from security/vuxml/vuln-2008.xml
rename to security/vuxml/vuln/2008.xml
diff --git a/security/vuxml/vuln-2009.xml b/security/vuxml/vuln/2009.xml
similarity index 100%
rename from security/vuxml/vuln-2009.xml
rename to security/vuxml/vuln/2009.xml
diff --git a/security/vuxml/vuln-2010.xml b/security/vuxml/vuln/2010.xml
similarity index 100%
rename from security/vuxml/vuln-2010.xml
rename to security/vuxml/vuln/2010.xml
diff --git a/security/vuxml/vuln-2011.xml b/security/vuxml/vuln/2011.xml
similarity index 100%
rename from security/vuxml/vuln-2011.xml
rename to security/vuxml/vuln/2011.xml
diff --git a/security/vuxml/vuln-2012.xml b/security/vuxml/vuln/2012.xml
similarity index 100%
rename from security/vuxml/vuln-2012.xml
rename to security/vuxml/vuln/2012.xml
diff --git a/security/vuxml/vuln-2013.xml b/security/vuxml/vuln/2013.xml
similarity index 100%
rename from security/vuxml/vuln-2013.xml
rename to security/vuxml/vuln/2013.xml
diff --git a/security/vuxml/vuln-2014.xml b/security/vuxml/vuln/2014.xml
similarity index 100%
rename from security/vuxml/vuln-2014.xml
rename to security/vuxml/vuln/2014.xml
diff --git a/security/vuxml/vuln-2015.xml b/security/vuxml/vuln/2015.xml
similarity index 100%
rename from security/vuxml/vuln-2015.xml
rename to security/vuxml/vuln/2015.xml
diff --git a/security/vuxml/vuln-2016.xml b/security/vuxml/vuln/2016.xml
similarity index 100%
rename from security/vuxml/vuln-2016.xml
rename to security/vuxml/vuln/2016.xml
diff --git a/security/vuxml/vuln-2017.xml b/security/vuxml/vuln/2017.xml
similarity index 100%
rename from security/vuxml/vuln-2017.xml
rename to security/vuxml/vuln/2017.xml
diff --git a/security/vuxml/vuln-2018.xml b/security/vuxml/vuln/2018.xml
similarity index 100%
rename from security/vuxml/vuln-2018.xml
rename to security/vuxml/vuln/2018.xml
diff --git a/security/vuxml/vuln-2019.xml b/security/vuxml/vuln/2019.xml
similarity index 100%
rename from security/vuxml/vuln-2019.xml
rename to security/vuxml/vuln/2019.xml
diff --git a/security/vuxml/vuln-2020.xml b/security/vuxml/vuln/2020.xml
similarity index 100%
rename from security/vuxml/vuln-2020.xml
rename to security/vuxml/vuln/2020.xml
diff --git a/security/vuxml/vuln-2021.xml b/security/vuxml/vuln/2021.xml
similarity index 100%
rename from security/vuxml/vuln-2021.xml
rename to security/vuxml/vuln/2021.xml
diff --git a/security/vuxml/vuln-2022.xml b/security/vuxml/vuln/2022.xml
similarity index 100%
rename from security/vuxml/vuln-2022.xml
rename to security/vuxml/vuln/2022.xml