From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 15:37:16 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 99B1FDCE;
 Sat, 25 Jan 2014 15:37:16 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6BBA81A7B;
 Sat, 25 Jan 2014 15:37:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PFbGOj069887;
 Sat, 25 Jan 2014 15:37:16 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PFbGgR069885;
 Sat, 25 Jan 2014 15:37:16 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201401251537.s0PFbGgR069885@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Sat, 25 Jan 2014 15:37:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r341044 - in 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 15:37:16 -0000

Author: mat
Date: Sat Jan 25 15:37:15 2014
New Revision: 341044
URL: http://svnweb.freebsd.org/changeset/ports/341044
QAT: https://qat.redports.org/buildarchive/r341044/

Log:
  Add a hook to forbid committing to vulk.xml and other files at the same time.
  
  With hat:	portmgr
  Sponsored by:	Absolight

Added:
  svnadmin/hooks/scripts/vulnxml-unique.sh   (contents, props changed)
Modified:
  svnadmin/hooks/pre-commit

Modified: svnadmin/hooks/pre-commit
==============================================================================
--- svnadmin/hooks/pre-commit	Sat Jan 25 15:35:43 2014	(r341043)
+++ svnadmin/hooks/pre-commit	Sat Jan 25 15:37:15 2014	(r341044)
@@ -95,6 +95,9 @@ mergeinfo.sh "$REPO" "$TXN" || exit 1
 # check NO_STAGE in commits
 stage-only.sh "$REPO" "$TXN" || exit 1
 
+# check commits to vulk.xml don't have other files
+vulnxml_unique.sh "$REPO" "$TXN" || exit 1
+
 # check for merge debris
 detect-merge-conflicts.sh "$REPO" "$TXN" || exit 1
 

Added: svnadmin/hooks/scripts/vulnxml-unique.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ svnadmin/hooks/scripts/vulnxml-unique.sh	Sat Jan 25 15:37:15 2014	(r341044)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# $FreeBSD$
+
+# Check that security/vuxml/vuln.xml is not committed together with other files
+
+REPO=$1
+TXN=$2
+
+# check arguments
+if [ -z "$REPO" -o -z "$TXN" ] ; then
+  echo "Syntax: $0 path_to_repos txn_id" >&2
+  exit 1
+fi
+
+# no commit to vuln.xml or other files yet
+VULN_XML=0
+OTHER=0
+
+# see what has changed
+OIFS=${IFS}
+IFS=$'\n'
+for line in $(svnlook changed -t $TXN $REPO) ; do
+	IFS=${OIFS}
+	set -- $line
+	type=$1
+	fpath=$2
+	case $fpath in
+		*/security/vuxml/vuln.xml)
+			VULN_XML=1
+			;;
+		*)
+			OTHER=1
+			;;
+	esac
+done
+
+# yell
+if [ $VULN_XML -gt 0 -a $OTHER -gt 0 ] ; then
+	echo "Commit to security/vuxml/vuln.xml first, and then other files"
+	exit 1
+fi
+
+# ok
+exit 0