Add fixes from upstream #292011 by Nicolas Dufresne.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

5 files changed, 122 insertions, 8 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index c1e1f4130789..b05a977da65b 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/squashfs-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.68 2009/12/07 23:01:46 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.69 2010/09/20 02:03:38 vapier Exp $
+
+*squashfs-tools-4.0-r1 (20 Sep 2010)
+
+  20 Sep 2010; Mike Frysinger <vapier@gentoo.org>
+  +squashfs-tools-4.0-r1.ebuild, +files/squashfs-tools-4.0-progress-bar.patch,
+  +files/squashfs-tools-4.0-read-ret.patch:
+  Add fixes from upstream #292011 by Nicolas Dufresne.
 
   07 Dec 2009; Mike Frysinger <vapier@gentoo.org> squashfs-tools-4.0.ebuild:
   Fix building on non-glibc systems #276951 by Ed Wildgoose.
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 8ad1b12f8e16..5dfaf0bd7b91 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX squashfs-tools-3.3-posix.patch 1596 RMD160 46ea11e6aa28e8c2bc1e2c1835a8af954f6012c3 SHA1 2a56a393efe06a44e9677cd3b40f0d2318236f73 SHA256 9e75c5d8aec9c36dd4096347cd258d957903d1c8f6bec36d98654bb42f868ed8
+AUX squashfs-tools-4.0-progress-bar.patch 1178 RMD160 030db9e54dbf5e893605e5f903d865111ee2af37 SHA1 d5191a51dedf667c3bb5567e0d5640e87fcf2e74 SHA256 c9dcfb9fda91f55bc379e5d55c2fa3f5b869b54a3dd25c80df17157dca6781fa
+AUX squashfs-tools-4.0-read-ret.patch 846 RMD160 e7ae99f8c9184ef3d875a24726cd6159e735ebfc SHA1 2a0e68fa1689417e2574ff0723638d6fdd8aff11 SHA256 ca968e8a2b4d59c1745a2ec1c076b988d675655abd47297bb83a076dfb7fc555
 DIST squashfs3.2-r2.tar.gz 314764 RMD160 6f21ad0ee90e4b5c6ad2b0b92c96d24af8e19531 SHA1 e38c16c09435291b2c97aa0a321c29da442ff686 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7
 DIST squashfs3.4.tar.gz 352660 RMD160 e75c9a9e5220e80a8e321536f8fe8372bfe5d830 SHA1 6933a8f3098d94f93ec4002a54026b15a6e11640 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339
 DIST squashfs4.0.tar.gz 103979 RMD160 b67dd14ff7255d245617466566ac29d9a08aff68 SHA1 3efe764ac27c507ee4a549fc6507bc86ea0660dd SHA256 18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
 EBUILD squashfs-tools-3.2_p2.ebuild 1095 RMD160 183da75ffb969db6643876ac210b3da24fcd5862 SHA1 c7b8541bc6ee289483e15a0e2c3c19124286311f SHA256 d15c128da2c5cdc64a4376e468cf5f04289c7d9408b4c04fbb9a434d2e865bcb
 EBUILD squashfs-tools-3.4.ebuild 1095 RMD160 e08fe76143ca1af554806eb8eb3cd3f55021b651 SHA1 34b3e4eebf02b912f4dc7fa894239093037e2603 SHA256 5b66ce00377cd0d4e0cd1628de4cc9e1340e80685d41d6f36166e1f258cb3237
+EBUILD squashfs-tools-4.0-r1.ebuild 1214 RMD160 b5651766c212798115cfbf4081b48e451916e065 SHA1 53c0fd207d2000d180f7f53776aafa639554cc53 SHA256 d8cea6efce7725cfec993dbc5eae1669b289f4b5fd85fd7f12fcdada0f828773
 EBUILD squashfs-tools-4.0.ebuild 1089 RMD160 a80aba63e0cd09dc748ddcfa5211e3051f643397 SHA1 a3fa0234c2d8cc463ff6b49bcdf3607ffab0339b SHA256 8dbc239955176e66eac70075d0e581c0407bfea5b6ed2b4fe0c7e6a81ec78faf
