From owner-cvs-ports@FreeBSD.ORG Wed Apr 28 03:08:10 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40AC016A4CE; Wed, 28 Apr 2004 03:08:10 -0700 (PDT) Received: from fillmore.dyndns.org (port-212-202-49-130.reverse.qsc.de [212.202.49.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id D28AF43D31; Wed, 28 Apr 2004 03:08:09 -0700 (PDT) (envelope-from eikemeier@fillmore-labs.com) Received: from [172.16.0.2] (helo=fillmore-labs.com) by fillmore.dyndns.org with esmtp (Exim 4.32; FreeBSD) id 1BIlz4-000Mzp-7o; Wed, 28 Apr 2004 12:08:09 +0200 Message-ID: <408F8284.9030808@fillmore-labs.com> Date: Wed, 28 Apr 2004 12:08:04 +0200 From: Oliver Eikemeier Organization: Fillmore Labs GmbH - http://www.fillmore-labs.com/ MIME-Version: 1.0 To: Kris Kennaway References: <200404272159.i3RLxJDN071124@repoman.freebsd.org> <20040428010240.GA85771@freebsd.csie.nctu.edu.tw> <1083114476.15886.4.camel@shumai.marcuscom.com> <408F61C8.1020900@fillmore-labs.com> <20040428082645.GA8017@xor.obsecurity.org> In-Reply-To: <20040428082645.GA8017@xor.obsecurity.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit User-Agent: KMail/1.5.9 cc: Joe Marcus Clarke cc: cvs-ports@FreeBSD.org cc: Ying-Chieh Liao cc: ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/net/rsync Makefile distinfo X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 10:08:10 -0000 Kris Kennaway wrote: > On Wed, Apr 28, 2004 at 09:48:24AM +0200, Oliver Eikemeier wrote: > >>Joe Marcus Clarke wrote: >> >>>On Tue, 2004-04-27 at 21:02, Ying-Chieh Liao wrote: >>> >>>>I got a size mismatch... >>>> >>>>>>Attempting to fetch from http://rsync.samba.org/ftp/rsync/. >>>> >>>>fetch: http://rsync.samba.org/ftp/rsync/rsync-2.6.1.tar.gz: size >>>>mismatch: expected 511412, actual 511395 >>>> >>>>MD5 (rsync-2.6.1.tar.gz) = 6b1ee6a5878569215204f322ad128775 >>>>SIZE (rsync-2.6.1.tar.gz) = 511395 >>> >>>I see the same thing from http://rsync.samba.org/ftp/rsync/, but the >>>distfile from ftp://sunsite.auc.dk/pub/unix/rsync/ is inline with >>>distinfo. It looks like the distfile was rerolled. >>> >>>Oliver, if this can't be fixed quickly, I'm going to revert the 2.6.1 >>>update. >> >>Grmbl. They removed a forgotten debug statement: >> >>diff -Nur rsync-2.6.1/util.c rsync-2.6.1.rerolled/util.c >>--- rsync-2.6.1/util.c Fri Apr 23 00:17:15 2004 >>+++ rsync-2.6.1.rerolled/util.c Tue Apr 27 18:43:40 2004 >>@@ -805,7 +805,6 @@ >> rlen--; >> buf[rlen] = '\0'; >> } >>- fprintf(stderr, "p:`%s'\n", buf); >> >> return buf; >>} >> >>New distinfo: >> >>diff -u -r1.37 distinfo >>--- distinfo 27 Apr 2004 21:59:18 -0000 1.37 >>+++ distinfo 28 Apr 2004 07:43:48 -0000 >>@@ -1,2 +1,2 @@ >>-MD5 (rsync-2.6.1.tar.gz) = ec09e62961c8edd0f9d3710b5ecb5b16 >>-SIZE (rsync-2.6.1.tar.gz) = 511412 >>+MD5 (rsync-2.6.1.tar.gz) = 6b1ee6a5878569215204f322ad128775 >>+SIZE (rsync-2.6.1.tar.gz) = 511395 >> >>Should I commit this? I hope sunsite.auc.dk and others catch >>up with the master site soon. > > You can always leave both entries in there. > > Hmm, I think SIZE doesn't work with multiple entries, as MD5 does, so > you'd have to disable it. I would prefer the version without the unwanted debug statement, especially because this is the version of the master site. Since it looks like I'm blocking the ports (un-)freeze, I'm happy either ways. In order of my personal preference: [ ] change distinfo to: MD5 (rsync-2.6.1.tar.gz) = 6b1ee6a5878569215204f322ad128775 SIZE (rsync-2.6.1.tar.gz) = 511395 [ ] change distinfo to: MD5 (rsync-2.6.1.tar.gz) = 6b1ee6a5878569215204f322ad128775 MD5 (rsync-2.6.1.tar.gz) = ec09e62961c8edd0f9d3710b5ecb5b16 [ ] back out the upgrade Any objections to doing the first one? Do I need another approval from portmgr? -Oliver