Fix kernel 2.6.22 thanks to Alexander Skwar <askwar@digitalprojects.com> in bug 189561

Package-Manager: portage-2.1.3.7

4 files changed, 41 insertions, 11 deletions

diff --git a/sys-fs/cloop/ChangeLog b/sys-fs/cloop/ChangeLog
index 77bf1a758691..f0a51b01a432 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.17 2007/05/12 02:13:08 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.18 2007/08/29 18:33:26 genstef Exp $
+
+*cloop-2.05.ebuild (29 Aug 2007)
+
+  29 Aug 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/cloop-2.05-kernel_2.6.22.patch, cloop-2.05.ebuild:
+  Fix kernel 2.6.22 thanks to Alexander Skwar <askwar@digitalprojects.com> in
+  bug 189561
 
   12 May 2007; Daniel Drake <dsd@gentoo.org> metadata.xml:
   Move from kernel to kernel-misc herd
diff --git a/sys-fs/cloop/Manifest b/sys-fs/cloop/Manifest
index 52280f3c69d6..e730edf5ff3a 100644
--- a/sys-fs/cloop/Manifest
+++ b/sys-fs/cloop/Manifest
@@ -1,3 +1,7 @@
+AUX cloop-2.05-kernel_2.6.22.patch 622 RMD160 26c79817445f8c87dfa414e97cc0cb062a81da92 SHA1 548414ef17d4125b8e3b96c5bda94fb9bc133e3b SHA256 296f8cc5d32625df39961504ceedbfdf444c6d801d9d71b24b36d66feb6ac537
+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
 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
@@ -9,14 +13,14 @@ EBUILD cloop-2.04.ebuild 1227 RMD160 1cdb02c48ad471a9b85433c02f7beac4b1d6d1df SH
 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 1015 RMD160 d1d88d7a7d1af10f655fedd22f196e8d04360a56 SHA1 0d0516bd5c3b3a03e70fc0b9f3fa4352c3f8a335 SHA256 ae9c7780a1d96951174984f707a0c67cf9848d193127654e682a40a78221382a
-MD5 f01966a6e14ae41d857e2bd78ea9cdef cloop-2.05.ebuild 1015
-RMD160 d1d88d7a7d1af10f655fedd22f196e8d04360a56 cloop-2.05.ebuild 1015
-SHA256 ae9c7780a1d96951174984f707a0c67cf9848d193127654e682a40a78221382a cloop-2.05.ebuild 1015
-MISC ChangeLog 4981 RMD160 bad2948ba9ed9b9294168262f70a339f0284756d SHA1 e03356af2d10ff590e4826e72e20aeda59bd6eec SHA256 8c6e2df25654d9d34b63b835de93aa3d1b24a53bab5406432f189347dfe74694
-MD5 26cb1084452df32d2c1b41aa94a24ee6 ChangeLog 4981
-RMD160 bad2948ba9ed9b9294168262f70a339f0284756d ChangeLog 4981
-SHA256 8c6e2df25654d9d34b63b835de93aa3d1b24a53bab5406432f189347dfe74694 ChangeLog 4981
+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
 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
 MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269
 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269
diff --git a/sys-fs/cloop/cloop-2.05.ebuild b/sys-fs/cloop/cloop-2.05.ebuild
index 0bcffc2837ec..de1a20d72fe4 100644
--- a/sys-fs/cloop/cloop-2.05.ebuild
+++ b/sys-fs/cloop/cloop-2.05.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/12/07 19:41:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.05.ebuild,v 1.2 2007/08/29 18:33:26 genstef Exp $
 
 inherit linux-mod
 
@@ -14,6 +14,13 @@ IUSE=""
 
 S=${WORKDIR}/${P}~20060829
 
+src_unpack() {
+	unpack ${A}
+	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
+}
+
 pkg_setup() {
 	kernel_is 2 4 && die "kernel 2.4 is not supported"
 	CONFIG_CHECK="ZLIB_INFLATE"
diff --git a/sys-fs/cloop/files/cloop-2.05-kernel_2.6.22.patch b/sys-fs/cloop/files/cloop-2.05-kernel_2.6.22.patch
new file mode 100644
index 000000000000..8b790e911043
--- /dev/null
+++ b/sys-fs/cloop/files/cloop-2.05-kernel_2.6.22.patch
@@ -0,0 +1,12 @@
+diff -ur cloop-2.05~20060829.original/compressed_loop.c cloop-2.05~20060829/compressed_loop.c
+--- cloop-2.05~20060829.original/compressed_loop.c	2006-12-04 00:07:02.000000000 +0100
++++ cloop-2.05~20060829/compressed_loop.c	2007-08-20 09:20:20.289119997 +0200
+@@ -625,7 +625,7 @@
+     if(clo->compressed_buffer) { vfree(clo->compressed_buffer); clo->compressed_buffer = NULL; }
+     zlib_inflateEnd(&clo->zstream);
+     if(clo->zstream.workspace) { vfree(clo->zstream.workspace); clo->zstream.workspace = NULL; }
+-    invalidate_bdev(bdev, 0);
++    invalidate_bdev(bdev);
+     set_capacity(clo->disk, 0);
+     return 0;
+ }