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

Package-Manager: portage-2.1.9.24/cvs/Linux i686

5 files changed, 103 insertions, 10 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/Manifest b/sys-block/iscsitarget/Manifest
index 359331a17e2d..75cd931a4dd9 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -2,7 +2,7 @@
 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 ietd-init.d-2 2482 RMD160 4cfb3ef4690dc601ddd08578138dd988ab9041be SHA1 3856c74da1d45aefeb1ef0c9617da36e381f85f4 SHA256 299692c81e51fa5c8309b955732d29e3f82a4406e13fe9a826b842ad30f807d9
 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 2427 RMD160 08b735d3308085895de7134fb1bba16e20b6185f SHA1 672bfccc595d9aa9ffe8fe1601263ea965696bc9 SHA256 277bab00bd30b40ccdc5375bf5c3f0ed949fa756b6300828b052ec269c90ca8e
 AUX iscsitarget-0.4.17+linux-2.6.29.patch 1123 RMD160 c4fc845ab893125469e67c839ba17165188a57d3 SHA1 71d410350a57102f42ce37dff0abb07c780f196d SHA256 aa8d8c39d6375b5f5a05e4b5f98c839a2b841fa43d79447055edd57d05f53b37
@@ -10,16 +10,19 @@ AUX iscsitarget-0.4.17+linux-2.6.30.patch 1145 RMD160 12b2488ecbc10c71b3cbd21509
 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
+AUX iscsitarget-1.4.20.2_kernel-2.6.36.patch 339 RMD160 0f88eecf46fed45ea9847a5c80943ca975fa53d4 SHA1 2af61df45fdbfeb444aafeef5cd5b3ffff93d856 SHA256 1a2b44da24a89fd2ba204600668351c0130c28eacace1ff0d362ef370cb3aaec
 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
+DIST iscsitarget-1.4.20.2.tar.gz 138464 RMD160 707138c0dd9a440f0d7ae5955d9d7f8bd0303398 SHA1 adfa2ff4defe93df7c26878b554731a268f0ecac SHA256 0f3c8e2c2038fbbd7059d1efdd428260013212daca75c1d56abbeec33cb8d388
 EBUILD iscsitarget-0.4.17.ebuild 1947 RMD160 876c1b3f1216e78b9f46390ba9a18310a18a5743 SHA1 fd29c29f8a31ada3b3afcf5093745f3c70ad2d4f SHA256 b71ae15ee537c66b74becab9d81d5693a28a130fcd66df3a3fb306e05625c5d3
 EBUILD iscsitarget-1.4.19.ebuild 2141 RMD160 377ead0c5fce50b5dd87a7dbb7ae9f8e30ca2c72 SHA1 f3268a81e6859c562ab92d4209e925ffa1088ccb SHA256 1fe32e93dff5504dca70ade38c97d991d17fe8884709c7d6e13c8882cfe94c37
-MISC ChangeLog 6667 RMD160 14be140c1ba6e165323a6917a22595897be03d71 SHA1 b6008f06923fe77b8d72e6c49c0ba3e2be0231d8 SHA256 6d067a4a8be123c438ecefb601c91db3222d9cee4761b5055ce1ae770aec1c79
+EBUILD iscsitarget-1.4.20.2.ebuild 1997 RMD160 55bd6b72be9f4d118189fe98b1e45af259b8572b SHA1 a789843bf8b177b151f234bd36737660102d1387 SHA256 53b7f3f4b545c242061b9966b7fa61d45ed8d03912c7bde990c0e6c518198735
+MISC ChangeLog 6954 RMD160 965cb156ac6b32de75eeb9de061f46c71b6c639e SHA1 3043d015d50cb1f12e4885c13ce18be59dbe373a SHA256 9631402551e9cfd485223fce7a9e46456cb9ac5762f8eb2f8e535977a21656ee
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxi5EAACgkQcsIHjyDViGQWaACdHxMG2knW1cA5f6rLo7LbynqD
-22YAoJWBBBIPdCGPKEBcTGm2Yz/1mglk
-=Olly
+iEYEARECAAYFAk0IrAcACgkQNQqtfCuFnePCywCgkI4IBjy7ntXhxWFMKkhDPKhL
+BecAn12hs5ngrvJes5JcpKZ2lFNVg0Of
+=pNXs
 -----END PGP SIGNATURE-----
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
+}