Add patch for kernel 2.6.22

Thanks to dsd and Marek Rychly wrt bug #184816

Package-Manager: portage-2.1.3_rc6

4 files changed, 55 insertions, 15 deletions

diff --git a/sys-fs/cdfs/ChangeLog b/sys-fs/cdfs/ChangeLog
index 8a9800dabed6..5c1f9fb6dd9e 100644
--- a/sys-fs/cdfs/ChangeLog
+++ b/sys-fs/cdfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cdfs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.6 2007/01/30 22:45:18 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.7 2007/07/10 22:29:26 drizzt Exp $
+
+  10 Jul 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/cdfs-2.6.19-kernel-2.6.22.patch, cdfs-2.6.19.ebuild:
+  Add patch for kernel 2.6.22
+  Thanks to dsd and Marek Rychly wrt bug #184816
 
   30 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
   -files/cdfs-2.6.18-kernel-2.6.19.patch, -cdfs-2.6.18.ebuild:
diff --git a/sys-fs/cdfs/Manifest b/sys-fs/cdfs/Manifest
index 9a3b87f4bca2..3989fe5d509e 100644
--- a/sys-fs/cdfs/Manifest
+++ b/sys-fs/cdfs/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cdfs-2.6.19-kernel-2.6.22.patch 669 RMD160 678e4ddd1af3201afd76e641b989d07bd68dd365 SHA1 204704add7ca868a8e1f43e4b13793ac70573c1c SHA256 517dd2271dde6620caacb43a97a6ab02807b428eba581959b1663946fd511731
+MD5 c3ace48337b4c78e7b0edba5c896ed2f files/cdfs-2.6.19-kernel-2.6.22.patch 669
+RMD160 678e4ddd1af3201afd76e641b989d07bd68dd365 files/cdfs-2.6.19-kernel-2.6.22.patch 669
+SHA256 517dd2271dde6620caacb43a97a6ab02807b428eba581959b1663946fd511731 files/cdfs-2.6.19-kernel-2.6.22.patch 669
 DIST cdfs-2.6.19.tar.bz2 30321 RMD160 000aa4ff63a759d164a659bc1261cb698d71fffe SHA1 f4135ae8081cbd15b38d6e1a18e5ea805c411fa5 SHA256 f6114ba2cde7ce0ca24c31b6237b327216b5b2a8aa0fb07366ebf827a5d9ffe3
-EBUILD cdfs-2.6.19.ebuild 659 RMD160 52b61f2be47c4344bbabd7d37b8be912d552476c SHA1 fc48b3c23572da71011d34fb9d00ba15a234a6ac SHA256 e66497976502a5176317921af9382da9c6ab6bd5f8c23f4b95fa6240ca660a13
-MD5 fddefeca82370875e3b4e25a13ec3887 cdfs-2.6.19.ebuild 659
-RMD160 52b61f2be47c4344bbabd7d37b8be912d552476c cdfs-2.6.19.ebuild 659
-SHA256 e66497976502a5176317921af9382da9c6ab6bd5f8c23f4b95fa6240ca660a13 cdfs-2.6.19.ebuild 659
-MISC ChangeLog 1122 RMD160 0c440b9b8bcc9e30722b32ba65def7e867f51646 SHA1 87fa0691c496de4ee9dc8524b12432fb257ce239 SHA256 fe1e63be45b4c2e17a47232a69ec1483fbbeac8efe6a6147f7829ba84e6430d5
-MD5 bb727d0f4d095b5eac7164bf7d717ce3 ChangeLog 1122
-RMD160 0c440b9b8bcc9e30722b32ba65def7e867f51646 ChangeLog 1122
-SHA256 fe1e63be45b4c2e17a47232a69ec1483fbbeac8efe6a6147f7829ba84e6430d5 ChangeLog 1122
+EBUILD cdfs-2.6.19.ebuild 755 RMD160 f52f7fb08bc3384b41ea6ff8ffd62b9f462bfa0b SHA1 ff2fcc31c6c9151b0cb09ac1c33e5adad998d1a0 SHA256 ef16011421efbcb6e97441e86887b576c1fa3be1ab94f36f6cfa88694532de27
+MD5 db0ac2cc95f3784a1d3c9d5c569680a0 cdfs-2.6.19.ebuild 755
+RMD160 f52f7fb08bc3384b41ea6ff8ffd62b9f462bfa0b cdfs-2.6.19.ebuild 755
+SHA256 ef16011421efbcb6e97441e86887b576c1fa3be1ab94f36f6cfa88694532de27 cdfs-2.6.19.ebuild 755
+MISC ChangeLog 1316 RMD160 330e88cdda9e5cc4275bde90d94b623f03db6eb7 SHA1 3595328e23b684d5d30366fdee5cc1aa26c193bc SHA256 0123ade2da936263a607aae6136bb273d70bf11ced7ebb370efc9faf945c8f65
+MD5 04c96920366b4c5d3fdf26b7b67847e8 ChangeLog 1316
+RMD160 330e88cdda9e5cc4275bde90d94b623f03db6eb7 ChangeLog 1316
+SHA256 0123ade2da936263a607aae6136bb273d70bf11ced7ebb370efc9faf945c8f65 ChangeLog 1316
 MISC metadata.xml 221 RMD160 49dc39cdb4ca59a8231a693fe4cc5a2d1c08dc72 SHA1 7638914ee9ee4af3fe13be447f1d53179deefccf SHA256 f92875fd5f370ee3b1f5827194d588b77ed8456a10137011c4618b70c7ea3df9
 MD5 f6448d858d8db15277bec783d3107045 metadata.xml 221
 RMD160 49dc39cdb4ca59a8231a693fe4cc5a2d1c08dc72 metadata.xml 221
