Fixes crc missmatch, https://github.com/kjn/lbzip2/issues/5

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

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index ba446e18ea7ecff925e459b08967e954fcebadf5..2c28e46ae704383012a8e8ed9ffe127379a55766 100644 (file)
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2011/11/28 10:25:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.29 2011/11/28 12:12:52 jlec Exp $
+
+*lbzip2-2.1-r1 (28 Nov 2011)
+
+  28 Nov 2011; Justin Lecher <jlec@gentoo.org> +files/2.1-crc-missmatch.patch,
+  +lbzip2-2.1-r1.ebuild:
+  Fixes crc missmatch, https://github.com/kjn/lbzip2/issues/5
 
   28 Nov 2011; Justin Lecher <jlec@gentoo.org> lbzip2-2.1.ebuild:
   Keyworded for prefix, tested by me

diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 02b8ba5619e6dd6ee3f838164326f3d6f1af78fd..ab602c47ef60d043e05b442c795c5de64005781e 100644 (file)
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -4,16 +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
 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.ebuild 680 RMD160 70d1482eeb39296defa4417f7c03e33ea8677c79 SHA1 6a2e3464c4a113fbf7fa6f738f1220c150abf3e3 SHA256 8c7db321df6e0a98b2c98a672f4d058660b7cf418cfcaf73216ad5a9b6df6593
-MISC ChangeLog 4082 RMD160 604af27bff45634611c143c9b7f80c4aead37d7d SHA1 0bb305ce5e69df79d08bfbc87622fbf407dc106d SHA256 9b709d4e87367d7d0ebc4b960e04b3add15d62df68c517d8b4abb86fad304cbb
+MISC ChangeLog 4279 RMD160 6eb3b7221893008a7620a2cb0b534a25e4f52d07 SHA1 193612a643b86745778e060005277e8061448638 SHA256 7d114b26a00d00718ac27a40984a72a9ad303786d170cfd2d7ad19b082cc0f3f
 MISC metadata.xml 506 RMD160 59baf943b52d748b7a8c155509224bfc5f4dd2eb SHA1 336b7330c0962cb6ef259d181a30d3ae0956ffd4 SHA256 23c838cae918b805fef6c43f9cf06570ad578cbbe1d6153efc03f1e1fd65f62a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7TYacACgkQgAnW8HDreRaeSgCgk8BMjLqtJPwaedc1DzzhXo5d
-qY4AoM7mxgfqoLelmNf4gI60SDiaY58x
-=FHZ6
+iEYEAREKAAYFAk7TeskACgkQgAnW8HDreRYirACgicUp70LBiogDnCYGe1141gMZ
+0PQAnA8RKQAKPLqlWwCX7UkGCEjr+6h6
+=rhyQ
 -----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
new file mode 100644 (file)
index 0000000..662eb89
--- /dev/null
+++ b/app-arch/lbzip2/files/2.1-crc-missmatch.patch
@@ -0,0 +1,16 @@
+ 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
+--- 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;

diff --git a/app-arch/lbzip2/lbzip2-2.1-r1.ebuild b/app-arch/lbzip2/lbzip2-2.1-r1.ebuild
new file mode 100644 (file)
index 0000000..11f5350
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# 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 $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="mirror://github/kjn/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="symlink"
+
+src_prepare() {
+       cd src
+       epatch \
+               "${FILESDIR}"/0.23-s_isreg.patch \
+               "${FILESDIR}"/${PV}-crc-missmatch.patch
+}
+
+src_install() {
+       default
+
+       if use symlink; then
+               dosym ${PN} /usr/bin/bzip2
+       fi
+}