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

Package-Manager: portage-2.1.3.18

7 files changed, 39 insertions, 85 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/Manifest b/sys-fs/cloop/Manifest
index e730edf5ff3a..4e65d8668951 100644
--- a/sys-fs/cloop/Manifest
+++ b/sys-fs/cloop/Manifest
@@ -2,35 +2,31 @@ AUX cloop-2.05-kernel_2.6.22.patch 622 RMD160 26c79817445f8c87dfa414e97cc0cb062a
 MD5 8f502a402c45cb8e880ca7afd9ddbfc6 files/cloop-2.05-kernel_2.6.22.patch 622
 RMD160 26c79817445f8c87dfa414e97cc0cb062a81da92 files/cloop-2.05-kernel_2.6.22.patch 622
 SHA256 296f8cc5d32625df39961504ceedbfdf444c6d801d9d71b24b36d66feb6ac537 files/cloop-2.05-kernel_2.6.22.patch 622
-DIST cloop_2.02.1+eb.10.tar.gz 348471 RMD160 bf63e46622d4f1289ea1f577fde08f6b5e977ef0 SHA1 403bcd4f874fe8a475439fe61008b6f811b3d163 SHA256 4e6770379a98588ad82f5fd2800454333ba19e33606f239cc44c2e127187f757
+AUX cloop-2.05-kernel_2.6.23.patch 631 RMD160 84607fc476e390208d096d5ca89e7cba512d8498 SHA1 8783cb2cd56a710999547a98519afa92ecf5c9ae SHA256 f56f1828423c313924b312931ac2a65c20803ce2e6bb5f63e1471cf7759ee759
+MD5 a0b77e50bcc97faeb6961fbee4066716 files/cloop-2.05-kernel_2.6.23.patch 631
+RMD160 84607fc476e390208d096d5ca89e7cba512d8498 files/cloop-2.05-kernel_2.6.23.patch 631
+SHA256 f56f1828423c313924b312931ac2a65c20803ce2e6bb5f63e1471cf7759ee759 files/cloop-2.05-kernel_2.6.23.patch 631
 DIST cloop_2.04-1+eb.1-7.tar.gz 302314 RMD160 d2556d86301ce5c98535daa0a2ccf4412e0476ad SHA1 5427dba752bf883409555715a1218a9b547a8705 SHA256 f5b3c2120a3620cbbef2f26b9dbcc78224681a9f25d80090fc30f940301500e0
 DIST cloop_2.05~20060829-1.tar.gz 303063 RMD160 57d0c6df7e2de844faba8fc146d1ce4939c04c27 SHA1 a6466872dacfcc2cbb90b9c0889ff9625c4230e5 SHA256 61884370b33cde74e9a0a5f67f778b8744b4e201bd65c13d1b7e398488cd2282
-EBUILD cloop-2.02.1-r1.ebuild 1546 RMD160 093bdbf91f6d0f05f53842d8b6c457355248b8cb SHA1 bde254c30323ed7c713fef928a5db5ce0d6f1280 SHA256 3df6beca449812d4037b2bb1643b21825376736117f76074b05de5b0b35c1d68
-MD5 b9a6bdb816d809f0837a8f23f08c38a6 cloop-2.02.1-r1.ebuild 1546
-RMD160 093bdbf91f6d0f05f53842d8b6c457355248b8cb cloop-2.02.1-r1.ebuild 1546
-SHA256 3df6beca449812d4037b2bb1643b21825376736117f76074b05de5b0b35c1d68 cloop-2.02.1-r1.ebuild 1546
 EBUILD cloop-2.04.ebuild 1227 RMD160 1cdb02c48ad471a9b85433c02f7beac4b1d6d1df SHA1 299c06bced53b586b6541043999aceaa093fd2be SHA256 8941176ce1614e68d434a5337384ec0fc7043c94f381df9a1510486e1aeb636b
 MD5 71b04709377c4b48e83266e93f9409f2 cloop-2.04.ebuild 1227
 RMD160 1cdb02c48ad471a9b85433c02f7beac4b1d6d1df cloop-2.04.ebuild 1227
 SHA256 8941176ce1614e68d434a5337384ec0fc7043c94f381df9a1510486e1aeb636b cloop-2.04.ebuild 1227
