Add patch to fix bug #252608 (failure to build on kernel 2.6.28 and later).

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 92 insertions, 9 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index c4e29d0a7eb7..98f81a1d7b26 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/iscsitarget
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.18 2008/12/20 00:21:36 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.19 2009/01/02 23:21:17 flameeyes Exp $
+
+  02 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/iscsitarget-0.4.17+linux-2.6.28.patch, iscsitarget-0.4.17.ebuild:
+  Add patch to fix bug #252608 (failure to build on kernel 2.6.28 and
+  later).
 
 *iscsitarget-0.4.17 (20 Dec 2008)
 
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index 2278abeb30e5..4903b6533f95 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -9,6 +9,7 @@ AUX iscsitarget-0.4.15-isns-set-scn-flag.patch 507 RMD160 9a3b091eafb3d213a0c830
 AUX iscsitarget-0.4.15-kmem.patch 1459 RMD160 9bff8127a865fe6ca86616966f092344de24c240 SHA1 8af2830595558373c0e9e5be0e673ea840fed0ee SHA256 f65e20f1bf5c7823056d0760b43841c4e2a4b1280c923bc91fbda951cf72dd91
 AUX iscsitarget-0.4.15-scatter.patch 4388 RMD160 f41ad197a2b27e34595a4bf1be743eaed2e7cd12 SHA1 b0bbfb2b088d8f18792c4ce44b65557dccabaa0a SHA256 277607b25d32e73846e2dde0bfdd0393b5c804e93c3a1eb93d9daae0e4101b20
 AUX iscsitarget-0.4.16+glibc-2.8-lists.patch 12736 RMD160 e6b4d39d4e2ae88db8f9fd8661759181200de219 SHA1 921d48ce83031610223b88ed3f0aa944bd1499a3 SHA256 8476001e2ea14e92f3c46467dc17284b38b9a73d4cd54400c6a92869793e0175
+AUX iscsitarget-0.4.17+linux-2.6.28.patch 2286 RMD160 f8fabf25a73a838d709bdf1ae836680a7fbb0606 SHA1 8bf1d12312a7fdfef274330a7b1bb5847d94795b SHA256 8080c3a5c5892d640ad1caa0a6cefe6e5b755ed291050a0b8dc604188cf53910
 AUX iscsitarget-0.4.17-build.patch 580 RMD160 a770b10dfc4f7c16daefa3e5e0827d1a2164e470 SHA1 81d46f22fd9ff73dbe7baa1792706c79c5ed7a2a SHA256 f1a29431674e4e185d3565df045ad575800c48f49de3a2a53d5723c7b2b7383d
 DIST iscsitarget-0.4.15.tar.gz 102922 RMD160 d7d787f1fcbdb124d17eaaa62eaa47c21b6e5dd2 SHA1 c4802e208077bc0249518555c7eace6808de1878 SHA256 da8eb570f9abb6e50c515321747407e9945f5a83bab774c42ed41809234505cb
 DIST iscsitarget-0.4.16.tar.gz 103196 RMD160 e0a68f04523191d6116646566fa9132e5aebdb58 SHA1 a7ddbd15767764bad221f59cff4b5e9f0bf57d7b SHA256 e6605ae5f9ed2e2fdbe84df967236678579a4fbe536b75a93277cbb607bead7d
@@ -17,13 +18,13 @@ DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd
 EBUILD iscsitarget-0.4.15-r1.ebuild 1848 RMD160 7294286c00a5f59b13a01fd7da2e8aca3a694585 SHA1 949d43f991de676b676714213dfea02626d31217 SHA256 fcd6fd854e27a10e93442956fab35833ac94b3b831a39b36b2257c3e881bd1f7
 EBUILD iscsitarget-0.4.16.ebuild 1902 RMD160 69b66c9c8fb1a49a4fab49c02630444c64024f56 SHA1 02ec71d4172269e14ea680339f52f6bf43290228 SHA256 f1309cda1d1eedf776032010300142b35bbfbca94c5eedb62ea6cb82fd50d1e0
 EBUILD iscsitarget-0.4.16_p162.ebuild 1752 RMD160 a4d2ffbfebb7f63199d845bc0d2ce6147e3b8e7b SHA1 c885ebb14c17e0f9e38aaeb864cbfb1d24cc77eb SHA256 44694ee74025415c16c30f8914e6fe0863dcdcafe2e9932aafbdf12e9212c961
