Correct working fix for crc mismatch, upstream b0808cade3a7554bf7c0a00314218feccc8398f5; #393155

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 25 insertions, 21 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index 2c28e46ae704..02e882f1a8b8 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.29 2011/11/28 12:12:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.30 2011/12/05 19:42:45 jlec Exp $
+
+*lbzip2-2.1-r2 (05 Dec 2011)
+
+  05 Dec 2011; Justin Lecher <jlec@gentoo.org> files/2.1-crc-missmatch.patch,
+  -lbzip2-2.1-r1.ebuild, +lbzip2-2.1-r2.ebuild:
+  Correct working fix for crc mismatch, upstream
+  b0808cade3a7554bf7c0a00314218feccc8398f5; #393155
 
 *lbzip2-2.1-r1 (28 Nov 2011)
 
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index ab602c47ef60..a9dbfdfb65ab 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -4,18 +4,18 @@ Hash: SHA512
 AUX 0.23-Makefile.patch 1389 RMD160 98bcdfba3697608bf46f9f83de63edd1950fe367 SHA1 16c3a8f418554e50b7ca59016983cb539c41fd04 SHA256 1fa306143aa8030381d561c29022bab2775877b7e5dcd3aa63476205ae3c375a
 AUX 0.23-s_isreg.patch 350 RMD160 7df41d6497744477c8976a9d04c607cca3863bec SHA1 26c5dab3730669b6bf36f35ce0258ccdf62a5119 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3e75ed6a149eeb5d1d6
 AUX 0.23-test.sh.patch 648 RMD160 936877f97aafb2e0f91d17eb527989561788fd5e SHA1 d6be87e8ce2c54d6c47ffb9547518ec52e00cdc3 SHA256 e37454a09697a49574068ad5c89d2047a9f4f5d9df32aacd3b01584f2b0477a1
-AUX 2.1-crc-missmatch.patch 608 RMD160 5b28f1f91925fa2f67dbb8e4482ea1b9c4def8a2 SHA1 0e9cf1c837b0a4b50c3833157b0950c14d7e1a08 SHA256 d2f34a863dc4a9b86f188a7ea3b3c80cd29fcdd46d39ed5255c3307f5b999b9c
+AUX 2.1-crc-missmatch.patch 552 RMD160 0b0f5ab57653b3feb3c3c5ba177985f0f4d18feb SHA1 a3db06023e511165bcbb8b7a89e37cbe46273a6b SHA256 3263d1b9452ac65a01a6127e1078ba6cc3ba040c8001e764af2f06d323d13c89
 DIST lbzip2-0.23.tar.gz 77720 RMD160 404cdfdfde7f65f7742a8c9345512238c310d9d8 SHA1 b4b9eee37ebaf5b9370a63a7e7042acfccf5e9f1 SHA256 2838cc2be818b8107ab1311208e6344baf9969168199be84287a32fef4733411
 DIST lbzip2-2.1.tar.gz 616985 RMD160 a421cee73fe4dbf77e0bbb82bff68f68d867880c SHA1 f98e68933c1cc0e6049068cdaa89ea2bfda99017 SHA256 c2551c219e0eff9d1bf17a13db2b6902ba5b02ca66c53e6d734bbfb5add29edc
 EBUILD lbzip2-0.23-r2.ebuild 1530 RMD160 df3bdfca0820277b58c4c1d173bed5a8569fe0b2 SHA1 26d5db3bce3dbbc1befac547fdc7421ce5699e33 SHA256 aa7e259a5a08396328908942116f04cf685ca8cac31ea2d73f9f7f2b17116538
-EBUILD lbzip2-2.1-r1.ebuild 731 RMD160 70bc2e5606e7dda8f56f1b290e26210f5dcc3f72 SHA1 9ed4b8026d2fd1b651ef68bda282dd319cf2d725 SHA256 7710525ee99db12192486f0d7f53f406756ac58ac2d928d684a848f2fef5c266
+EBUILD lbzip2-2.1-r2.ebuild 731 RMD160 b9828364cdac6c2f9ccae5ff86edfd48cf38798e SHA1 a887b8f2919003d227ffb6f9cec307c86241b4bb SHA256 e4fcfafb948383957c223c774af9ace50355e89e89289b26e0a46201906fc81f
 EBUILD lbzip2-2.1.ebuild 680 RMD160 70d1482eeb39296defa4417f7c03e33ea8677c79 SHA1 6a2e3464c4a113fbf7fa6f738f1220c150abf3e3 SHA256 8c7db321df6e0a98b2c98a672f4d058660b7cf418cfcaf73216ad5a9b6df6593
