summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-05-22 07:04:28 +0000
committerXin LI <delphij@FreeBSD.org>2015-05-22 07:04:28 +0000
commitdd5bb00341bb402a1375f2ae8b4ef775dbb32322 (patch)
tree9ef24f7df0230bb15381411cbf58a49e3d169d8d /security
parent593868eac662f725d38214ebcf5997eb80746078 (diff)
downloadfreebsd-ports-dd5bb00341bb402a1375f2ae8b4ef775dbb32322.zip
Pass full path to the vuln.xml file to extra-validation.py. Without this,
if .OBJDIR differs from .CURDIR, the validation would fail. PR: 193923 Reported by: jbeich
Diffstat (limited to 'security')
-rw-r--r--security/vuxml/Makefile2
-rw-r--r--security/vuxml/files/extra-validation.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index 38328cd16856..629f88571954 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -83,7 +83,7 @@ validate: tidy
${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \
return 1; \
fi
- ${PYTHON_CMD} ${FILESDIR}/extra-validation.py
+ ${PYTHON_CMD} ${FILESDIR}/extra-validation.py ${VUXML_FILE}
tidy: vuln.xml
@if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \
diff --git a/security/vuxml/files/extra-validation.py b/security/vuxml/files/extra-validation.py
index 625cd63b7174..61c9254b6d69 100644
--- a/security/vuxml/files/extra-validation.py
+++ b/security/vuxml/files/extra-validation.py
@@ -5,7 +5,11 @@ import datetime
import xml.etree.ElementTree as ET
import sys
-tree = ET.parse('vuln.xml')
+if len(sys.argv) != 2:
+ print "Usage: %s vuln.xml" % (sys.argv[0])
+ sys.exit(1)
+
+tree = ET.parse(sys.argv[1])
root = tree.getroot()
namespace = "{http://www.vuxml.org/apps/vuxml-1}"