Add one more patch to fix building with kernel 2.6.29, and update the 2.6.28 patch to stay inline with my local repository.

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

5 files changed, 73 insertions, 21 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index caf87122e795..ec199a136c70 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2009/01/15 01:28:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.22 2009/03/25 15:19:03 flameeyes Exp $
+
+  25 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/iscsitarget-0.4.17+linux-2.6.28.patch,
+  +files/iscsitarget-0.4.17+linux-2.6.29.patch, iscsitarget-0.4.17.ebuild:
+  Add one more patch to fix building with kernel 2.6.29, and update the
+  2.6.28 patch to stay inline with my local repository.
 
   15 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   files/iscsitarget-0.4.17+linux-2.6.28.patch:
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index 5a54c320abd9..3a7aa414c564 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX ietd-conf.d 1073 RMD160 ade5301c8e2eb8cbc16dfae4bfa80e22393e2953 SHA1 1bb990e26b847169d4937e5d2fc28a5f86d55003 SHA256 28c4a6ddfe555d9f400513de04e2e44473263c4505434fc6e926d2b2fe89c414
 AUX ietd-init.d-2 2492 RMD160 5ab62e5b1f0edd17bb296d4f61c8c7ff562b3d02 SHA1 d91acd801928673e7d03639f8c9e4bf7008ebe43 SHA256 403884a4a90c475689d0fd6deb3bffa402cf4b7a0b215cc0cad219ebf9c00ee2
 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 2316 RMD160 e2b1ca2e4f5cab54b027f1cf1bffdcdd648db7fd SHA1 a262a08478a00c1f0457807431c06a969d4498c8 SHA256 0031bb57ae38208d5b97f0fe6c3630293ea71f369d6c744585f69897229a11f0
+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-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 1825 RMD160 ec43614157a659422528c2004ff28dc8519d689a SHA1 33a2a50c37b7a451aaecc61cf9489ee79c88c0de SHA256 3ab35eb071f882678b7cdb27c8a86f34eec754866bbc678cebb65ab84f629625
-MISC ChangeLog 4368 RMD160 4de3c72af6cd9036c1ad891e3f2cdac17748ac0e SHA1 abf2eab3d9ab482c37017784ca1c1e68a90c1fb2 SHA256 c14c5b71d04b3042aac1f9d64df1726738b166402c237f70b2eba2474938b0a3
+EBUILD iscsitarget-0.4.17.ebuild 1879 RMD160 9936869b69784e954552fe322f9a6e9f437af8b1 SHA1 366ddbff457a12d157ecf0405163d2892f7c1716 SHA256 37b468fbc56644fc8b9134547eacc311d972b3482d58a7a3b1791042b96aa1c8
+MISC ChangeLog 4675 RMD160 5930dd950779c97fd4bf0b423b03c94ffc3f07d6 SHA1 a9916c8f7c3e1f4478c2206e0abcaef9038401e3 SHA256 e0d320f58cfcc7221929a3a028d5e5ee64cb735e1884ff29311aae2c3d3c92e0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAklukUcACgkQAiZjviIA2XispwCdFNncF8JWKv1bkOE1wXMxfCO2
-vAEAoKU5zVacGUaAF+V7uplNY5pCash9
-=WMwk
+iEYEARECAAYFAknKS20ACgkQAiZjviIA2XiRUgCgyIZm8ZVu7nDy51S5jr5FiXnO
+WykAoKgu6J/M1518akyN+ig26kxx35Yb
+=T3B+
 -----END PGP SIGNATURE-----
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
index ec35cd526f4c..1f57afdba42c 100644
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
+++ b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
@@ -1,7 +1,7 @@
-From c5e70fc826aad5efb786c47d294e3c0c76246d63 Mon Sep 17 00:00:00 2001
+From 57551cb0529b48411f8f63a002882b7e1cf792f8 Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Diego=20E.=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sat, 3 Jan 2009 00:09:43 +0100
-Subject: [PATCH] Fix building with Linux kernel 2.6.28 and later.
+Date: Wed, 25 Mar 2009 16:14:26 +0100
+Subject: [PATCH 1/2] Fix building with Linux kernel 2.6.28 and later.
 
 With changeset 30c40d2c01f68c7eb1a41ab3552bdaf5dbf300d4 of the Linux
 kernel, the functions open_bdev_excl and close_bdev_excl were replaced with