-MISC ChangeLog 4279 RMD160 6eb3b7221893008a7620a2cb0b534a25e4f52d07 SHA1 193612a643b86745778e060005277e8061448638 SHA256 7d114b26a00d00718ac27a40984a72a9ad303786d170cfd2d7ad19b082cc0f3f
+MISC ChangeLog 4537 RMD160 2d934b398b7b2875d8e28490b4ac923ec0967288 SHA1 c53fb6828ddce6aaa4fadfbb677f189cc9881850 SHA256 fdfe9db647bf4b54a1628ee4fbf568238d36778bfdbae87027757a36a3cb1f23
 MISC metadata.xml 506 RMD160 59baf943b52d748b7a8c155509224bfc5f4dd2eb SHA1 336b7330c0962cb6ef259d181a30d3ae0956ffd4 SHA256 23c838cae918b805fef6c43f9cf06570ad578cbbe1d6153efc03f1e1fd65f62a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7TeskACgkQgAnW8HDreRYirACgicUp70LBiogDnCYGe1141gMZ
-0PQAnA8RKQAKPLqlWwCX7UkGCEjr+6h6
-=rhyQ
+iEYEAREKAAYFAk7dHrsACgkQgAnW8HDreRYgKwCfQFeN/V4/lnA/7+ykQq+wHkFW
+mloAoKy7W1xsX30iY6llmVajSGuAow2c
+=4y4f
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/2.1-crc-missmatch.patch b/app-arch/lbzip2/files/2.1-crc-missmatch.patch
index 662eb8901470..489eeff754d0 100644
--- a/app-arch/lbzip2/files/2.1-crc-missmatch.patch
+++ b/app-arch/lbzip2/files/2.1-crc-missmatch.patch
@@ -1,16 +1,13 @@
- src/lbunzip2.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
 diff --git a/src/lbunzip2.c b/src/lbunzip2.c
-index 113be47..67579ea 100644
+index 113be47..5d8a456 100644
 --- a/src/lbunzip2.c
 +++ b/src/lbunzip2.c
-@@ -1453,7 +1453,7 @@ mux(struct w2m_q *w2m_q, struct m2s_q *m2s_q, struct filespec *ispec,
-         if (w2m_blk->bs100k) {
-           bs100k = w2m_blk->bs100k;
-           any |= (9u >= bs100k);
--          if (crc != w2m_blk->crc)
-+          if (0 && crc != w2m_blk->crc)
-             log_fatal("%s: %s%s%s: stream CRC mismatch\n", pname, ispec->sep,
-                 ispec->fmt, ispec->sep);
-           crc = 0u;
+@@ -604,7 +604,7 @@ work_decompr(struct w2w_blk *w2w_blk, struct w2m_q *w2m_q,
+     w2m_blk->id.decompr_blk_id = decompr_blk_id++;
+     w2m_blk->id.last_decompr = (YB_OK == ybret);
+     w2m_blk->produced = sizeof w2m_blk->decompr - oleft;
+-    w2m_blk->bs100k = w2w_blk->bs100k;
++    w2m_blk->bs100k = (YB_OK == ybret) ? w2w_blk->bs100k : 0u;
+     w2m_blk->crc = w2w_blk->crc;
+     w2m_blk->crc1 = crc;
+     w2m_blk->bs100k1 = bs100k;
diff --git a/app-arch/lbzip2/lbzip2-2.1-r1.ebuild b/app-arch/lbzip2/lbzip2-2.1-r2.ebuild
index 11f53503ed90..80247c9bba9c 100644
--- a/app-arch/lbzip2/lbzip2-2.1-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.1-r1.ebuild,v 1.1 2011/11/28 12:12:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.1-r2.ebuild,v 1.1 2011/12/05 19:42:45 jlec Exp $
 
 EAPI=4