Version bump, proxy committing for Craig #301602

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

3 files changed, 97 insertions, 3 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 60b4f856f7ae..6b69f8ef37db 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/open-iscsi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.27 2009/12/08 19:08:11 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.28 2010/03/07 18:45:40 dertobi123 Exp $
+
+*open-iscsi-2.0.871.3 (07 Mar 2010)
+
+  07 Mar 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  +open-iscsi-2.0.871.3.ebuild:
+  Version bump, proxy committing for Craig #301602
 
   08 Dec 2009; nixnut <nixnut@gentoo.org> open-iscsi-2.0.871-r1.ebuild:
   ppc stable #293712
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 1276f04800a5..51fc8ece0671 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -6,8 +6,10 @@ AUX iscsid-init.d 2784 RMD160 92f19340add0cf178c451fb143d5871381e70480 SHA1 ce1b
 AUX open-iscsi-2.0.871-makefile-cleanup.patch 1205 RMD160 04f60526916cd9a707e4c3158c6cb7edc7da4169 SHA1 be59e170705927b1b3dffd07329a1a20d067e8df SHA256 8412850ea40dd7b5bacbae18c760ef305df36dbaa507d9618555e32c8e8e2ae6
 DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
+DIST open-iscsi-2.0.871.3.tar.gz 331617 RMD160 496c25c10bfd6da5d363b9f2b9b28eeb53906109 SHA1 a21a0cec752466e631469eb7d73ac72b427bda6d SHA256 2aefded8bcc854acaa7d9df9455408484d894e2bed407ebfeb95bb07773fab53
 EBUILD open-iscsi-2.0.870.3-r1.ebuild 3058 RMD160 7cca1692b8ee288e2c04e66bdb06935b5d6b70c4 SHA1 263017243b71cbd37001dd546aaa34b46b8a33c7 SHA256 d01d147e91894ce4ec23b5d9d6ebe7aa8a09c983c3e5738b4674837eed976613
 EBUILD open-iscsi-2.0.871-r1.ebuild 2526 RMD160 4126e38f4d862ce6dcd8ada1e40ea2926cf49b2f SHA1 fc795d8d9843fc534c199121bb1479260981c780 SHA256 f3d76b1a1e729a7f6f7b7d60a60e3562ddd9a9ee844a80396c8f14790bb815f8
+EBUILD open-iscsi-2.0.871.3.ebuild 2476 RMD160 f823bf2972fa2136b00c4e3a978fb9594fabe1fd SHA1 eacdfb80645dfd9163bc0bcd2917eab2853d0a88 SHA256 0c21d46585f31e7236ab40d554a9f3ba99f6cf7d6a43d3cbc2ef4cac644ce1e3
 EBUILD open-iscsi-2.0.871.ebuild 3149 RMD160 1999c962be1a5c8ac5da72703ba206faa30bda1e SHA1 d4742fd50339c3e62c06e67edb058dfa5f9bbd33 SHA256 00f70a8e3f1efeb0db97ec5a0e12ef42fe59e6c92ea0a7478107b7f72e75f644
-MISC ChangeLog 6309 RMD160 34a78e90dcb628c4f31af1d08fe1fe9908ea318e SHA1 9eac64b7333a6fb2a8d68bf2cad7f15580b3f038 SHA256 75db1ccabcebd813e527df7453b8dd68d92d520beb58bdfd3eff0022522d8906
+MISC ChangeLog 6490 RMD160 121ae9794bc00f58535e9781274ea3835fb43eb6 SHA1 72b34a3db4061d4f44f20768e9021abc43a0def4 SHA256 a75410ca7712cca913ad0425471e304f4b6e3a3bd13cae8dee13562aa2d52b52
 MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SHA1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b402156f02c08c416e6eed0584f2096152605f3bef5df31a
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
new file mode 100644
index 000000000000..663bbc21ace1
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild,v 1.1 2010/03/07 18:45:40 dertobi123 Exp $
+
+EAPI=2
+inherit versionator linux-info eutils flag-o-matic
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/"
+SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="debug"
+DEPEND=""
+RDEPEND="${DEPEND}
+		sys-apps/util-linux"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if [ $KV_PATCH -lt 15 ]; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtion options don't work. See this for
+	# more information:
+	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_module ${module} || die "${module} needs to be built as module (builtin doesn't work)"
+		done
+	fi
+}
+
+src_prepare() {
+	export EPATCH_OPTS="-d${S}"
+	epatch "${FILESDIR}"/CVE-2009-1297.patch
+	epatch "${FILESDIR}"/${PN}-2.0.871-makefile-cleanup.patch
+}
+
+src_compile() {
+	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
+
+	einfo "Building userspace"
+	cd "${S}" && \
+	CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
+		|| die "emake failed"
+}
+
+src_install() {
+	einfo "Installing userspace"
+	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
+
+	einfo "Installing utilities"
+	dosbin utils/iscsi-iname utils/iscsi_discovery
+
+	einfo "Installing docs"
+	doman doc/*[1-8]
+	dodoc README THANKS
+	docinto test
+	dodoc test/*
+
+	einfo "Installing configuration"
+	insinto /etc/iscsi
+	doins etc/iscsid.conf
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+	insinto /etc/iscsi/ifaces
+	doins etc/iface.example
+
+	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
+	newinitd "${FILESDIR}"/iscsid-2.0.871-r1.init.d iscsid
+
+	keepdir /var/db/iscsi
+	fperms 700 /var/db/iscsi
+	fperms 600 /etc/iscsi/iscsid.conf
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
+		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
+	fi
+}