version bump for bugs 340449 and 325181, with help of more people than I can list here

(Portage version: 2.1.9.24/cvs/Linux i686)

4 files changed, 94 insertions, 4 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index 3332e5c9162e..1c379d0e4def 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,14 @@
 # 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.36 2010/08/11 17:57:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.37 2010/12/15 11:50:04 fauli Exp $
+
+*iscsitarget-1.4.20.2 (15 Dec 2010)
+
+  15 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
+  +iscsitarget-1.4.20.2.ebuild,
+  +files/iscsitarget-1.4.20.2_kernel-2.6.36.patch, files/ietd-init.d-2:
+  version bump for bugs 340449 and 325181, with help of more people than I
+  can list here
 
   11 Aug 2010; Joseph Jezak <josejx@gentoo.org> iscsitarget-1.4.19.ebuild:
   Marked ppc stable for bug #314187.
diff --git a/sys-block/iscsitarget/files/ietd-init.d-2 b/sys-block/iscsitarget/files/ietd-init.d-2
index 6ea9a4b51e80..ec419dfa8b1e 100644
--- a/sys-block/iscsitarget/files/ietd-init.d-2
+++ b/sys-block/iscsitarget/files/ietd-init.d-2
@@ -1,12 +1,12 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Technologies, Inc.
+# Copyright 1999-2010 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/files/ietd-init.d-2,v 1.1 2008/07/18 16:03:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/files/ietd-init.d-2,v 1.2 2010/12/15 11:50:05 fauli Exp $
 
 MEM_SIZE=1048576
 DAEMON=/usr/sbin/ietd
 CONFIG_FILE=/etc/ietd.conf
-PID_FILE=/var/run/iscsi_trgt.pid
+PID_FILE=/var/run/ietd.pid
 NAME="iSCSI Enterprise Target"
 
 ARGS=""
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_kernel-2.6.36.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_kernel-2.6.36.patch
new file mode 100644
index 000000000000..63c50b093368
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_kernel-2.6.36.patch
@@ -0,0 +1,12 @@
+--- trunk/kernel/conn.c	(revision 372)
++++ trunk/kernel/conn.c	(working copy)
+@@ -44,7 +44,7 @@
+ 		switch (sk->sk_family) {
+ 		case AF_INET:
+ 			snprintf(buf, sizeof(buf),
+-				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
++				 "%pI4", inet_sk(sk)->inet_daddr);
+ 			break;
+ 		case AF_INET6:
+ 			snprintf(buf, sizeof(buf), "[%pI6]",
+
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
new file mode 100644
index 000000000000..dcbac9e2e871
--- /dev/null
+++ b/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
@@ -0,0 +1,70 @@
+# 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.20.2.ebuild,v 1.1 2010/12/15 11:50:05 fauli 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
+	# NIPQUAD removed in 2.6.36, #340449
+	if kernel_is ge 2 6 36; then
+		epatch "${FILESDIR}"/iscsitarget-1.4.20.2_kernel-2.6.36.patch
+	fi
+	convert_to_m "${S}"/Makefile
+}
+
+src_compile() {
+	emake KSRC="${KERNEL_DIR}" usr || die
+
+	unset ARCH
+	emake KSRC="${KERNEL_DIR}" kernel || die
+}
+
+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
+
+	dosbin usr/ietadm || die
+
+	insinto /etc
+	doins etc/ietd.conf etc/initiators.allow || die
+
+	# 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
+	newconfd "${FILESDIR}"/ietd-conf.d ietd || die
+
+	# Lock down perms, per bug 198209
+	fperms 0640 /etc/ietd.conf /etc/initiators.allow
+
+	doman doc/manpages/*.[1-9] || die
+	dodoc ChangeLog README RELEASE_NOTES README.initiators README.vmware || die
+
+	einfo "Installing kernel module"
+	unset ARCH
+	linux-mod_src_install || die
+}