@@ -11,19 +11,23 @@ The new interface uses fmode_t instead of integer flags to carry on the
 opening mode for a block device, thus require some minor changes in the
 calls.
 ---
- kernel/block-io.c |   21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
+ kernel/block-io.c |   22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
 
 diff --git a/kernel/block-io.c b/kernel/block-io.c
-index e4a25f7..2c5f6f6 100644
+index e4a25f7..af10c7e 100644
 --- a/kernel/block-io.c
 +++ b/kernel/block-io.c
-@@ -18,6 +18,14 @@
+@@ -13,11 +13,18 @@
+ #include <linux/blkdev.h>
+ #include <linux/parser.h>
+ #include <linux/buffer_head.h>
++#include <linux/version.h>
+ 
+ #include "iscsi.h"
  #include "iscsi_dbg.h"
  #include "iotype.h"
  
-+#include <linux/version.h>
-+
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
 +# define HAVE_OPEN_BDEV_EXCLUSIVE 1
 +#else
@@ -33,7 +37,7 @@ index e4a25f7..2c5f6f6 100644
  struct blockio_data {
  	char *path;
  	struct block_device *bdev;
-@@ -154,14 +160,22 @@ blockio_open_path(struct iet_volume *volume, const char *path)
+@@ -154,14 +161,22 @@ blockio_open_path(struct iet_volume *volume, const char *path)
  {
  	struct blockio_data *bio_data = volume->private;
  	struct block_device *bdev;
@@ -56,7 +60,7 @@ index e4a25f7..2c5f6f6 100644
  	if (IS_ERR(bdev)) {
  		err = PTR_ERR(bdev);
  		eprintk("Can't open device %s, error %d\n", path, err);
-@@ -323,9 +337,16 @@ static void
+@@ -323,9 +338,16 @@ static void
  blockio_detach(struct iet_volume *volume)
  {
  	struct blockio_data *bio_data = volume->private;
@@ -74,5 +78,5 @@ index e4a25f7..2c5f6f6 100644
  
  	kfree(volume->private);
 -- 
-1.6.0.6
+1.6.2
 
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.29.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.29.patch
new file mode 100644
index 000000000000..092fdc3fd9c4
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.29.patch
@@ -0,0 +1,40 @@
+From 81373580a641732a7e4610c3d39af0c68007b892 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Wed, 25 Mar 2009 16:14:46 +0100
+Subject: [PATCH 2/2] Fix building with Linux kernel 2.6.29 and later.
+
+When building for Linux 2.6.29 or later, instead of using the NIP6
+macro (that has been removed) use the new %p6 format specifier.
+---
+ kernel/conn.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/conn.c b/kernel/conn.c
+index f96e2b6..ab561f9 100644
+--- a/kernel/conn.c
++++ b/kernel/conn.c
+@@ -6,6 +6,7 @@
+ 
+ #include <linux/file.h>
+ #include <linux/ip.h>
++#include <linux/version.h>
+ #include <net/tcp.h>
+ 
+ #include "iscsi.h"
+@@ -47,8 +48,13 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
+ 			break;
+ 		case AF_INET6:
+ 			snprintf(buf, sizeof(buf),
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++				 "[%p6]",
++				 &(inet6_sk(sk)->daddr));
++#else
+ 				 "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
+ 				 NIP6(inet6_sk(sk)->daddr));
++#endif
+ 			break;
+ 		default:
+ 			break;
+-- 
+1.6.2
+
diff --git a/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild b/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
index 4ed87931a7f3..26cde275571f 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.2 2009/01/02 23:21:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild,v 1.3 2009/03/25 15:19:03 flameeyes Exp $
 
 inherit linux-mod eutils flag-o-matic
 
@@ -25,6 +25,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.4.15-isns-set-scn-flag.patch #180619
 	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
 	convert_to_m "${S}"/Makefile
 }