From owner-svn-ports-all@freebsd.org  Wed Jan 11 15:08:55 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA697CAA243;
 Wed, 11 Jan 2017 15:08:55 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 89DDC16EE;
 Wed, 11 Jan 2017 15:08:55 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BF8s1h024582;
 Wed, 11 Jan 2017 15:08:54 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BF8sRt024581;
 Wed, 11 Jan 2017 15:08:54 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201701111508.v0BF8sRt024581@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 11 Jan 2017 15:08:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r431188 - svnadmin/hooks/scripts
X-SVN-Group: ports-svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 15:08:55 -0000

Author: mat
Date: Wed Jan 11 15:08:54 2017
New Revision: 431188
URL: https://svnweb.freebsd.org/changeset/ports/431188

Log:
  Forbid commits to vuln.xml on branches.
  
  Approved by:	feld
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D9105

Modified:
  svnadmin/hooks/scripts/vulnxml-unique.sh

Modified: svnadmin/hooks/scripts/vulnxml-unique.sh
==============================================================================
--- svnadmin/hooks/scripts/vulnxml-unique.sh	Wed Jan 11 15:07:53 2017	(r431187)
+++ svnadmin/hooks/scripts/vulnxml-unique.sh	Wed Jan 11 15:08:54 2017	(r431188)
@@ -28,12 +28,22 @@ for line in $(svnlook changed -t $TXN $R
 		head/security/vuxml/vuln.xml)
 			VULN_XML=1
 			;;
+		branches/*/security/vuxml/vuln.xml)
+			if [ ${type} != 'A' ]; then
+				VULN_XML=2
+			fi
+			;;
 		*)
 			OTHER=1
 			;;
 	esac
 done
 
+if [ $VULN_XML -eq 2 ]; then
+	echo "Commits to security/vuxml/vuln.xml are only allowed on HEAD" 1>&2
+	exit 1
+fi
+
 # yell
 if [ $VULN_XML -gt 0 -a $OTHER -gt 0 ] ; then
 	echo "Commit to security/vuxml/vuln.xml first, and then other files" 1>&2