From owner-freebsd-current Tue Mar 13 17:22: 2 2001 Delivered-To: freebsd-current@freebsd.org Received: from cain.gsoft.com.au (genesi.lnk.telstra.net [139.130.136.161]) by hub.freebsd.org (Postfix) with ESMTP id ED67C37B71A for ; Tue, 13 Mar 2001 17:21:57 -0800 (PST) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (doconnor@cain [203.38.152.97]) by cain.gsoft.com.au (8.8.8/8.8.8) with ESMTP id LAA10280; Wed, 14 Mar 2001 11:51:38 +1030 (CST) (envelope-from doconnor@gsoft.com.au) Message-ID: X-Mailer: XFMail 1.4.0 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Wed, 14 Mar 2001 11:51:38 +1030 (CST) From: "Daniel O'Connor" To: Martin Blapp Subject: RE: Proposal to mergemaster Cc: current@freebsd.org Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On 13-Mar-01 Martin Blapp wrote: > 1. Add md5 checksum to the the file-header: > ------------------------------------------- > > Add an md5 checksum in the header of the File, maybe in $FreeBSD$ when > the file get's comitted. (The $FreeBSD$ line should be sed'd/grepp'd out > to md5 the raw file without checksum.) > > grep -v "$FreeBSD:" defaults/rc.conf | md5 > > Example: > > # $FreeBSD: src/etc/defaults/rc.conf,v 1.53.2.15 2001/01/28 > 20:57:35 jdp Exp md5="1fff7b9d6f6daa0ea9635873bfd0b7cd" $ > > Then mergemaster can do a md5 over the config file and look > if the file has changed. If so, you get asked to merge or > install a newer version. If the md5 checksum is the same, > the config file get's updated without asking the user. This is computationally difficult to acheive :) (Because the md5 checksum would be part of the file so the md5 checksum would have to take account of itself) > The database stores all md5 checksums for every version of a configfile > we had (for this branch so it dosn't get to big ?) > > The database could also be very useful for later usage in the ports- > tree (handle make update) I think you could generate this file at installworld time fairly trivially. The ports code does this for each file which is installed and its not too onerous. This would solve my previous point also :) --- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message