add 2.6.33 kernel support to 1.4.19

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

4 files changed, 24 insertions, 4 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index ecb6c7180d50..e6c25518e47e 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/iscsitarget
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.32 2010/02/28 17:14:02 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.33 2010/02/28 17:28:09 lxnay Exp $
+
+  28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> iscsitarget-1.4.19.ebuild,
+  +files/iscsitarget-1.4.19+linux-2.6.33.patch:
+  add 2.6.33 kernel support to 1.4.19
 
   28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> iscsitarget-1.4.19.ebuild:
   KSRC= also required for 'emake usr'
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index 92a30bbdbb75..e3acb3f793ac 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -6,9 +6,10 @@ AUX iscsitarget-0.4.17+linux-2.6.29.patch 1123 RMD160 c4fc845ab893125469e67c839b
 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
 AUX iscsitarget-1.4.18+linux-2.6.32.patch 1342 RMD160 f03339491c509b2c831012d32b2beed8b0c2d593 SHA1 8e25df9b2778f40eca624142df5db4b7d968a90d SHA256 7ad2db023826e4861d644646d855406c0bbffe007b7a81d1f209948d0d58d336
+AUX iscsitarget-1.4.19+linux-2.6.33.patch 594 RMD160 f28c6741807f9f52558e273d922c9d66e33a8d72 SHA1 fefddb9e4138a1b864e15b9f25076e49f6fd3ac9 SHA256 2e50daac88dff35a268a56950491fc9b7b9533eebd2a690f3c4eb448990f8352
 DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd2934c SHA1 9c287b76a5bc50995d86d351968368302e70b224 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778
 DIST iscsitarget-1.4.19.tar.gz 124288 RMD160 60189a94a70eb35c3d9bd995a09ffa6983a1a036 SHA1 96af4ad9343960c700dc46f98a3b9ce2ffbe2231 SHA256 a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a
 EBUILD iscsitarget-0.4.17.ebuild 1947 RMD160 876c1b3f1216e78b9f46390ba9a18310a18a5743 SHA1 fd29c29f8a31ada3b3afcf5093745f3c70ad2d4f SHA256 b71ae15ee537c66b74becab9d81d5693a28a130fcd66df3a3fb306e05625c5d3
-EBUILD iscsitarget-1.4.19.ebuild 2054 RMD160 f4cb22836fee7116b39a5184a1669a5dcd279858 SHA1 ab6d03e3aad7859a9cd1896e4ee702f953503cf5 SHA256 5cda5d507dff4b6f0de9a0148ec61a7092d800d97672cd75fa4e84d9d6ff027c
-MISC ChangeLog 6162 RMD160 d3e6e6db8844bbc0752fc6dbf1a9e7b99e9fe2b0 SHA1 766bb66df4d6dec43d88cfb89966ed6f58f311d9 SHA256 385ca4b9e4520e44a4b0cba51b8bcc880dfdccbe166b8dbc5137a56b18da6bdf
+EBUILD iscsitarget-1.4.19.ebuild 2143 RMD160 af25a95c85c20bbfe9a663482855937bc7141e1e SHA1 0f155e6126b73eef4ff2483e465d869ba97e087b SHA256 63bfcd7fa252a5c96edbfef12dc46882ffaa51736d466daeb9ca3f478ad99131
+MISC ChangeLog 6326 RMD160 4455a45fddc0be3472a6b679d1f13b78e4c8604f SHA1 0bdb20b979f5ba4abe4a1aec2a72dd57ca64ee86 SHA256 c6e0cc3e397c418954977f87e01cd9cc1b2c38cff029ec5ac650fd670ecbec59
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch
new file mode 100644
index 000000000000..3c2e4e426282
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch
@@ -0,0 +1,12 @@
+diff -p -up iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c.2.6.33 iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c
+--- iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c.2.6.33	2010-02-21 13:07:29.000000000 +0100
++++ iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c	2010-02-21 13:41:38.641365087 +0100
+@@ -43,7 +43,7 @@ void conn_info_show(struct seq_file *seq
+ 		switch (sk->sk_family) {
+ 		case AF_INET:
+ 			snprintf(buf, sizeof(buf),
+-				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
++				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
+ 			break;
+ 		case AF_INET6:
+ 			snprintf(buf, sizeof(buf), "[%pI6]",
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
index 8ed193d8cefe..f233aaaddacc 100644
--- a/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
+++ b/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild,v 1.2 2010/02/28 17:14:02 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild,v 1.3 2010/02/28 17:28:09 lxnay Exp $
 
 inherit linux-mod eutils flag-o-matic
 
@@ -26,6 +26,9 @@ 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}-1.4.18+linux-2.6.32.patch
+	if kernel_is ge 2 6 33; then
+		epatch "${FILESDIR}"/${PN}-1.4.19+linux-2.6.33.patch
+	fi
 	convert_to_m "${S}"/Makefile
 }