2.6.27 kernel patches as per bug #256527. removed -r2 version as it did not include latest patches. marked 3.0 as x86 stable as I should not have rev bumped it years ago for the patches I added

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 47 insertions, 70 deletions

diff --git a/sys-fs/cowloop/ChangeLog b/sys-fs/cowloop/ChangeLog
index 520cf8d45a7c..953905c7b478 100644
--- a/sys-fs/cowloop/ChangeLog
+++ b/sys-fs/cowloop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/cowloop
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.22 2008/04/06 10:02:16 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.23 2009/01/30 21:04:05 dragonheart Exp $
+
+  30 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/cowloop-3.0-request_queue_t.patch,
+  +files/cowloop-3.0-semaphore_h.patch, -cowloop-3.0-r2.ebuild,
+  cowloop-3.0-r3.ebuild:
+  2.6.27 kernel patches as per bug #256527. removed -r2 version as it did not
+  include latest patches. marked 3.0 as x86 stable as I should not have rev
+  bumped it years ago for the patches I added
 
 *cowloop-3.0-r3 (01 Apr 2008)
 
diff --git a/sys-fs/cowloop/Manifest b/sys-fs/cowloop/Manifest
index e1ede481cfb6..e80aac06875c 100644
--- a/sys-fs/cowloop/Manifest
+++ b/sys-fs/cowloop/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cowloop-3.0-cflags.patch 1367 RMD160 2ace187978410854ede706dc13fa8738137ecb83 SHA1 2376b4b23b4b5795b9be8282d7614f8efbbc559b SHA256 354c1731ddfcd11f9fa62ff7dde6d3c1640a8769aa216c8e9f8a43ca2138d7e9
 AUX cowloop-3.0-config_h.patch 369 RMD160 782dba93dcd1a3248118ab7e59c6123e791ac10a SHA1 9d0f0f9ac5a6d8af7089b7889734f4706818974c SHA256 be79597b3a61b5a22d37ab38c9d2a19c612754cf2ee60d2fd14e6db7503219b6
 AUX cowloop-3.0-kern-2.6.23.patch 541 RMD160 d4660bde58b2eb97228de83ccbaa8928a47437cd SHA1 6ecc76b89ae069cc685718b7c76a047d041ca665 SHA256 fefbb2c13748f14eb74041599ac0b106a77fe3855faa1ce58d5b0126a2f29926
+AUX cowloop-3.0-request_queue_t.patch 397 RMD160 71f39dfb80088393120e03c38ea41a014d88f628 SHA1 792399b1ffe141113750ed9bfc5cb2c382a75b3a SHA256 7bd98d1cbe23a0f199f2b646e0d7ae89c239291cbeb203ec3f401dd668937b2a
+AUX cowloop-3.0-semaphore_h.patch 441 RMD160 8eb9c5b8c51e5fd5e9d78c0ef5a0437eeb989e4d SHA1 cd56784cc84bea952a410d74d8480f8800271395 SHA256 e81f988bc3044e503a170488e81adfa84275ea6348b6f908729e9506f206fd67
 AUX cowloop-3.0-vfs_statfs.patch 1096 RMD160 531d32023649ba5497dc059e7e439690cabd8410 SHA1 65a0e51653b932f6b197b3a41abe643d08c1dd3d SHA256 203dfe0343df3ab2c465bdb9f44dc5dd5e0b4bc5f36273000d99993763fcb62f
 DIST cowloop-3.0.tar.gz 129034 RMD160 10614214e43be983df652c941dcab74f76bc076e SHA1 c307f30f0a807ac018fe5ee24f330948d98dedbf SHA256 bf71e90c216f862ece4a48401fa5517cfcc91267e8648e30524ed2b9097489ce