-EBUILD cloop-2.05.ebuild 1174 RMD160 d000a8ca9d7c542ce60dc8ef08b133db111e6ae8 SHA1 6590e3864ee9da97780f6f3471583150aafea7ed SHA256 f8ca7189b4c8ed65c5c4f9faa77600552ddd598e8b9188bf0f240899b91e64c0
-MD5 bc8b3ddab4acafc1a1d6814e715324db cloop-2.05.ebuild 1174
-RMD160 d000a8ca9d7c542ce60dc8ef08b133db111e6ae8 cloop-2.05.ebuild 1174
-SHA256 f8ca7189b4c8ed65c5c4f9faa77600552ddd598e8b9188bf0f240899b91e64c0 cloop-2.05.ebuild 1174
-MISC ChangeLog 5224 RMD160 0c475dc4c96244e69c8d3ed6fe9480962f23f8f9 SHA1 2d330493241ae7d346ed8c8c97c0a06557d60739 SHA256 58abea8c2642e4af1c8717dcf9feaeeead5d966e270e9f9d5d656dc72046dc8a
-MD5 8c372b1c8fb673a85e1f8d93da5956f5 ChangeLog 5224
-RMD160 0c475dc4c96244e69c8d3ed6fe9480962f23f8f9 ChangeLog 5224
-SHA256 58abea8c2642e4af1c8717dcf9feaeeead5d966e270e9f9d5d656dc72046dc8a ChangeLog 5224
+EBUILD cloop-2.05.ebuild 1293 RMD160 54e1ce1083ecf083efbf44e5fca9a47b9e431bd9 SHA1 f6f6a0770c83aac6c026d900c13559cfeefe91d5 SHA256 33d23ae8a65a08f1d5b0700ff3ac66d4c411c8eb334eea0560167ecb2908de83
+MD5 0a03970824e99fb716b1544f819fe320 cloop-2.05.ebuild 1293
+RMD160 54e1ce1083ecf083efbf44e5fca9a47b9e431bd9 cloop-2.05.ebuild 1293
+SHA256 33d23ae8a65a08f1d5b0700ff3ac66d4c411c8eb334eea0560167ecb2908de83 cloop-2.05.ebuild 1293
+MISC ChangeLog 5536 RMD160 4160eb6bdb5161df1cc27c5c1a5d98a6cf74062f SHA1 08b34674a2feeb57ecce90b1c5658e33a64995f6 SHA256 01b77c3d0a330efb975cfc7beda7f07d0407e19513a65bfef83fecaa58378f89
+MD5 7a51f04830b991b63163c5a2caaf1f4a ChangeLog 5536
+RMD160 4160eb6bdb5161df1cc27c5c1a5d98a6cf74062f ChangeLog 5536
+SHA256 01b77c3d0a330efb975cfc7beda7f07d0407e19513a65bfef83fecaa58378f89 ChangeLog 5536
 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
 MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269
 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269
 SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6 metadata.xml 269
-MD5 1937f415be76d41a9cca4fccd67495ef files/digest-cloop-2.02.1-r1 256
-RMD160 8c3eab6a46ce47053f1b636ed21fe34ed1467b41 files/digest-cloop-2.02.1-r1 256
-SHA256 e867f4602ee5a808ec3e317a4b9bdbd360248e06f79fc2d9d5b229a1df06a560 files/digest-cloop-2.02.1-r1 256
 MD5 6a8f62061bd8025c31abe2e9de17aece files/digest-cloop-2.04 259
 RMD160 141ec9e4f7f7b40a41370e230fc5ccca4df2ce8f files/digest-cloop-2.04 259
 SHA256 e7580920390049773924b19c29d39f9f918126321b2c4626c7f03c5e2da68885 files/digest-cloop-2.04 259
-MD5 3b64a4a775b25585cb6e4aae4da65cb0 files/digest-cloop-2.05 265
-RMD160 dd0ce587e21c6616972142b0cb2e385fb7235c10 files/digest-cloop-2.05 265
-SHA256 f9d735781b8dcdeb56a020b79ae8e3024942f3e0a544903bb84bb8f56180ac2f files/digest-cloop-2.05 265
+MD5 c88a0429f3b276c7ef9741a97df5a702 files/digest-cloop-2.05 192
+RMD160 29e924923c82a1a834d7f93af8c5a31e31f1f7cc files/digest-cloop-2.05 192
+SHA256 3d722dea8f6c361411d043923fe69b508ec12982f13b7082b333ebb559df0d12 files/digest-cloop-2.05 192
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