app-arch/lbzip2: Backport fix from upstream git for Assertion failure, #436382

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 169 insertions, 17 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index 671a03b6090a..701029510612 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/lbzip2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.40 2012/10/07 11:55:08 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.41 2013/01/12 19:46:09 jlec Exp $
+
+*lbzip2-2.2-r1 (12 Jan 2013)
+
+  12 Jan 2013; Justin Lecher <jlec@gentoo.org> +lbzip2-2.2-r1.ebuild,
+  +files/lbzip2-2.2-assertion.patch, metadata.xml:
+  Backport fix from upstream git for Assertion failure, #436382
 
   07 Oct 2012; Justin Lecher <jlec@gentoo.org> -lbzip2-0.23-r2.ebuild,
   -lbzip2-2.1.ebuild, -lbzip2-2.1-r2.ebuild, lbzip2-2.2.ebuild:
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index af53ce378f5b..20ecefda9b06 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.23-Makefile.patch 1389 SHA256 1fa306143aa8030381d561c29022bab2775877b7e5dcd3aa63476205ae3c375a SHA512 2cd8d561fc2a5351f8fba57cd6e99a866692b14db9bac4195bcbee4f0dde1f442c8c2ad5f813f690ef62f72c069219ff2755fd8d61a22ea17ab45044d52ac262 WHIRLPOOL 909779dbebb24b162a4cd8e7daa40e3c14d41f302a5e18ec20e65c74923c8cb71edfaab5dce31b831f55ed07114944b5b2f10a3404d1cf4fd8919b9d664a748d
 AUX 0.23-s_isreg.patch 350 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3e75ed6a149eeb5d1d6 SHA512 ff0bf55710ec4a9a464515dfd49daee8ab3b4f0ffe4461ada19b8ba8056c10bfc05ee736204906c026ed075345d9f0f5f2d179b09edec189b2b37f99489f7b32 WHIRLPOOL d119c6f291ca149f9114a59eb4ba717cf41856973cf83746374df0aac9cc120a6ee6545f3b4b1a9a3a5e0b4f14316be18df268fef5353212c1b01be2de58abce
 AUX 0.23-test.sh.patch 648 SHA256 e37454a09697a49574068ad5c89d2047a9f4f5d9df32aacd3b01584f2b0477a1 SHA512 2fe226cb030d444d9a0866487596ed039b4e66af39762f1bc93625c1e93a7336697fa01311c3f0d0eee4a528ae513d18f197534d85539f3185dd8e58e1819dc7 WHIRLPOOL d06585234803278d593499af1e439b89f5dbe721d299018eb78f2b947db98bc882580b958b59a1abf1ef59b08abf9ec521b57fd32b99640d74e6d9c0787aa591
 AUX 2.1-crc-missmatch.patch 552 SHA256 3263d1b9452ac65a01a6127e1078ba6cc3ba040c8001e764af2f06d323d13c89 SHA512 b5113b0fe23adc17811b6e7812ca6e671d978c6765519729998077d6aed000f1fd22241b06ab4330534a6813b5b9f5d7aec62ed007957a34d39a39d5041f5b77 WHIRLPOOL d71c7954c2b24528359f05fd7917de75b0aa0cf872b8a38384e95a588d3ab19e7c3bac8492a9a37bdb5ae497d6a3cd7621b0dd698bd94102b363c5a25f81b669
+AUX lbzip2-2.2-assertion.patch 3445 SHA256 b8604cc0a184fdd3efed02746623d1c29827381e2c659dcc7aab1fa3b6b8f59f SHA512 fa5b6572ffff30650b4917679e178741220f2fea0f6e62e7935839572f92c5f5c2455edc429c790b1d905445a295a541fca23378b5c24296e1a676414692360d WHIRLPOOL 7de49a15e1524e81f776d5e86cadda4a29c793d89d9259c740ca8aeb406099bb0b5f1de8cbd29b81be06911894102dc0244d8b6818c9ddf2d8a063797dd9bdc6
 AUX lbzip2-2.2-s_isreg.patch 456 SHA256 d3564db329d05fde2866a113066e21478ef8c504c3765ac934afbe3e31df00c3 SHA512 5c5c221befa34b50b1cd299608fea4d0871ede7c53a297fe05504ac34b3088378f1734d9e7a1c1649ede44894481786b0c417d38852963606b127090c97b33bb WHIRLPOOL 6a5c6f6d566f8dd4880047fe0f2c49626b07174785715c3cd06e736117133dc23d67020d8cba6b4dd66a013f60ac8da0582af64c08629e2010a29938404219d0
 DIST lbzip2-2.2.tar.gz 622154 SHA256 b905f763a5859670e36b15d016fb6bb73d6718905fc0e2a9fa1dbc11f30b0d80 SHA512 9b194eee262e44d4665d97307f73f20075c301c2a8fbc0f989805359645387bb3ad0a6b7507edc5463a017eaf7002ee177e9fc00cf808c02c7a9c16e7b58b918 WHIRLPOOL 241c6cf473171be56b94efdc152eecb15482977ed47cb46ed47dad641bca9f73d7ec52f13947677aa619387707d5d17f7fa3421f9bc83fc28ced9e7c49b607d1
