Version bump and add patch to build with 2.6.32. Move the ietd binary to /usr/libexec since it should never be executed directly.

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

4 files changed, 120 insertions, 12 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index 8a7d539a48fa..4bdc36a90f3c 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2009/07/15 18:52:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.29 2009/10/18 11:36:47 flameeyes Exp $
+
+*iscsitarget-1.4.18 (18 Oct 2009)
+
+  18 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +iscsitarget-1.4.18.ebuild, +files/iscsitarget-1.4.18+linux-2.6.32.patch:
+  Version bump and add patch to build with 2.6.32. Move the ietd binary to
+  /usr/libexec since it should never be executed directly.
 
   15 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   -iscsitarget-0.4.16_p162.ebuild:
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index 472a1671665b..b706f54f31ae 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
@@ -8,14 +5,10 @@ AUX iscsitarget-0.4.17+linux-2.6.28.patch 2427 RMD160 08b735d3308085895de7134fb1
 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
+AUX iscsitarget-1.4.18+linux-2.6.32.patch 1342 RMD160 f03339491c509b2c831012d32b2beed8b0c2d593 SHA1 8e25df9b2778f40eca624142df5db4b7d968a90d SHA256 7ad2db023826e4861d644646d855406c0bbffe007b7a81d1f209948d0d58d336
 DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd2934c SHA1 9c287b76a5bc50995d86d351968368302e70b224 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778
+DIST iscsitarget-1.4.18.tar.gz 121290 RMD160 e2ccab942c74492e16140ae331f4818089c7f919 SHA1 cc0d53fc13ba1ba276b1a0d735a54c19306770b3 SHA256 00ffc8c9395b36907d5600e2437b48044254f2537f7f39d83279e5eb635883f1
 EBUILD iscsitarget-0.4.17.ebuild 1947 RMD160 876c1b3f1216e78b9f46390ba9a18310a18a5743 SHA1 fd29c29f8a31ada3b3afcf5093745f3c70ad2d4f SHA256 b71ae15ee537c66b74becab9d81d5693a28a130fcd66df3a3fb306e05625c5d3
-MISC ChangeLog 5394 RMD160 cb499f47892fb3a29a9e3424a1620d679014e9d4 SHA1 64b4ffb0b19d37a5673462f0ef68bf379394a65c SHA256 32686711c8213e61f271338c08e00429cad729e33537f7fa42a8b756a0e400fa
+EBUILD iscsitarget-1.4.18.ebuild 1998 RMD160 98bb8f39c22dcea385757d91ed1ce4e5f7b446bf SHA1 9df08b17a513a57bb01e37b653db9aa8c14b6e64 SHA256 e07cdc6066cf6155d683e522f3ae130452bb602e299edb110f4cdf03bbe2dd5c
+MISC ChangeLog 5696 RMD160 69e870d53e3889f0349b9a8b074cceb9fa68d07f SHA1 bd8af89cb6bd301431f46d80685242be0771706b SHA256 d484e71bc8e988f29a50ad1eb19738b8f30e7fa25accead30c8b41dc619594b0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpeJW0ACgkQAiZjviIA2XjNlwCcCjzZO5A6hBIpqb6wJq760M6S
-1NkAoKOKSkuvm4FYYBafQg7rgsKYPByx
-=ofPx
------END PGP SIGNATURE-----
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.18+linux-2.6.32.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.18+linux-2.6.32.patch
new file mode 100644
index 000000000000..f139e732e7de
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-1.4.18+linux-2.6.32.patch
@@ -0,0 +1,42 @@
+From 43227c1624e919efcd0cd035516c1776be55ac08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 18 Oct 2009 12:41:28 +0200
+Subject: [PATCH] Fix building with Linux kernel 2.6.32 and later.
+
+With commit 18f2ee705d98034b0f229a3202d827468d4bffd9 of the Linux kernel,
+the sync_page_range() function has been removed.
+
+This patch changes it to filemap_write_and_wait_range() as done for the XFS
+driver in the kernel (commit af0f4414f343429971d33b0dd8dccc85c1f3dcd2).
+---
+ kernel/file-io.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/file-io.c b/kernel/file-io.c
+index dbf7b1c..e4c3fea 100644
+--- a/kernel/file-io.c
++++ b/kernel/file-io.c
+@@ -8,6 +8,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/parser.h>
+ #include <linux/writeback.h>
++#include <linux/version.h>
+ 
+ #include "iscsi.h"
+ #include "iscsi_dbg.h"
+@@ -88,7 +89,12 @@ static int fileio_sync(struct iet_volume *lu, struct tio *tio)
+ 		count = lu->blk_cnt << lu->blk_shift;
+ 	}
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
+ 	res = sync_page_range(inode, mapping, ppos, count);
++#else
++	res = filemap_write_and_wait_range(mapping, ppos,
++					   ppos + count -1);
++#endif
+ 	if (res) {
+ 		eprintk("I/O error: syncing pages failed: %d\n", res);
+ 		return -EIO;
+-- 
+1.6.5
+
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.18.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.18.ebuild
new file mode 100644
index 000000000000..3686ccbf5489
--- /dev/null
+++ b/sys-block/iscsitarget/iscsitarget-1.4.18.ebuild
@@ -0,0 +1,66 @@
+# 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-1.4.18.ebuild,v 1.1 2009/10/18 11:36:47 flameeyes Exp $
+
+inherit linux-mod eutils flag-o-matic
+
+DESCRIPTION="Open Source iSCSI target with professional features"
+HOMEPAGE="http://iscsitarget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
+CONFIG_CHECK="CRYPTO_CRC32C"
+ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
+
+src_unpack() {
+	unpack ${A}
+	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}-1.4.18+linux-2.6.32.patch
+	convert_to_m "${S}"/Makefile
+}
+
+src_compile() {
+	emake usr || die "failed to build userspace"
+
+	unset ARCH
+	emake KSRC="${KERNEL_DIR}" kernel || die "failed to build module"
+}
+
+src_install() {
+	einfo "Installing userspace"
+
+	# Install ietd into libexec; we don't need ietd to be in the path
+	# for ROOT, since it's just a service.
+	exeinto /usr/libexec
+	doexe usr/ietd || die "doexe ietd failed"
+
+	dosbin usr/ietadm || die "dosbin failed"
+
+	insinto /etc
+	doins etc/ietd.conf etc/initiators.{allow,deny} || die "doins failed"
+
+	# We moved ietd in /usr/libexec, so update the init script accordingly.
+	sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d
+	newinitd "${T}"/ietd-init.d ietd || die "newinitd failed"
+	newconfd "${FILESDIR}"/ietd-conf.d ietd || die "newconfd failed"
+
+	# Lock down perms, per bug 198209
+	fperms 0640 /etc/ietd.conf /etc/initiators.{allow,deny}
+
+	doman doc/manpages/*.[1-9] || die "manpages failed"
+	dodoc ChangeLog README || die "docs failed"
+
+	einfo "Installing kernel module"
+	unset ARCH
+	linux-mod_src_install || die "modules failed"
+}