-EBUILD cowloop-3.0-r2.ebuild 1525 RMD160 037f1e337d4bc84decd73a586be214397678740a SHA1 1eacbb6fbd63115a8010e83f8f91882d42c44def SHA256 74591e3c5a31d802d49f189a50d6c700351d6cec626f5d12986323533f1f911c
-EBUILD cowloop-3.0-r3.ebuild 1622 RMD160 290f6e97aa50fb9281fd463c5d22ba355ec473ed SHA1 8929c29c11c8adda42d38b5a6f524193cc269075 SHA256 9884fa904972482078419cbd57524feeb62d31d4889a59930db458045ada53cd
-MISC ChangeLog 3330 RMD160 4e630188fc34c234ff1508829f113629ea35378d SHA1 fcf8621d6f02d741ec0070d8720b4ba886c9069c SHA256 fd728c21027ffb47f8cea27171c10601d1430030535ac95290e009da934ab4f4
+EBUILD cowloop-3.0-r3.ebuild 1715 RMD160 53f23f34c425ee382e1c1bdd99440064fdbae3c9 SHA1 ed0b87e73fc7d5a2eca1b88989a0c12adb12d1ba SHA256 3cfb61f4a16049d4a147154eca0e263b63c6c916201e4ad06f3cbae6b0f82060
+MISC ChangeLog 3724 RMD160 7267042f991aef251a805145f82bb684eb5aa4ee SHA1 1ddaa21b260cdf7018fe47c54bb44c3c2a34c18f SHA256 97b6ff4642e2de2ce57f34230e010ca7b314e21303e99868fd67525cf64d0757
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH+J+yV3J2n04EauwRAkzJAJ9bVMOhs1yWwEdbYmCF4EO+/fO/2QCfaNvD
-bXI0yRLfErfp9aluWruB4eo=
-=olRF
------END PGP SIGNATURE-----
diff --git a/sys-fs/cowloop/cowloop-3.0-r2.ebuild b/sys-fs/cowloop/cowloop-3.0-r2.ebuild
deleted file mode 100644
index 6a15e360fbb3..000000000000
--- a/sys-fs/cowloop/cowloop-3.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r2.ebuild,v 1.3 2008/04/01 14:39:22 dragonheart Exp $
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="A copy-on-write loop driver (block device) to be used on top of any other block driver"
-HOMEPAGE="http://www.atconsultancy.nl/cowloop/"
-SRC_URI="http://www.atconsultancy.nl/cowloop/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~ppc x86 ~amd64"
-IUSE=""
-DEPEND="virtual/libc
-	virtual/linux-sources"
-
-S=${WORKDIR}/${P}/src
-MODULE_NAMES="cowloop(fs:)"
-BUILD_TARGETS="modules"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} -I."
-	einfo "Linux kernel ${KV_FULL}"
-	if kernel_is lt 2 6
-	then
-		eerror "This version only works with 2.6 kernels"
-		die "No compatible kernel detected!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-config_h.patch
-	epatch "${FILESDIR}"/${P}-vfs_statfs.patch
-}
-
-src_compile() {
-	touch .gpl_license_accepted
-	linux-mod_src_compile
-	CC="$(tc-getCC)" emake utils || die "make failed"
-}
-
-src_install() {
-	linux-mod_src_install
-	emake DESTDIR="${D}" install-utils install-man || die 'make failed'
-	dodoc "${S}"/../RELEASENOTES "${S}"/../HOWTO ../doc/*
-	dodir /etc/udev/rules.d
-	echo 'KERNEL=="cowctl"        NAME="cow/ctl"' > "${D}"/etc/udev/rules.d/70-cow.rules
-	echo 'KERNEL=="cow[0-9]*"  NAME="cow/%n"' >> "${D}"/etc/udev/rules.d/70-cow.rules
-}
diff --git a/sys-fs/cowloop/cowloop-3.0-r3.ebuild b/sys-fs/cowloop/cowloop-3.0-r3.ebuild
index 64d1dd9a249a..e8d47544043d 100644
--- a/sys-fs/cowloop/cowloop-3.0-r3.ebuild
+++ b/sys-fs/cowloop/cowloop-3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r3.ebuild,v 1.1 2008/04/01 14:39:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r3.ebuild,v 1.2 2009/01/30 21:04:05 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.atconsultancy.nl/cowloop/"
 SRC_URI="http://www.atconsultancy.nl/cowloop/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/linux-sources"
@@ -36,6 +36,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-config_h.patch
 	epatch "${FILESDIR}"/${P}-vfs_statfs.patch
 	epatch "${FILESDIR}"/${P}-kern-2.6.23.patch
+	epatch "${FILESDIR}"/${P}-semaphore_h.patch
+	epatch "${FILESDIR}"/${P}-request_queue_t.patch
 }
 
 src_compile() {
diff --git a/sys-fs/cowloop/files/cowloop-3.0-request_queue_t.patch b/sys-fs/cowloop/files/cowloop-3.0-request_queue_t.patch
new file mode 100644
index 000000000000..cf4a42a0ef3f
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-request_queue_t.patch
@@ -0,0 +1,14 @@
+--- ./cowloop-3.0/src/cowloop.c.orig	2009-01-31 07:39:38.000000000 +1100
++++ ./cowloop-3.0/src/cowloop.c	2009-01-31 07:42:10.000000000 +1100
+@@ -923,7 +923,11 @@
+ ** in the queue
+ */
+ static void
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
+ cowlo_request(request_queue_t *q)
++#else
++cowlo_request(struct request_queue *q)
++#endif
+ {
+ 	struct request		*req;
+ 	struct cowloop_device	*cowdev;
diff --git a/sys-fs/cowloop/files/cowloop-3.0-semaphore_h.patch b/sys-fs/cowloop/files/cowloop-3.0-semaphore_h.patch
new file mode 100644
index 000000000000..cad4e1f832db
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-semaphore_h.patch
@@ -0,0 +1,14 @@
+--- cowloop-3.0/src/cowloop.c.orig	2009-01-31 07:31:18.000000000 +1100
++++ cowloop-3.0/src/cowloop.c	2009-01-31 07:32:46.000000000 +1100
+@@ -250,7 +250,11 @@
+ #include <linux/stat.h>
+ #include <linux/vmalloc.h>
+ #include <linux/slab.h>
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ #include <asm/semaphore.h>
++#else
++#include <linux/semaphore.h>
++#endif
+ #include <asm/uaccess.h>
+ #include <linux/proc_fs.h>
+ #include <linux/blkdev.h>