+EBUILD lbzip2-2.2-r1.ebuild 913 SHA256 743a7ac801b926fa04d2d0d3580f5b35cbc4381b833f2866b6fdd3e516350c75 SHA512 a3270079ad36e85865a9c4f8015a800f30058543683a7129209189500fe213714fc59e3c39434872a1c5222d3ca53906fe285e53c0e0df6726a5621f84e992ef WHIRLPOOL abf9d9b486d7682e678081810c8a4556c337e8b36a5f5332937e72f3aa8a4632b23c04199ec836157e027d835477c25e8b054ab318b68d9e65ca317d50c66aee
 EBUILD lbzip2-2.2.ebuild 860 SHA256 eb15019cae723c280bc30742ae1d2cf177861971301245d720bab14c70890a3e SHA512 0ba223c40b6f82d09b77a4813dc749e6a997a91ba8e9f662966704389ae7b69d4cf61b9d8c5dfcd7500560c84387b1839087c158016abf1c00d81302cd156a79 WHIRLPOOL 5fe79226012e8d32ba84aa75709bd688c0dffc8547cf643a8418aa217c323b609ed6609fbc80d9cc8791818ad735bd2443bcc7ad5e32f6ab33773b66fa6a35c3
-MISC ChangeLog 5731 SHA256 a06852a75e998980452d3797e88462d194e150237a5c849da8d6960accf03546 SHA512 f049be33f4b99decb504a5a85709989a0238e6f38bf06d8b3f44f433be74998fd18dd4f50f831c0b376d6047f51c93659d2d49cb57475d4088e7683dba7f1484 WHIRLPOOL 2aef5e4f9048cffd28e06e284f0e2fab729645149172f7ddd2e9ee36537be47198a53f12e4784eaa512620a91406b1b2dfde30582e134667119fc751211c359c
-MISC metadata.xml 506 SHA256 23c838cae918b805fef6c43f9cf06570ad578cbbe1d6153efc03f1e1fd65f62a SHA512 7880c37760b09c98256d18bba14250fbe7a8cffe39299028bf605ffee240ced75894b8210510bc8d4b2d8f48612fcd15e516b95d5f2513489a02ed38bd14aa62 WHIRLPOOL ea0e3ea77ea2787d1d7bf4945c9acad01a312433bf9908cae72f22d575c5cf50221e49d75e7a32e9ba66153d4235ca585cae2371cb6f0a9556b4a3b0d75cf02f
+MISC ChangeLog 5947 SHA256 f71544739d9610fd1b31e09d7729968ba33bf1d1ecb41691d5a3a5ba464bc347 SHA512 5dbdaa8b4cd2aab1b384e5ffcc3c6551678aa050eeaab1e3776e734da9f6eceaeb082ab26292100b42d86fe719f18b969d5a471bd947db89d99750e6c218090c WHIRLPOOL 73ef690a2c59ea65b2ffc6b8b849140cd835e5ba13b2c9c1b7621d50f4f5f18ba71e6c04da29cc325f6feb9e311f51f07b6c0288f1bf4603ac135bb9ad2570eb
+MISC metadata.xml 517 SHA256 c2248b7afbad927ad1278839f066700d7feb2d0f92d5e39066225a3f391a7127 SHA512 8f3de06520fa4f8f1ff273897be36c870b128c561dc776ef27f34fb4eb15172f0d77b7e004b5d9861f23250e1b23b08b36bc2286fee48875c3ec3e1e0cf79bb2 WHIRLPOOL e5a1c3c4a463146d8d4437ba5b34481ffb4b729f4df52247d6682ed5c02475487be782dbaba4677cc4eac51a734e525f85e0ee1d8b4488a9bc58110b441344f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBxbZ0ACgkQgAnW8HDreRb7EgCeNszt+KIvy7WdJi9WQeXyRBdB
-888AoK6FhgXjOdty9cG0Be+zCku1e/y3
-=h5OP
+iEYEAREKAAYFAlDxvYIACgkQgAnW8HDreRYvnwCeLWHiKMuRolLhByisNywgyBSd
+evsAnRjGfpPAqLAi90cOvE97qamJw7H/
+=tZqt
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/lbzip2-2.2-assertion.patch b/app-arch/lbzip2/files/lbzip2-2.2-assertion.patch
new file mode 100644
index 000000000000..b4946175b947
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.2-assertion.patch
@@ -0,0 +1,107 @@
+From 57eeee36927f8a40ece1ca06c674e0bd56d0f21f Mon Sep 17 00:00:00 2001
+Message-Id: <57eeee36927f8a40ece1ca06c674e0bd56d0f21f.1358019732.git.jlec@gentoo.org>
+From: Mikolaj Izdebski <zurgunt@gmail.com>
+Date: Sat, 20 Oct 2012 18:37:17 +0200
+Subject: [PATCH] Fix assertion failure, closes #8
+
+src/encode.c (generate_initial_trees): Rewrite from scratch.
+---
+ src/encode.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 48 insertions(+), 13 deletions(-)
+
+diff --git a/src/encode.c b/src/encode.c
+index 09cfacc..00a78dc 100644
+--- a/src/encode.c
++++ b/src/encode.c
+@@ -763,40 +763,75 @@ assign_codes(uint32_t C[], uint32_t L[], uint8_t B[], uint32_t n)
+ 
+ /* Create initial mapping of symbols to trees.
+ 
+-   The goal is to divide all as symbols [0,as) into nt equivalence classes
++   The goal is to divide all as symbols [0,as) into nt equivalence classes (EC)
+    [0,nt) such that standard deviation of symbol frequencies in classes is
+    minimal. We use a kind of a heuristic to achieve that. There might exist a
+    better way to achieve that, but this one seems to be good (and fast) enough.
+ 
+    If the symbol v belongs to the equivalence class t then set s->length[t][v]
+    to zero. Otherwise set it to 1.
+-
+-   TODO: This piece of code really needs some R&D...
+ */
+ static void
+ generate_initial_trees(struct encoder_state *s, unsigned nm, unsigned nt)
+ {
+-  unsigned a, b, c, t;
+-
+-  /* Equivalence classes are empty. */
++  unsigned a, b;   /* range [a,b) of symbols forming current EC */
++  unsigned freq;   /* symbol frequency */
++  unsigned cum;    /* cumulative frequency */
++  unsigned as;     /* effective alphabet size (alphabet size minus number
++                      of symbols with frequency equal to zero) */
++  unsigned t;      /* current tree */
++
++  /* Equivalence classes are initially empty. */
+   memset(s->length, 1, sizeof(s->length));
+ 
++  /* Determine effective alphabet size. */
++  as = 0;
++  for (a = 0, cum = 0; cum < nm; a++) {
++    freq = s->lookup[0][a];
++    cum += freq;
++    as += min(freq, 1);
++  }
++  assert(cum == nm);
++
++  /* Bound number of EC by number of symbols. Each EC is non-empty, so number
++     of symbol EC must be <= number of symbols. */
++  nt = min(nt, as);
++
+   /* For each equivalence class: */
+-  for (a = 0, t = 0; t < nt; t++) {
++  a = 0;
++  for (t = 0; nt > 0; t++, nt--) {
++    assert(nm > 0);
++    assert(as >= nt);
++
+     /* Find a range of symbols which total count is roughly proportional to one
+        nt-th of all values. */
+-    for (c = 0, b = a; c * (nt-t) < nm; b++)
+-      c += s->lookup[0][b];
+-    assert(a < b);
+-    if (a < b-1 && (2*c - s->lookup[0][b-1]) * (nt-t) > 2*nm) {
+-      c -= s->lookup[0][--b];
++    freq = s->lookup[0][a];
++    cum = freq;
++    as -= min(freq, 1);
++    b = a+1;
++    while (as > nt-1 && cum * nt < nm) {
++      freq = s->lookup[0][b];
++      cum += freq;
++      as -= min(freq, 1);
++      b++;
+     }
+-    nm -= c;
++    if (cum > freq && (2*cum - freq) * nt > 2*nm) {
++      cum -= freq;
++      as += min(freq, 1);
++      b--;
++    }
++    assert(a < b);
++    assert(cum > 0);
++    assert(cum <= nm);
++    assert(as >= nt-1);
++    Trace(("Tree %u: EC=[%3u,%3u), |EC|=%3u, cum=%6u", t, a, b, b-a, cum));
+ 
+     /* Now [a,b) is our range -- assign it to equivalence class t. */
+     bzero(&s->length[t][a], b - a);
+     a = b;
++    nm -= cum;
+   }
++  assert(as == 0);
+   assert(nm == 0);
+ }
+ 
+-- 
+1.8.1
+
diff --git a/app-arch/lbzip2/lbzip2-2.2-r1.ebuild b/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
new file mode 100644
index 000000000000..766fa4061e69
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2-r1.ebuild,v 1.1 2013/01/12 19:46:09 jlec Exp $
+
+EAPI=4
+
+inherit autotools-utils
+
+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="debug symlink"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-s_isreg.patch
+	"${FILESDIR}"/${P}-assertion.patch
+	)
+
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
+src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_enable debug tracing)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	use symlink && dosym ${PN} /usr/bin/bzip2
+}
diff --git a/app-arch/lbzip2/metadata.xml b/app-arch/lbzip2/metadata.xml
index bf9b027e4bde..c53572127eee 100644
--- a/app-arch/lbzip2/metadata.xml
+++ b/app-arch/lbzip2/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<maintainer>
-		<email>mattst88@gentoo.org</email>
-		<name>Matt Turner</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
+  </maintainer>
+  <longdescription lang="en">
 	A multi-threaded bzip2/bunzip2 utility that employs multiple threads and an 
 	input-bound splitter even when decompressing .bz2 files created by standard 
 	bzip2