From owner-svn-ports-head@FreeBSD.ORG  Fri May 22 07:04:29 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 741FB5BC;
 Fri, 22 May 2015 07:04:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62AB8167C;
 Fri, 22 May 2015 07:04:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4M74TQi033778;
 Fri, 22 May 2015 07:04:29 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4M74S2R033775;
 Fri, 22 May 2015 07:04:28 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201505220704.t4M74S2R033775@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 22 May 2015 07:04:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386985 - in head/security/vuxml: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 May 2015 07:04:29 -0000

Author: delphij
Date: Fri May 22 07:04:28 2015
New Revision: 386985
URL: https://svnweb.freebsd.org/changeset/ports/386985

Log:
  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

Modified:
  head/security/vuxml/Makefile
  head/security/vuxml/files/extra-validation.py

Modified: head/security/vuxml/Makefile
==============================================================================
--- head/security/vuxml/Makefile	Fri May 22 06:17:29 2015	(r386984)
+++ head/security/vuxml/Makefile	Fri May 22 07:04:28 2015	(r386985)
@@ -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 ]; \

Modified: head/security/vuxml/files/extra-validation.py
==============================================================================
--- head/security/vuxml/files/extra-validation.py	Fri May 22 06:17:29 2015	(r386984)
+++ head/security/vuxml/files/extra-validation.py	Fri May 22 07:04:28 2015	(r386985)
@@ -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}"