Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of petertodd.org
	designates 62.13.149.84 as permitted sender)
	client-ip=62.13.149.84; envelope-from=pete@petertodd.org;
	helo=outmail149084.authsmtp.net; 
Date: Fri, 16 Aug 2013 05:52:43 -0400
From: Peter Todd <pete@petertodd.org>
To: Luke-Jr <luke@dashjr.org>
Message-ID: <20130816095243.GA11181@savin>
References: <201308160939.29864.luke@dashjr.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="FCuugMFkClbJLl1L"
Content-Disposition: inline
In-Reply-To: <201308160939.29864.luke@dashjr.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: Bitcoin Dev <bitcoin-development@lists.sourceforge.net>
Subject: Re: [Bitcoin-development] LevelDB in master
Precedence: list


--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Aug 16, 2013 at 09:39:16AM +0000, Luke-Jr wrote:
> Now-merged pull request #2702 appears to have put the master branch on an=
=20
> unofficial Ripple fork of LevelDB, rather than merely updating us to Leve=
lDB=20
> 1.12.0. While Vinnie did somewhat disclose this, I don't see any evidence=
 the=20
> nature of this was fully understood by others. As I understood the pull=
=20
> request, the "Ripple and Bitcoin fork" was just LevelDB with the changes =
we=20
> had already made. Mike's comments on the pull request (his audit) suggest=
 that=20
> this may have been the case in an earlier revision of it. But in fact, th=
ere=20
> appear to be a number of other changes included in what was finally merge=
d a=20
> few weeks ago. Furthermore, Ripple's fork did not do a proper git merge o=
f=20
> upstream, thus there is a break in git history, and, more importantly, a=
=20
> number of upstream fixes (including some we have had reported to the Bitc=
oin=20
> issue tracker) were not included in this merge.
>=20
> I've pushed three branches to https://github.com/luke-jr/leveldb :
>   bitcoin-1.5   Our old/unreleased LevelDB 1.5 fork, for reference
>   bitcoin       Our LevelDB 1.7 fork, included in 0.8.x
>   bitcoin-up    Our LevelDB 1.7 fork, merged with upstream LevelDB 1.12
>=20
> A diff from current master (Ripple LevelDB 1.12 fork) to bitcoin-up:
>   https://gist.github.com/luke-jr/6248543
>=20
> Thoughts?

I ran into this problem while auditing Litecoin actually: the tools to
audit that a set of git patches/merges actually match upstream (or
downstream for litecoin) don't really exist yet. In this case manually
checking that individual files matched would have probably worked, but
it'd be good to automate the process.

I can't say I've looked into any of this in detail, but you're right to
bring up the issue.

--=20
'peter'[:-1]@petertodd.org

--FCuugMFkClbJLl1L
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBCAAGBQJSDfZqAAoJECSBQD2l8JH7ir4H/1P1DUgCWO0+Wn6t9L3pYfHm
0mK+sDL5xGfnT/vdw+AVuNGQjGjFtbW/7RMxqBvGTz4FHmCd0OtTChNSFRORg4QQ
LPBi4RLFahvAWHgSlxMW9ADNr1yE7afoX3+U+aslXXGeyY1xmXvcDx1blp6Ruukv
gtpcKluDLC9wVZijRmXuu83kJlyAxIC2mg/4FT2oheLUjYOldIuHT+8wHTegIrJV
kKN+pKAgVxOax32GQbGcD1h/MZJ7x2zkwtO9oEKgkYNsL4N+3TAiK+P/fnelAv+D
xv327I9y91zQxBRdxYIsZEGcGFy7HUyW1BZQTf+beOPR2DjEQxbrvUyg7e+U5UM=
=sTHD
-----END PGP SIGNATURE-----

--FCuugMFkClbJLl1L--