From owner-svn-src-user@FreeBSD.ORG  Mon Aug  9 06:02:23 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6616F1065672;
	Mon,  9 Aug 2010 06:02:23 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 55F3C8FC0C;
	Mon,  9 Aug 2010 06:02:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7962Nc4096825;
	Mon, 9 Aug 2010 06:02:23 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7962NsW096823;
	Mon, 9 Aug 2010 06:02:23 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008090602.o7962NsW096823@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 9 Aug 2010 06:02:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211090 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Aug 2010 06:02:23 -0000

Author: dougb
Date: Mon Aug  9 06:02:23 2010
New Revision: 211090
URL: http://svn.freebsd.org/changeset/base/211090

Log:
  Move from using MD5 to detect distinfo files to using SHA256. It is
  now universal except for a few ports, and hopefully we can drop MD5
  altogether very soon.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Aug  9 01:47:09 2010	(r211089)
+++ user/dougb/portmaster/portmaster	Mon Aug  9 06:02:23 2010	(r211090)
@@ -866,7 +866,7 @@ read_distinfos () {
 		fi
 
 		if [ -s "$distinfo" ]; then
-			grep '^MD5' $distinfo | while read disc1 f disc2; do
+			grep '^SHA256 ' $distinfo | while read disc1 f disc2; do
 				f=${f#(} ; f=${f%)}
 				echo $f >> $DI_FILES
 			done
@@ -901,7 +901,7 @@ read_distinfos_all () {
 		fi
 
 		if [ -s "$distinfo" ]; then
-			grep '^MD5' $distinfo | while read disc1 f disc2; do
+			grep '^SHA256 ' $distinfo | while read disc1 f disc2; do
 				f=${f#(} ; f=${f%)}
 				echo $f >> $DI_FILES
 			done
@@ -3526,8 +3526,7 @@ if [ -n "$distfiles" ]; then
 	for file in $distfiles; do
 		size=`grep "^SIZE (${ds}${file})" $distinfo`
 		sha256=`grep "^SHA256 (${ds}${file})" $distinfo`
-		md5=`grep "^MD5 (${ds}${file})" $distinfo`
-		echo "DISTFILE:${ds}${file}:SIZE=${size##* }:SHA256=${sha256##* }:MD5=${md5##* }" \
+		echo "DISTFILE:${ds}${file}:SIZE=${size##* }:SHA256=${sha256##* }" \
 		    >> $dist_list_temp
 		# Make sure any new distfiles get added to the list
 		[ -z "$DONT_SCRUB_DISTFILES" -a ! "$$" -eq "$PM_PARENT_PID" ] &&