From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jun 10 19:53:11 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F302CB82; Wed, 10 Jun 2015 19:53:10 +0000 (UTC) (envelope-from delphij@FreeBSD.org) 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 E149E1E34; Wed, 10 Jun 2015 19:53:10 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AJrAnU031533; Wed, 10 Jun 2015 19:53:10 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5AJrAsa031532; Wed, 10 Jun 2015 19:53:10 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506101953.t5AJrAsa031532@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 10 Jun 2015 19:53:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r389136 - 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.20 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, 10 Jun 2015 19:53:11 -0000 Author: delphij Date: Wed Jun 10 19:53:10 2015 New Revision: 389136 URL: https://svnweb.freebsd.org/changeset/ports/389136 Log: Filter out e.g. (blanket) when generating command for MFH. Approved by: portmgr (bapt) Modified: svnadmin/hooks/scripts/mfh.sh Modified: svnadmin/hooks/scripts/mfh.sh ============================================================================== --- svnadmin/hooks/scripts/mfh.sh Wed Jun 10 19:53:02 2015 (r389135) +++ svnadmin/hooks/scripts/mfh.sh Wed Jun 10 19:53:10 2015 (r389136) @@ -10,7 +10,9 @@ MFH_LINE=$(echo "$LOG" | grep '^MFH:[[:s if [ "$MFH_LINE" = "" ]; then exit 0 fi -BRANCH=$(echo "$MFH_LINE" | sed -e "s|MFH:[[:blank:]]*\(.*\)|\1|") +BRANCH_LINE=$(echo "$MFH_LINE" | sed -e "s|MFH:[[:blank:]]*\(.*\)|\1|") +BRANCH=$(echo "${BRANCH_LINE}" | sed -Ee "s|([[:digit:]]+Q[[:digit:]]+)(.*)|\1|") +BRANCH_DESC=${BRANCH_LINE##${BRANCH}} echo " Hello, @@ -33,6 +35,6 @@ diff: ---------- $DIFF ---------- -" | mail -s "MFH request r$REV to $BRANCH" portmgr@FreeBSD.org ports-secteam@FreeBSD.org +" | mail -s "MFH request r$REV to $BRANCH${BRANCH_DESC}" portmgr@FreeBSD.org ports-secteam@FreeBSD.org From owner-svn-ports-svnadmin@FreeBSD.ORG Thu Jun 11 13:11:45 2015 Return-Path: Delivered-To: svn-ports-svnadmin@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 76617612; Thu, 11 Jun 2015 13:11:45 +0000 (UTC) (envelope-from culot@FreeBSD.org) 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 64AE71877; Thu, 11 Jun 2015 13:11:45 +0000 (UTC) (envelope-from culot@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BDBjp6057754; Thu, 11 Jun 2015 13:11:45 GMT (envelope-from culot@FreeBSD.org) Received: (from culot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BDBj8F057753; Thu, 11 Jun 2015 13:11:45 GMT (envelope-from culot@FreeBSD.org) Message-Id: <201506111311.t5BDBj8F057753@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: culot set sender to culot@FreeBSD.org using -f From: Frederic Culot Date: Thu, 11 Jun 2015 13:11:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r389200 - 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.20 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, 11 Jun 2015 13:11:45 -0000 Author: culot Date: Thu Jun 11 13:11:44 2015 New Revision: 389200 URL: https://svnweb.freebsd.org/changeset/ports/389200 Log: - Take clsung, dhn, obrien, and tmseck commit bits in for safekeeping, after 18 months of inactivity Submitted by: The Grim Reaper Modified: svnadmin/conf/access Modified: svnadmin/conf/access ============================================================================== --- svnadmin/conf/access Thu Jun 11 13:10:55 2015 (r389199) +++ svnadmin/conf/access Thu Jun 11 13:11:44 2015 (r389200) @@ -47,7 +47,6 @@ brix brnrd brooks bsam -clsung cperciva crees cs @@ -63,7 +62,6 @@ deischen delphij demon des -dhn dinoex dryice dvl @@ -142,7 +140,6 @@ nivit nobutaka novel nox -obrien ohauer olgeni oliver @@ -186,7 +183,6 @@ thierry tijl timur tj -tmseck tobez tota trasz From owner-svn-ports-svnadmin@FreeBSD.ORG Thu Jun 11 14:16:11 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3CE1E9D; Thu, 11 Jun 2015 14:16:11 +0000 (UTC) (envelope-from zi@FreeBSD.org) 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 5C4F219DE; Thu, 11 Jun 2015 14:16:11 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BEGBo9090701; Thu, 11 Jun 2015 14:16:11 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BEGBig090700; Thu, 11 Jun 2015 14:16:11 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201506111416.t5BEGBig090700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 11 Jun 2015 14:16:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r389213 - 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.20 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, 11 Jun 2015 14:16:11 -0000 Author: zi Date: Thu Jun 11 14:16:10 2015 New Revision: 389213 URL: https://svnweb.freebsd.org/changeset/ports/389213 Log: - Add meaningful information to the error we send to a committer Approved by: portmgr (bapt) Modified: svnadmin/hooks/scripts/mergeinfo.sh Modified: svnadmin/hooks/scripts/mergeinfo.sh ============================================================================== --- svnadmin/hooks/scripts/mergeinfo.sh Thu Jun 11 14:16:07 2015 (r389212) +++ svnadmin/hooks/scripts/mergeinfo.sh Thu Jun 11 14:16:10 2015 (r389213) @@ -28,6 +28,7 @@ do then echo "It seems that the mergeinfo is at the wrong place." >&2 echo "Please double-check your commit and try committing again." >&2 + echo "This likely means you ran svn merge from a location other than the base of the branch." >&2 exit 1 fi fi