2.6.19 kernel compatibility patch - bug #158463

Package-Manager: portage-2.1.2_rc3-r5

5 files changed, 86 insertions, 15 deletions

diff --git a/sys-fs/cowloop/ChangeLog b/sys-fs/cowloop/ChangeLog
index 1f1c186ead03..c931badfca99 100644
--- a/sys-fs/cowloop/ChangeLog
+++ b/sys-fs/cowloop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cowloop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.12 2006/12/16 21:43:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.13 2006/12/19 06:48:15 dragonheart Exp $
+
+  19 Dec 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/cowloop-3.0-cflags.patch, +files/cowloop-3.0-config_h.patch,
+  cowloop-3.0.ebuild:
+  2.6.19 kernel compatibility patch thanks to Willard Dawson in bug #158463
 
 *cowloop-3.0 (16 Dec 2006)
 
diff --git a/sys-fs/cowloop/Manifest b/sys-fs/cowloop/Manifest
index 0b954beed6f4..bb54b9e3906b 100644
--- a/sys-fs/cowloop/Manifest
+++ b/sys-fs/cowloop/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cowloop-3.0-cflags.patch 1367 RMD160 2ace187978410854ede706dc13fa8738137ecb83 SHA1 2376b4b23b4b5795b9be8282d7614f8efbbc559b SHA256 354c1731ddfcd11f9fa62ff7dde6d3c1640a8769aa216c8e9f8a43ca2138d7e9
+MD5 4b6cc429c3b29d3a1f81f46dca848e71 files/cowloop-3.0-cflags.patch 1367
+RMD160 2ace187978410854ede706dc13fa8738137ecb83 files/cowloop-3.0-cflags.patch 1367
+SHA256 354c1731ddfcd11f9fa62ff7dde6d3c1640a8769aa216c8e9f8a43ca2138d7e9 files/cowloop-3.0-cflags.patch 1367
+AUX cowloop-3.0-config_h.patch 369 RMD160 782dba93dcd1a3248118ab7e59c6123e791ac10a SHA1 9d0f0f9ac5a6d8af7089b7889734f4706818974c SHA256 be79597b3a61b5a22d37ab38c9d2a19c612754cf2ee60d2fd14e6db7503219b6
+MD5 75c5bf1517f4d3355555da9c9abaab06 files/cowloop-3.0-config_h.patch 369
+RMD160 782dba93dcd1a3248118ab7e59c6123e791ac10a files/cowloop-3.0-config_h.patch 369
+SHA256 be79597b3a61b5a22d37ab38c9d2a19c612754cf2ee60d2fd14e6db7503219b6 files/cowloop-3.0-config_h.patch 369
 DIST cowloop-1.4.tar.gz 12580 RMD160 534c89074d218c7d647b25ef32a7d9f7d7391348 SHA1 029ea265277b28e5952fadcc150524625c1e073d SHA256 9b60d2d79daec4b9582804877c0775a290c95fb06db9db2f1cabc6f1641afbce
 DIST cowloop-2.14.tar.gz 25089
 DIST cowloop-2.15.tar.gz 33612
@@ -17,14 +25,14 @@ EBUILD cowloop-2.15-r1.ebuild 1348 RMD160 94dca4ebe8c8d4e80b80449634e5ea86c1892c
 MD5 c21f4d6697a46bee21843061218456f2 cowloop-2.15-r1.ebuild 1348
 RMD160 94dca4ebe8c8d4e80b80449634e5ea86c1892c7d cowloop-2.15-r1.ebuild 1348
 SHA256 a774eaf0d63f1fee4b0b170d8b5a2426dc3807c9ff9f47eeb4e53f25399b9d9b cowloop-2.15-r1.ebuild 1348