-EBUILD iscsitarget-0.4.17.ebuild 1763 RMD160 47b863af17c4a5583785f74637d46b0e11bd9e8b SHA1 d02c7efd337b180ca6d1ad9a130df9ff92699a3b SHA256 6095b325130a41eec05d23e8d575b40e999be1e7b9d065d7ff540ccceb67d4fa
-MISC ChangeLog 3673 RMD160 9ec7f988e42b1ea5006e39e7f53f8c87faf8a8ac SHA1 b1265698cc4a9441a6c509a054ebd6d6f1fa24dc SHA256 0b3e26c6ca5a3991ee77e241276f759bb68ccfc09a72eb28a6d678d4f5b439ff
+EBUILD iscsitarget-0.4.17.ebuild 1825 RMD160 ec43614157a659422528c2004ff28dc8519d689a SHA1 33a2a50c37b7a451aaecc61cf9489ee79c88c0de SHA256 3ab35eb071f882678b7cdb27c8a86f34eec754866bbc678cebb65ab84f629625
+MISC ChangeLog 3885 RMD160 c91713d446a588e3eadc47b4ef4fa0ca1db5ae6d SHA1 686babac34ca68f69374566372a4a29c403f72b8 SHA256 996112eeef6e3df831b506d1e6dbb36d6049ef3dfe23cb58ddd4025db61c04c5
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklMOpcACgkQAiZjviIA2Xg9QwCfT0eQDXUNXywDA9LLw6WuGKXu
-C5YAoPQ/n3H0XT2NI8LRErryyrGAEJy1
-=7TGy
+iEYEARECAAYFAkleoXkACgkQAiZjviIA2XipKACePW+tZQkbTv134UE5sB7SI5Ps
+HPwAoJrsypwssiFzuyV2GU6zihkUAh3Z
+=DjUy
 -----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
new file mode 100644
index 000000000000..0c11074f0b44
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
@@ -0,0 +1,76 @@
+From c5e70fc826aad5efb786c47d294e3c0c76246d63 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.
+
+With changeset 30c40d2c01f68c7eb1a41ab3552bdaf5dbf300d4 of the Linux
+kernel, the functions open_bdev_excl and close_bdev_excl were replaced with
+functionally-equivalent open_bdev_exclusive and close_bdev_exclusive.
+
+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(-)
+
+diff --git a/kernel/block-io.c b/kernel/block-io.c
+index e4a25f7..2c5f6f6 100644
+--- a/kernel/block-io.c
++++ b/kernel/block-io.c
+@@ -18,6 +18,12 @@
+ #include "iscsi_dbg.h"
+ #include "iotype.h"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++# define HAVE_OPEN_BDEV_EXCLUSIVE 1
++#else
++# define HAVE_OPEN_BDEV_EXCLUSIVE 0
++#endif
++
+ struct blockio_data {
+ 	char *path;
+ 	struct block_device *bdev;
+@@ -154,14 +160,22 @@ blockio_open_path(struct iet_volume *volume, const char *path)
+ {
+ 	struct blockio_data *bio_data = volume->private;
+ 	struct block_device *bdev;
++#if HAVE_OPEN_BDEV_EXCLUSIVE
++	fmode_t mode = FMODE_READ | ( LUReadonly(volume) ? 0 : FMODE_WRITE );
++#else
+ 	int flags = LUReadonly(volume) ? MS_RDONLY : 0;
++#endif
+ 	int err = 0;
+ 
+ 	bio_data->path = kstrdup(path, GFP_KERNEL);
+ 	if (!bio_data->path)
+ 		return -ENOMEM;
+ 
++#if HAVE_OPEN_BDEV_EXCLUSIVE
++	bdev = open_bdev_exclusive(path, mode, THIS_MODULE);
++#else
+ 	bdev = open_bdev_excl(path, flags, THIS_MODULE);
++#endif
+ 	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
+ blockio_detach(struct iet_volume *volume)
+ {
+ 	struct blockio_data *bio_data = volume->private;
++#if HAVE_OPEN_BDEV_EXCLUSIVE
++	fmode_t mode = FMODE_READ | ( LUReadonly(volume) ? 0 : FMODE_WRITE );
++#endif
+ 
+ 	if (bio_data->bdev)
++#if HAVE_OPEN_BDEV_EXCLUSIVE
++		close_bdev_exclusive(bio_data->bdev, mode);
++#else
+ 		close_bdev_excl(bio_data->bdev);
++#endif
+ 	kfree(bio_data->path);
+ 
+ 	kfree(volume->private);
+-- 
+1.6.0.6
+
diff --git a/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild b/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
index b9dea5ce8655..4ed87931a7f3 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-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-block/iscsitarget/iscsitarget-0.4.17.ebuild,v 1.1 2008/12/20 00:21:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild,v 1.2 2009/01/02 23:21:17 flameeyes Exp $
 
 inherit linux-mod eutils flag-o-matic
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	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
 	convert_to_m "${S}"/Makefile
 }