-MISC ChangeLog 11090 RMD160 09da6c72b9c310e3a9da72ea91b16043a80da09b SHA1 957c44b767524c9f0397cb065373013d1dbdad4a SHA256 251fbf643cc0c2a53ffbbca8ac8fc3676dd161fd89d6ba1dcdb8737b84082868
+MISC ChangeLog 11357 RMD160 afcb2ba7c3a03f94639070925ccb21ee6fb8d100 SHA1 4926b8437893f33c8157db23ba83a3e3bedb906c SHA256 bdf2534763a278667c5bc80dcd1d9efe254ba7764536223f325777edc5e006ae
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAksdiWYACgkQlPl3HsVfCDoNlQCfUZ71yzRVJEcKAwqjjFuxMO1h
-9RIAn2DaxGMkTBfOqNRSxgx/EEAyHOzY
-=NG+O
+iF4EAREIAAYFAkyWwOkACgkQTwhj9JtAlp7H2QEAvu8pJBc0xf4SAYXVedrTgDA7
+ikihyBl3JIa4I2pg8JcBALbGdh3iRY5RCoAgRJh61vnMtkf6HPEyNM0JjBTJKgtP
+=hn5e
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch
new file mode 100644
index 000000000000..4efb8ff90a25
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch
@@ -0,0 +1,36 @@
+http://bugs.gentoo.org/292011
+
+revision 1.121
+date: 2010/03/08 01:30:17;  author: plougher;  state: Exp;  lines: +10 -5
+Fix floating point error in progress_bar when max == 0
+
+Index: unsquashfs.c
+===================================================================
+RCS file: /cvsroot/squashfs/squashfs/squashfs-tools/unsquashfs.c,v
+retrieving revision 1.120
+retrieving revision 1.121
+diff -u -p -r1.120 -r1.121
+--- squashfs-tools/unsquashfs.c	7 Mar 2010 03:16:46 -0000	1.120
++++ squashfs-tools/unsquashfs.c	8 Mar 2010 01:30:17 -0000	1.121
+@@ -1871,12 +1871,17 @@ void update_progress_bar()
+ void progress_bar(long long current, long long max, int columns)
+ {
+ 	char rotate_list[] = { '|', '/', '-', '\\' };
+-	int max_digits = floor(log10(max)) + 1;
+-	int used = max_digits * 2 + 11;
+-	int hashes = (current * (columns - used)) / max;
+-	int spaces = columns - used - hashes;
++	int max_digits, used, hashes, spaces;
+ 	static int tty = -1;
+ 
++	if(max == 0)
++		return;
++
++	max_digits = floor(log10(max)) + 1;
++	used = max_digits * 2 + 11;
++	hashes = (current * (columns - used)) / max;
++	spaces = columns - used - hashes;
++
+ 	if((current > max) || (columns - used < 0))
+ 		return;
+ 
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch
new file mode 100644
index 000000000000..f57d49c0eed5
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/292011
+
+revision 1.21                                                     
+date: 2009/04/21 00:59:16;  author: plougher;  state: Exp;  lines: +1 -1
+Fix return in read_fragment_table_4                                     
+
+Index: squashfs-tools/unsquash-4.c
+===================================================================
+RCS file: /cvsroot/squashfs/squashfs/squashfs-tools/unsquash-4.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -p -r1.20 -r1.21
+--- squashfs-tools/unsquash-4.c	31 Mar 2009 04:38:53 -0000	1.20
++++ squashfs-tools/unsquash-4.c	21 Apr 2009 00:59:16 -0000	1.21
+@@ -38,7 +38,7 @@ int read_fragment_table_4()
+ 		sBlk.fragment_table_start);
+ 
+ 	if(sBlk.fragments == 0)
+-		return;
++		return TRUE;
+ 
+ 	if((fragment_table = malloc(sBlk.fragments *
+ 			sizeof(squashfs_fragment_entry))) == NULL)
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild
new file mode 100644
index 000000000000..c6e60fda7dbb
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild,v 1.1 2010/09/20 02:03:38 vapier Exp $
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV}
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
+		Makefile || die "sed failed"
+	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
+	epatch "${FILESDIR}"/${P}-read-ret.patch #292011
+	epatch "${FILESDIR}"/${P}-progress-bar.patch #292011
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs || die
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README
+}
+
+pkg_postinst() {
+	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
+}