From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jan 8 14:38:44 2014 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41305AAC; Wed, 8 Jan 2014 14:38:44 +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 2CF921F98; Wed, 8 Jan 2014 14:38:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08Eciac015274; Wed, 8 Jan 2014 14:38:44 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Echha015272; Wed, 8 Jan 2014 14:38:43 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081438.s08Echha015272@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 14:38:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339139 - 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-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 14:38:44 -0000 Author: bapt Date: Wed Jan 8 14:38:43 2014 New Revision: 339139 URL: http://svnweb.freebsd.org/changeset/ports/339139 Log: Add a hook to capture the above comment and mail the request to portmgr MFH: 2014Q1 Submitted by: gahr Added: svnadmin/hooks/scripts/mfh.sh (contents, props changed) Modified: svnadmin/hooks/post-commit Modified: svnadmin/hooks/post-commit ============================================================================== --- svnadmin/hooks/post-commit Wed Jan 8 14:33:08 2014 (r339138) +++ svnadmin/hooks/post-commit Wed Jan 8 14:38:43 2014 (r339139) @@ -57,5 +57,9 @@ update-root.sh "$REPO" "$REV" # commit mail mailer.py commit "$REPO" "$REV" /s/svn/ports/conf/mailer.conf +# mfh + +mfh.sh "${REPO}" "${REV}" + #commit-email.pl "$REPO" "$REV" commit-watchers@example.org #log-commit.py --repository "$REPO" --revision "$REV" Added: svnadmin/hooks/scripts/mfh.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ svnadmin/hooks/scripts/mfh.sh Wed Jan 8 14:38:43 2014 (r339139) @@ -0,0 +1,35 @@ +#!/bin/sh +# $FreeBSD$ + +REPOS="$1" +REV="$2" +AUTHOR=$(svnlook author -r "$REV" "$REPOS") +LOG=$(svnlook log -r "$REV" "$REPOS") +DIFF=$(svnlook diff -r "$REV" "$REPOS") +MFH_LINE=$(echo "$LOG" | grep '^MFH:[[:space:]]*[[:alnum:]]') +if [ "$MFH_LINE" = "" ]; then + exit 0 +fi +BRANCH=$(echo "$MFH_LINE" | sed -e "s|MFH:[[:blank:]]*\(.*\)|\1|") + +echo " +Hello, + +Request from $AUTHOR to merge r$REV to branch $BRANCH + +http://svnweb.freebsd.org/changeset/ports/$REV + +Commit message follows: + +---------- +$LOG +---------- + +diff: + +---------- +$DIFF +---------- +" | mail -s "MFH request r$REV to $BRANCH" portmgr@FreeBSD.org + + From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jan 8 14:55:22 2014 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 631943FA; Wed, 8 Jan 2014 14:55:22 +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 46C031190; Wed, 8 Jan 2014 14:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08EtMCu022612; Wed, 8 Jan 2014 14:55:22 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08EtMwh022611; Wed, 8 Jan 2014 14:55:22 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081455.s08EtMwh022611@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 14:55:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339143 - 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-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 14:55:22 -0000 Author: bapt Date: Wed Jan 8 14:55:21 2014 New Revision: 339143 URL: http://svnweb.freebsd.org/changeset/ports/339143 Log: Use stricter regex to only match MFH: Modified: svnadmin/hooks/scripts/mfh.sh Modified: svnadmin/hooks/scripts/mfh.sh ============================================================================== --- svnadmin/hooks/scripts/mfh.sh Wed Jan 8 14:45:13 2014 (r339142) +++ svnadmin/hooks/scripts/mfh.sh Wed Jan 8 14:55:21 2014 (r339143) @@ -6,7 +6,7 @@ REV="$2" AUTHOR=$(svnlook author -r "$REV" "$REPOS") LOG=$(svnlook log -r "$REV" "$REPOS") DIFF=$(svnlook diff -r "$REV" "$REPOS") -MFH_LINE=$(echo "$LOG" | grep '^MFH:[[:space:]]*[[:alnum:]]') +MFH_LINE=$(echo "$LOG" | grep "^MFH:[[:space:]]*[[:digit:]]\+Q[[:digit:]]" if [ "$MFH_LINE" = "" ]; then exit 0 fi From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jan 8 14:56:37 2014 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C8DA5B6; Wed, 8 Jan 2014 14:56:37 +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 68D18119C; Wed, 8 Jan 2014 14:56:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08EubIr022853; Wed, 8 Jan 2014 14:56:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Eubpi022852; Wed, 8 Jan 2014 14:56:37 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081456.s08Eubpi022852@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 14:56:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339145 - 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-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 14:56:37 -0000 Author: bapt Date: Wed Jan 8 14:56:36 2014 New Revision: 339145 URL: http://svnweb.freebsd.org/changeset/ports/339145 Log: Fix syntax typo Modified: svnadmin/hooks/scripts/mfh.sh Modified: svnadmin/hooks/scripts/mfh.sh ============================================================================== --- svnadmin/hooks/scripts/mfh.sh Wed Jan 8 14:56:28 2014 (r339144) +++ svnadmin/hooks/scripts/mfh.sh Wed Jan 8 14:56:36 2014 (r339145) @@ -6,7 +6,7 @@ REV="$2" AUTHOR=$(svnlook author -r "$REV" "$REPOS") LOG=$(svnlook log -r "$REV" "$REPOS") DIFF=$(svnlook diff -r "$REV" "$REPOS") -MFH_LINE=$(echo "$LOG" | grep "^MFH:[[:space:]]*[[:digit:]]\+Q[[:digit:]]" +MFH_LINE=$(echo "$LOG" | grep '^MFH:[[:space:]]*[[:digit:]]\+Q[[:digit:]]') if [ "$MFH_LINE" = "" ]; then exit 0 fi From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jan 8 15:20:21 2014 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9E92EF6; Wed, 8 Jan 2014 15:20:21 +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 D67C413AE; Wed, 8 Jan 2014 15:20:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08FKLeA031457; Wed, 8 Jan 2014 15:20:21 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08FKLYl031456; Wed, 8 Jan 2014 15:20:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081520.s08FKLYl031456@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 15:20:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339148 - 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-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 15:20:22 -0000 Author: bapt Date: Wed Jan 8 15:20:21 2014 New Revision: 339148 URL: http://svnweb.freebsd.org/changeset/ports/339148 Log: Add the command in the mail so when the commiter receives the reply he has the right command as well. Requested by: gahr Modified: svnadmin/hooks/scripts/mfh.sh Modified: svnadmin/hooks/scripts/mfh.sh ============================================================================== --- svnadmin/hooks/scripts/mfh.sh Wed Jan 8 15:13:49 2014 (r339147) +++ svnadmin/hooks/scripts/mfh.sh Wed Jan 8 15:20:21 2014 (r339148) @@ -16,6 +16,9 @@ echo " Hello, Request from $AUTHOR to merge r$REV to branch $BRANCH +using + +\${PORTSDIR}/Tools/scripts/mfh $BRANCH $REV http://svnweb.freebsd.org/changeset/ports/$REV From owner-svn-ports-svnadmin@FreeBSD.ORG Thu Jan 9 08:55:23 2014 Return-Path: Delivered-To: svn-ports-svnadmin@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 8922F61E; Thu, 9 Jan 2014 08:55:22 +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 068CC1CAA; Thu, 9 Jan 2014 08:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s098tLKg037717; Thu, 9 Jan 2014 08:55:21 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s098tLhY037715; Thu, 9 Jan 2014 08:55:21 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201401090855.s098tLhY037715@svn.freebsd.org> From: Thierry Thomas Date: Thu, 9 Jan 2014 08:55:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339210 - svnadmin/conf X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2014 08:55:23 -0000 Author: thierry Date: Thu Jan 9 08:55:21 2014 New Revision: 339210 URL: http://svnweb.freebsd.org/changeset/ports/339210 Log: Please welcome Thomas Zander, riggs@, as a new ports committer! Approved by: portmgr Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access ============================================================================== --- svnadmin/conf/access Thu Jan 9 08:53:56 2014 (r339209) +++ svnadmin/conf/access Thu Jan 9 08:55:21 2014 (r339210) @@ -153,6 +153,7 @@ rafan rakuco rea rene +riggs rm roberto romain Modified: svnadmin/conf/mentors ============================================================================== --- svnadmin/conf/mentors Thu Jan 9 08:53:56 2014 (r339209) +++ svnadmin/conf/mentors Thu Jan 9 08:55:21 2014 (r339210) @@ -21,6 +21,7 @@ jsa wxs Co-mentor: kwm marius bapt Co-mentor: beat milki swills Co-mentor: eadler pclin swills Co-mentor: araujo +riggs thierry sperber miwi Co-mentor: decke, beat theraven bapt tmseck flo Co-mentor: crees From owner-svn-ports-svnadmin@FreeBSD.ORG Fri Jan 10 03:16:15 2014 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42233F9; Fri, 10 Jan 2014 03:16:15 +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 13BDE1D91; Fri, 10 Jan 2014 03:16:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0A3GEqI080158; Fri, 10 Jan 2014 03:16:14 GMT (envelope-from tabthorpe@svn.freebsd.org) Received: (from tabthorpe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0A3GEBb080157; Fri, 10 Jan 2014 03:16:14 GMT (envelope-from tabthorpe@svn.freebsd.org) Message-Id: <201401100316.s0A3GEBb080157@svn.freebsd.org> From: Thomas Abthorpe Date: Fri, 10 Jan 2014 03:16:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339312 - svnadmin/conf X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2014 03:16:15 -0000 Author: tabthorpe Date: Fri Jan 10 03:16:14 2014 New Revision: 339312 URL: http://svnweb.freebsd.org/changeset/ports/339312 Log: - Take commit bit in for safe keeping Modified: svnadmin/conf/access Modified: svnadmin/conf/access ============================================================================== --- svnadmin/conf/access Fri Jan 10 03:14:45 2014 (r339311) +++ svnadmin/conf/access Fri Jan 10 03:16:14 2014 (r339312) @@ -37,7 +37,6 @@ bapt bar bdrewery beat -beech bf bland brian freebsd-ports-committers@Awfulhak.org From owner-svn-ports-svnadmin@FreeBSD.ORG Sat Jan 11 09:14:04 2014 Return-Path: Delivered-To: svn-ports-svnadmin@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 B39B815B; Sat, 11 Jan 2014 09:14:04 +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 9F6D1100D; Sat, 11 Jan 2014 09:14:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0B9E4JQ069633; Sat, 11 Jan 2014 09:14:04 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0B9E4ET069632; Sat, 11 Jan 2014 09:14:04 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201401110914.s0B9E4ET069632@svn.freebsd.org> From: Thierry Thomas Date: Sat, 11 Jan 2014 09:14:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r339409 - svnadmin/conf X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2014 09:14:04 -0000 Author: thierry Date: Sat Jan 11 09:14:04 2014 New Revision: 339409 URL: http://svnweb.freebsd.org/changeset/ports/339409 Log: Adding jadawin as a co-mentor. Approved by: portmgr (tabthorpe) Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors ============================================================================== --- svnadmin/conf/mentors Sat Jan 11 09:08:43 2014 (r339408) +++ svnadmin/conf/mentors Sat Jan 11 09:14:04 2014 (r339409) @@ -21,7 +21,7 @@ jsa wxs Co-mentor: kwm marius bapt Co-mentor: beat milki swills Co-mentor: eadler pclin swills Co-mentor: araujo -riggs thierry +riggs thierry Co-mentor: jadawin sperber miwi Co-mentor: decke, beat theraven bapt tmseck flo Co-mentor: crees