Add patch to build with kernel 2.6.30 released today.

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

4 files changed, 50 insertions, 7 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index 223daefc7d3d..961cec704fbd 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/iscsitarget
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.23 2009/03/25 15:20:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.24 2009/06/10 15:30:44 flameeyes Exp $
+
+  10 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  iscsitarget-0.4.17.ebuild, +files/iscsitarget-0.4.17+linux-2.6.30.patch:
+  Add patch to build with kernel 2.6.30 released today.
 
   25 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   iscsitarget-0.4.17.ebuild:
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index d5aaed646a3a..32554a6d6259 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -6,17 +6,18 @@ AUX ietd-init.d-2 2492 RMD160 5ab62e5b1f0edd17bb296d4f61c8c7ff562b3d02 SHA1 d91a
 AUX iscsitarget-0.4.15-isns-set-scn-flag.patch 507 RMD160 9a3b091eafb3d213a0c830a691684e0dc1f04b9c SHA1 9d80a8d1b5069e6ec5252ed8b1636023288bada2 SHA256 dc99ad8fa1cc10f6c6af4c99374dd0da14d3a56aebee2c48dd02cd8e156f9996
 AUX iscsitarget-0.4.17+linux-2.6.28.patch 2427 RMD160 08b735d3308085895de7134fb1bba16e20b6185f SHA1 672bfccc595d9aa9ffe8fe1601263ea965696bc9 SHA256 277bab00bd30b40ccdc5375bf5c3f0ed949fa756b6300828b052ec269c90ca8e
 AUX iscsitarget-0.4.17+linux-2.6.29.patch 1123 RMD160 c4fc845ab893125469e67c839ba17165188a57d3 SHA1 71d410350a57102f42ce37dff0abb07c780f196d SHA256 aa8d8c39d6375b5f5a05e4b5f98c839a2b841fa43d79447055edd57d05f53b37
+AUX iscsitarget-0.4.17+linux-2.6.30.patch 1145 RMD160 12b2488ecbc10c71b3cbd21509758e98814a5f8b SHA1 b274917a11eaf87f3af53c37977e998e03cedde7 SHA256 86699f7bcf7bb6f9bf903f255724d08e1f3020b7854477b46329a3d202f15855
 AUX iscsitarget-0.4.17-build.patch 580 RMD160 a770b10dfc4f7c16daefa3e5e0827d1a2164e470 SHA1 81d46f22fd9ff73dbe7baa1792706c79c5ed7a2a SHA256 f1a29431674e4e185d3565df045ad575800c48f49de3a2a53d5723c7b2b7383d
 DIST iscsitarget-0.4.16_p162.tar.bz2 84559 RMD160 df48d9f8b0416cd47f926257801c8357ea1ea7b6 SHA1 163d3272f859b7f04900d5a56856140c083b90c1 SHA256 306f98bd2d1847f97cd079f31239cfb72640606e560b8e1d6e01b263fda501b7
 DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd2934c SHA1 9c287b76a5bc50995d86d351968368302e70b224 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778
 EBUILD iscsitarget-0.4.16_p162.ebuild 1752 RMD160 a4d2ffbfebb7f63199d845bc0d2ce6147e3b8e7b SHA1 c885ebb14c17e0f9e38aaeb864cbfb1d24cc77eb SHA256 44694ee74025415c16c30f8914e6fe0863dcdcafe2e9932aafbdf12e9212c961
-EBUILD iscsitarget-0.4.17.ebuild 1899 RMD160 24addc304dd3213de2db1e02bc6d555666c73951 SHA1 05c8d05fd77259452b1c80bfefc1991220db80d7 SHA256 c8ce9098e0d2323825a9c5755b2fdeeb13ca5ae63806afd4742b65d3f3572d09
-MISC ChangeLog 4787 RMD160 7a43065616146c34347c9f2f9f77837d40f54f06 SHA1 5a2b47b999e971d5463e5f639b4db91188501cf3 SHA256 fa12d97a664fd900abad2ac609c86152d391e7f8c78a4d3d1d9731b398367c78
+EBUILD iscsitarget-0.4.17.ebuild 1953 RMD160 1dd6ef1c8381784e33e4013f50ff6204c064ed4f SHA1 13afc1fd85639d418d0f95b7cf9c13fe52432ab6 SHA256 57dd52c9fac98d858616323bda15775d1a72d37ffc3bbb7c42fa6b9ea6b728d1
+MISC ChangeLog 4975 RMD160 abf09835cd18475548993bef52daaa5ee9b82676 SHA1 cb18dd99e82dff639b3dcadfdeaff241acbb6efe SHA256 bea7eaa9e524646d5a5d464bf5cbef1b6ae7418c2eb079e88c5d4969351a82a2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknKS8sACgkQAiZjviIA2Xg9lQCePYs36IpHJVT9F6xoBXO+jdxU
-DYAAoKeJZl42jC/rPOrGuhaAZrNp+Hhs
-=GQp5
+iEYEARECAAYFAkov0aoACgkQAiZjviIA2XidtQCeOgKYMN/btREYmHroLFwReM4Z
+1xsAoOkpBPGVn/muKt89cbc2NMT079IB
+=H5yw
 -----END PGP SIGNATURE-----
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.30.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.30.patch
new file mode 100644
index 000000000000..fa420e97b375
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.30.patch
@@ -0,0 +1,37 @@
+From cb1b94ffa91d71aba8e07ed018e9f43064e05a49 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Wed, 10 Jun 2009 17:24:02 +0200
+Subject: [PATCH 3/3] Fix building with Linux kernel 2.6.30 and later.
+
+With commit 99b76233803beab302123d243eea9e41149804f3 the proc_dir_entry
+structure does not have an owner any longer, this just removes the
+assignment to make the code build with the newer kernel.
+---
+ kernel/config.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/config.c b/kernel/config.c
+index d6c4b5e..34681f5 100644
+--- a/kernel/config.c
++++ b/kernel/config.c
+@@ -5,6 +5,7 @@
+  */
+ 
+ #include <linux/proc_fs.h>
++#include <linux/version.h>
+ 
+ #include "iscsi.h"
+ #include "iscsi_dbg.h"
+@@ -43,7 +44,9 @@ int iet_procfs_init(void)
+ 	if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
+ 		goto err;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+ 	proc_iet_dir->owner = THIS_MODULE;
++#endif
+ 
+ 	for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
+ 		ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);
+-- 
+1.6.3.1
+
diff --git a/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild b/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
index 35956d71aa81..75a2758314b9 100644
--- a/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
+++ b/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild,v 1.4 2009/03/25 15:20:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild,v 1.5 2009/06/10 15:30:44 flameeyes Exp $
 
 inherit linux-mod eutils flag-o-matic
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.4.17-build.patch
 	epatch "${FILESDIR}"/${PN}-0.4.17+linux-2.6.28.patch #252608
 	epatch "${FILESDIR}"/${PN}-0.4.17+linux-2.6.29.patch
+	epatch "${FILESDIR}"/${PN}-0.4.17+linux-2.6.30.patch
 	convert_to_m "${S}"/Makefile
 }