@@ -18,9 +22,9 @@ MD5 c3e8366046697800e7841200621eba3f files/digest-cdfs-2.6.19 235
 RMD160 b896113e3b22d7cf2dc216fc5d4e7acbdf1b6ac1 files/digest-cdfs-2.6.19 235
 SHA256 6fd18e81f5c4751f1d7717fd448cff294fe25bc22fc3f184516c1b1fc2373a2c files/digest-cdfs-2.6.19 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFv8qEGDyatLGpTbYRAk62AKCK/Ju2hYlo6WE8reKc87IojoL/cQCfXgPi
-PtFFj/vhrCkxmQ7lINKiBWA=
-=NEui
+iD8DBQFGlAhMjJyKLBkBVroRAmgkAJ44McsC9dHsCv/jw7UkrDGho6yaEwCgzRHI
+CK1pRoyz4MeszIPmV5lQPEw=
+=+gtL
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cdfs/cdfs-2.6.19.ebuild b/sys-fs/cdfs/cdfs-2.6.19.ebuild
index 6c6e30c669fd..3cd729b9b0f3 100644
--- a/sys-fs/cdfs/cdfs-2.6.19.ebuild
+++ b/sys-fs/cdfs/cdfs-2.6.19.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.19.ebuild,v 1.2 2007/01/23 11:07:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.19.ebuild,v 1.3 2007/07/10 22:29:26 drizzt Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 DESCRIPTION="A file system for Linux systems that 'exports' all tracks and boot images on a CD as normal files."
 HOMEPAGE="http://www.elis.rug.ac.be/~ronsse/cdfs/"
@@ -19,3 +19,10 @@ MODULE_NAMES="cdfs(fs)"
 CONFIG_CHECK="BLK_DEV_LOOP"
 BUILD_TARGETS="all"
 BUILD_PARAMS="KDIR=\"${KERNEL_DIR}\""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-kernel-2.6.22.patch
+}
diff --git a/sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch b/sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch
new file mode 100644
index 000000000000..804dd44ba8db
--- /dev/null
+++ b/sys-fs/cdfs/files/cdfs-2.6.19-kernel-2.6.22.patch
@@ -0,0 +1,24 @@
+diff -urN root.c.old root.c
+--- root.c.old	2007-07-10 17:06:55.000000000 +0200
++++ root.c	2007-07-10 17:15:27.000000000 +0200
+@@ -26,6 +26,8 @@
+ 
+ #include <linux/module.h>
+ 
++#include <linux/sched.h>
++
+ 
+ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
+  * Robert W. Boone (November, 2002)                                           *
+diff -urN daemon.c.old daemon.c
+--- daemon.c.old	2007-07-10 17:07:58.000000000 +0200
++++ daemon.c	2007-07-10 17:15:03.000000000 +0200
+@@ -29,6 +29,8 @@
+ 
+ #include "cdfs.h"
+ 
++#include <linux/sched.h>
++
+ int kcdfsd_pid = 0;
+ static int kcdfsd_running = 0;
+ static DECLARE_WAIT_QUEUE_HEAD(kcdfsd_wait);