From owner-cvs-all@FreeBSD.ORG Wed Apr 28 01:27:03 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDC4716A4CE; Wed, 28 Apr 2004 01:27:03 -0700 (PDT) Received: from mtaw4.prodigy.net (mtaw4.prodigy.net [64.164.98.52]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD15743D58; Wed, 28 Apr 2004 01:27:03 -0700 (PDT) (envelope-from kris@obsecurity.org) Received: from obsecurity.dyndns.org (7ea0322e64e8ed6d05180c2e94ec3567@adsl-67-115-73-128.dsl.lsan03.pacbell.net [67.115.73.128]) by mtaw4.prodigy.net (8.12.10/8.12.10) with ESMTP id i3S8Qjkm018249; Wed, 28 Apr 2004 01:26:50 -0700 (PDT) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id 9D441521AC; Wed, 28 Apr 2004 01:26:45 -0700 (PDT) Date: Wed, 28 Apr 2004 01:26:45 -0700 From: Kris Kennaway To: Oliver Eikemeier Message-ID: <20040428082645.GA8017@xor.obsecurity.org> 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> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="6c2NcOVqGQ03X4Wi" Content-Disposition: inline In-Reply-To: <408F61C8.1020900@fillmore-labs.com> User-Agent: Mutt/1.4.2.1i cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org cc: Ying-Chieh Liao cc: Oliver Eikemeier cc: Joe Marcus Clarke cc: cvs-ports@FreeBSD.org Subject: Re: cvs commit: ports/net/rsync Makefile distinfo X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 08:27:04 -0000 --6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 28, 2004 at 09:48:24AM +0200, Oliver Eikemeier wrote: > Joe Marcus Clarke wrote: >=20 > >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=20 > >>mismatch: expected 511412, actual 511395 > >> > >>MD5 (rsync-2.6.1.tar.gz) =3D 6b1ee6a5878569215204f322ad128775 > >>SIZE (rsync-2.6.1.tar.gz) =3D 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. >=20 > Grmbl. They removed a forgotten debug statement: >=20 > 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] =3D '\0'; > } > - fprintf(stderr, "p:`%s'\n", buf); >=20 > return buf; > } >=20 > New distinfo: >=20 > 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) =3D ec09e62961c8edd0f9d3710b5ecb5b16 > -SIZE (rsync-2.6.1.tar.gz) =3D 511412 > +MD5 (rsync-2.6.1.tar.gz) =3D 6b1ee6a5878569215204f322ad128775 > +SIZE (rsync-2.6.1.tar.gz) =3D 511395 >=20 > 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. Kris --6c2NcOVqGQ03X4Wi Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAj2rFWry0BWjoQKURAuAzAJ94VLYzWTTPqDb3d1ss18t6om9KfgCghF7H byHOHbXJkwTG0Zi/3TzMuS8= =hv7K -----END PGP SIGNATURE----- --6c2NcOVqGQ03X4Wi--