2.6.23 compatibility thanks to René Rhéaume (a.k.a. repzilon, rener) <rene.rheaume@videotron.qc.ca> and Alexander Skwar <askwar@digitalprojects.com> in bug 196566

(Portage version: 2.1.3.18)

6 files changed, 24 insertions, 66 deletions

diff --git a/sys-fs/cloop/ChangeLog b/sys-fs/cloop/ChangeLog
index f0a51b01a432..6322f085462f 100644
--- a/sys-fs/cloop/ChangeLog
+++ b/sys-fs/cloop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/cloop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.18 2007/08/29 18:33:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.19 2007/11/09 07:55:52 genstef Exp $
+
+  09 Nov 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/cloop-2.05-kernel_2.6.23.patch, -cloop-2.02.1-r1.ebuild,
+  cloop-2.05.ebuild:
+  2.6.23 compatibility thanks to René Rhéaume (a.k.a. repzilon, rener)
+  <rene.rheaume@videotron.qc.ca> and Alexander Skwar
+  <askwar@digitalprojects.com> in bug 196566
 
 *cloop-2.05.ebuild (29 Aug 2007)
 
diff --git a/sys-fs/cloop/cloop-2.02.1-r1.ebuild b/sys-fs/cloop/cloop-2.02.1-r1.ebuild
deleted file mode 100644
index 23b7e5988d07..000000000000
--- a/sys-fs/cloop/cloop-2.02.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.02.1-r1.ebuild,v 1.3 2006/07/14 21:57:03 genstef Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Compressed filesystem loopback kernel module"
-HOMEPAGE="http://packages.debian.org/unstable/source/cloop http://www.knopper.net/knoppix"
-SRC_URI="mirror://debian/pool/main/c/cloop/${PN}_${PV}+eb.10.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${P}+eb.10
-
-pkg_setup() {
-	CONFIG_CHECK="ZLIB_INFLATE"
-	if kernel_is 2 4
-	then
-		CONFIG_CHECK="${CONFIG_CHECK} ZLIB_DEFLATE"
-	fi
-	MODULE_NAMES="cloop(fs:)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="KVERSION=${KV_FULL} KERNEL_DIR=${KV_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	kernel_is 2 4 || sed -i 's:MODULE_PARM(\([^,]*\), "s");:module_param(\1, charp, 0);:' compressed_loop.c
-	sed -i -e 's:__stringify(KBUILD_MODNAME):"cloop":' compressed_loop.c
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin create_compressed_fs extract_compressed_fs
-	cp debian/create_compressed_fs.1 debian/extract_compressed_fs.1
-	doman debian/create_compressed_fs.1 debian/extract_compressed_fs.1
-	dodoc CHANGELOG README
-}
-
-pkg_postinst () {
-	if kernel_is 2 4
-	then
-		einfo "Adding /dev/cloop devices"
-		if [ -e /dev/cloop ] ; then
-			rm -f /dev/cloop
-		fi
-		mknod /dev/cloop b 240 0 || die
-		if [ -e /dev/cloop1 ] ; then
-			rm -f /dev/cloop1
-		fi
-		mknod /dev/cloop1 b 240 1 || die
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/cloop/cloop-2.05.ebuild b/sys-fs/cloop/cloop-2.05.ebuild
index de1a20d72fe4..bb9e9837f2a2 100644
--- a/sys-fs/cloop/cloop-2.05.ebuild
+++ b/sys-fs/cloop/cloop-2.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.05.ebuild,v 1.2 2007/08/29 18:33:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.05.ebuild,v 1.3 2007/11/09 07:55:52 genstef Exp $
 
 inherit linux-mod
 
@@ -19,6 +19,8 @@ src_unpack() {
 	cd ${S}
 	# This should only be applied on Kernel >= 2.6.22
 	kernel_is ge 2 6 22 && epatch ${FILESDIR}/${P}-kernel_2.6.22.patch
+	# This should only be applied on Kernel >= 2.6.23
+	kernel_is ge 2 6 23 && epatch ${FILESDIR}/${P}-kernel_2.6.23.patch
 }
 
 pkg_setup() {
diff --git a/sys-fs/cloop/files/cloop-2.05-kernel_2.6.23.patch b/sys-fs/cloop/files/cloop-2.05-kernel_2.6.23.patch
new file mode 100644
index 000000000000..0ba8b3682f68
--- /dev/null
+++ b/sys-fs/cloop/files/cloop-2.05-kernel_2.6.23.patch
@@ -0,0 +1,13 @@
+diff -Nurp cloop-2.05~20060829/compressed_loop.c cloop-2.05~20060829.k2623/compressed_loop.c
+--- cloop-2.05~20060829/compressed_loop.c	2007-10-20 20:37:01.773345677 -0400
++++ cloop-2.05~20060829.k2623/compressed_loop.c	2007-10-20 21:32:56.817703680 -0400
+@@ -814,8 +814,7 @@ static void __exit cloop_exit(void)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+     devfs_remove(cloop_name);
+ #endif
+-    if(unregister_cloop_blkdev() != 0)
+-        printk(KERN_WARNING "%s: cannot unregister block device\n", cloop_name);
++    unregister_cloop_blkdev();
+     for(i=0;i<max_cloop;i++)
+     {
+         del_gendisk(cloop_dev[i].disk);
diff --git a/sys-fs/cloop/files/digest-cloop-2.02.1-r1 b/sys-fs/cloop/files/digest-cloop-2.02.1-r1
deleted file mode 100644
index fa1f48dfd2f7..000000000000
--- a/sys-fs/cloop/files/digest-cloop-2.02.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f9249087531f36774981312fc9bf951 cloop_2.02.1+eb.10.tar.gz 348471
-RMD160 bf63e46622d4f1289ea1f577fde08f6b5e977ef0 cloop_2.02.1+eb.10.tar.gz 348471
-SHA256 4e6770379a98588ad82f5fd2800454333ba19e33606f239cc44c2e127187f757 cloop_2.02.1+eb.10.tar.gz 348471
diff --git a/sys-fs/cloop/files/digest-cloop-2.05 b/sys-fs/cloop/files/digest-cloop-2.05
index 3dcf4f816d5f..70a2f292808a 100644
--- a/sys-fs/cloop/files/digest-cloop-2.05
+++ b/sys-fs/cloop/files/digest-cloop-2.05
@@ -1,3 +1,2 @@
-MD5 34eeb9f1e9b68c20b437f35bb7400819 cloop_2.05~20060829-1.tar.gz 303063
 RMD160 57d0c6df7e2de844faba8fc146d1ce4939c04c27 cloop_2.05~20060829-1.tar.gz 303063
 SHA256 61884370b33cde74e9a0a5f67f778b8744b4e201bd65c13d1b7e398488cd2282 cloop_2.05~20060829-1.tar.gz 303063