cvs commit: ports/net/rsync Makefile distinfo

[Oliver Eikemeier]

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