Fix for bug #27882

3 files changed, 21 insertions, 5 deletions

diff --git a/sys-apps/cloop/ChangeLog b/sys-apps/cloop/ChangeLog
index 0b6cf108b6ae..c348a1c46550 100644
--- a/sys-apps/cloop/ChangeLog
+++ b/sys-apps/cloop/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/cloop
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cloop/ChangeLog,v 1.3 2003/08/26 14:17:05 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cloop/ChangeLog,v 1.4 2003/09/04 13:04:37 stuart Exp $
+
+  04 Sep 2003; stuart cloop-0.68.ebuild:
+  Fix for bug #27882
+  
+  cloop needs to be *sure* that the zlib code is linked into the kernel.
+  Simply enabling the zlib config options isn't enough; the code needs
+  to be called from elsewhere in the kernel.
+  
+  The kernel-mod eclass now provides a function to test for this, and
+  I've updated the cloop-0.68 ebuild to use it.
 
   26 Aug 2003; stuart cloop-1.0.ebuild:
   Added test to catch cause of bug #27343
diff --git a/sys-apps/cloop/Manifest b/sys-apps/cloop/Manifest
index 2eb2e3ee2437..3f78ff75de50 100644
--- a/sys-apps/cloop/Manifest
+++ b/sys-apps/cloop/Manifest
@@ -1,5 +1,5 @@
-MD5 fc97b5e2afe2985fb35dc3b127e64642 cloop-0.68.ebuild 1842
+MD5 0aa22b40a06cb0a362cb73beb7326b8b cloop-0.68.ebuild 2060
 MD5 3db0f939da34558d619d860bd53d6885 cloop-1.0.ebuild 1842
-MD5 c2f7050d70e06e429c1cc8d0469cc3ee ChangeLog 505
+MD5 049c66687f0bd72819ce054e757f22ed ChangeLog 881
 MD5 35d772e2810697ea7458e58d4cd8dac1 files/digest-cloop-1.0 62
 MD5 a2d81d30f83079df12804981e490bd8c files/digest-cloop-0.68 64
diff --git a/sys-apps/cloop/cloop-0.68.ebuild b/sys-apps/cloop/cloop-0.68.ebuild
index 2eac923a5b3b..fcf6283df38f 100644
--- a/sys-apps/cloop/cloop-0.68.ebuild
+++ b/sys-apps/cloop/cloop-0.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cloop/cloop-0.68.ebuild,v 1.3 2003/08/26 14:17:05 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cloop/cloop-0.68.ebuild,v 1.4 2003/09/04 13:04:37 stuart Exp $
 
 inherit kernel-mod
 
@@ -39,6 +39,11 @@ badconfig () {
 	die
 }
 
+badconfig_deps () {
+	eerror "You must enable one of these kernel configuration options, to"
+	eerror "ensure that the kernel's zlib support is included:"
+}
+
 src_compile() {
 	kernel-mod_getversion
 	[ "$KV_MAJOR" = "2" ] && [ "$KV_MINOR" != "4" ] && badversion
@@ -47,13 +52,14 @@ src_compile() {
 	[ "$CONFIG_ZLIB_INFLATE" != "y" ] && badconfig
 	[ "$CONFIG_ZLIB_DEFLATE" != "y" ] && badconfig
 
+	kernel-mod_checkzlibinflate_configured
 	kernel-mod_src_compile
 }
 
 src_install() {
 	insinto /lib/modules/$KV_VERSION_FULL/misc
 	doins cloop.o
-	dobin create_compressed_fs compressloop
+	dobin create_compressed_fs compressloop extract_compressed_fs
 	doman debian/create_compressed_fs.1
 	dodoc CHANGELOG README
 }