-EBUILD cowloop-3.0.ebuild 1419 RMD160 17d64d9afb9dc879f2a52e874591f41c8334d83d SHA1 d0a8177caef4be1f9896edcf8088b12389f8524f SHA256 8e1e3de3c3428f5fa0d72a50ab620da0e90d7bf1d8a455447d6cd31d1a489112
-MD5 29f944e8cd860f118a2a39f5f059b942 cowloop-3.0.ebuild 1419
-RMD160 17d64d9afb9dc879f2a52e874591f41c8334d83d cowloop-3.0.ebuild 1419
-SHA256 8e1e3de3c3428f5fa0d72a50ab620da0e90d7bf1d8a455447d6cd31d1a489112 cowloop-3.0.ebuild 1419
-MISC ChangeLog 1911 RMD160 e43922eea336192814519e56d4632363eb72eebe SHA1 62563f4e72797af63786505b4cfb4b5f267793d5 SHA256 2689c7409e2e9244147ae9930280eb13a91d9fc4b084c68cc87a3aab3a43734b
-MD5 935fd676f28a589f964aa8a0bf83bb00 ChangeLog 1911
-RMD160 e43922eea336192814519e56d4632363eb72eebe ChangeLog 1911
-SHA256 2689c7409e2e9244147ae9930280eb13a91d9fc4b084c68cc87a3aab3a43734b ChangeLog 1911
+EBUILD cowloop-3.0.ebuild 1518 RMD160 94d44769a8c26fb142948d7b97431a2225a2dd98 SHA1 902dd3ac9ad39224df2acaeb1e9e04c76f70b779 SHA256 7617a6c9fc2dc8f6ed0191126b2ecca58fe67e44e70ff1fe4ab52e9cc2d3e7a4
+MD5 2a064a165fc113de8e119e15c8f2edb4 cowloop-3.0.ebuild 1518
+RMD160 94d44769a8c26fb142948d7b97431a2225a2dd98 cowloop-3.0.ebuild 1518
+SHA256 7617a6c9fc2dc8f6ed0191126b2ecca58fe67e44e70ff1fe4ab52e9cc2d3e7a4 cowloop-3.0.ebuild 1518
+MISC ChangeLog 2133 RMD160 f4f8b1ecbb4eec426b84d5efd4881b7f5b2f5aad SHA1 0e477d45a6d63a711586407d150d714b6bd1cb28 SHA256 5b4aa3a2e55889a6fb0f1abfeb023a9424b5c76824e9bd34f89783f2f2451809
+MD5 d2c766b9f79bd474c6e5a678d927b932 ChangeLog 2133
+RMD160 f4f8b1ecbb4eec426b84d5efd4881b7f5b2f5aad ChangeLog 2133
+SHA256 5b4aa3a2e55889a6fb0f1abfeb023a9424b5c76824e9bd34f89783f2f2451809 ChangeLog 2133
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
@@ -44,7 +52,7 @@ SHA256 c5c14f4c8d1b6fb839dd884e0390064311578c32129422b31b15d03b414681b4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFhGi1mdTrptrqvGERAoqXAKCfdOfpi7rAACBPBduCYzvcl70K7wCglY0K
-0cm0lVBqc6Qm4B5TG8VjcWI=
-=uO2L
+iD8DBQFFh4sImdTrptrqvGERAkHxAJ9nYPqZzRP5xAffqwkUIR3wDudeGwCfezTD
+fJZIV1Q+6a6UWv/lEZz0TNQ=
+=5TNp
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cowloop/cowloop-3.0.ebuild b/sys-fs/cowloop/cowloop-3.0.ebuild
index 471c99674bcd..f6baff666ac7 100644
--- a/sys-fs/cowloop/cowloop-3.0.ebuild
+++ b/sys-fs/cowloop/cowloop-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0.ebuild,v 1.1 2006/12/16 21:43:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0.ebuild,v 1.2 2006/12/19 06:48:15 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -30,10 +30,16 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-cflags.patch
+	epatch ${FILESDIR}/${P}-config_h.patch
+}
+
 src_compile() {
-	linux-mod_src_compile
 	touch .gpl_license_accepted
-	CC="$(tc-getCC) ${CFLAGS}" emake utils || die "make failed"
+	linux-mod_src_compile
+	CC="$(tc-getCC)" emake utils || die "make failed"
 }
 
 src_install() {
diff --git a/sys-fs/cowloop/files/cowloop-3.0-cflags.patch b/sys-fs/cowloop/files/cowloop-3.0-cflags.patch
new file mode 100644
index 000000000000..1b29d26ffb57
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-cflags.patch
@@ -0,0 +1,39 @@
+--- cowloop-3.0/src/Makefile.orig	2006-12-19 17:12:10.000000000 +1100
++++ cowloop-3.0/src/Makefile	2006-12-19 17:13:33.000000000 +1100
+@@ -23,28 +23,28 @@
+ # make -C $(KERNDIR) SUBDIRS=$(THISDIR) -I. -Wall modules
+ 
+ cowdev:		cowdev.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowdev cowdev.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowdev cowdev.c
+ 
+ cowwatch:	cowwatch.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowwatch cowwatch.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowwatch cowwatch.c
+ 
+ cowctl:		cowctl.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowctl cowctl.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowctl cowctl.c
+ 
+ cowsync:	cowsync.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowsync cowsync.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowsync cowsync.c
+ 
+ cowlist:	cowlist.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowlist cowlist.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowlist cowlist.c
+ 
+ cowrepair:	cowrepair.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowrepair cowrepair.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowrepair cowrepair.c
+ 
+ cowmerge:	cowmerge.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowmerge cowmerge.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowmerge cowmerge.c
+ 
+ cowpack:	cowpack.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowpack cowpack.c -lz
++		$(CC) $(CFLAGS) -I. -Wall -o cowpack cowpack.c -lz
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/sys-fs/cowloop/files/cowloop-3.0-config_h.patch b/sys-fs/cowloop/files/cowloop-3.0-config_h.patch
new file mode 100644
index 000000000000..eb08ec352735
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-config_h.patch
@@ -0,0 +1,13 @@
+--- cowloop-3.0/src/cowloop.c.orig	2006-12-19 17:16:32.000000000 +1100
++++ cowloop-3.0/src/cowloop.c	2006-12-19 17:26:25.000000000 +1100
+@@ -233,7 +233,10 @@
+ #endif
+ 
+ #include <linux/types.h>
++#include <linux/autoconf.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+ #include <linux/init.h>