sys-block/open-iscsi version bump

3 files changed, 106 insertions, 158 deletions

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 7c35b52..2703bb6 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -30,8 +30,6 @@ AUX redhat/open-iscsi-2.0-870.1-compile-fix.patch 418 RMD160 92801d821280cee8d5c
 AUX redhat/open-iscsi-2.0-870.1-fwparam-ppc-crash.patch 1715 RMD160 587fe8033621d52f5540c9ffc720e92c0b63991f SHA1 b693de1cd9fc16cd075d52932baa843f70f9601c SHA256 9d9aed1554bf1babad3c265ff4c2f2de7ba199e33d6861b4abc306b2ae726d79
 AUX redhat/open-iscsi-2.0-870.1-ibft-newer-kernel.patch 1144 RMD160 88c2b9c95e6e49ab9cb9c49077e1ac4e72ab95ee SHA1 6f2a0ed60057f6baf419ddfec1b8e2cdf202acc2 SHA256 8b1043783be68afaf3fa01364e900b1b0ec94685ea5531d7128ee442654bfefb
 AUX redhat/open-iscsi-2.0-870.1-no-exit.patch 4985 RMD160 318d9c4bec7d2dcbcf8f589017f55f8eeb2dc8fc SHA1 0d2c37af9e617605532f11653342fefc03031e07 SHA256 375480ce5096219b92ab9cc4afaeaa2595bd3098fc8a3fb3bbae3afc7df492e1
-DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
 DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961fa7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f
-EBUILD open-iscsi-2.0.870.3-r1.ebuild 4604 RMD160 41c343917ccb9f069d1f22f6c5bc30f269a21882 SHA1 17437ce23c91110ae9558aa23947d74cacbe2908 SHA256 b6a4612123c3c985de91f81d696ba2b4a658eb43854b2b83f33169493b83b3bf
 EBUILD open-iscsi-2.0.872.ebuild 3082 RMD160 9508e1ee3d856da8d7161937de85378cf4136ce9 SHA1 cdef0676a35119b4316b4972a73e6b0430eabcf7 SHA256 9c5666bf03cd0ff2bdb348b177b222469546751c222630d44a7785711be1d6cb
 MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SHA1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b402156f02c08c416e6eed0584f2096152605f3bef5df31a
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
deleted file mode 100644
index 58c35b2..0000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2009 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.870.3-r1.ebuild,v 1.1 2009/10/27 19:47:34 dertobi123 Exp $
-
-inherit distutils versionator linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/"
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~mips"
-IUSE="modules utils debug"
-DEPEND="virtual/linux-sources app-doc/doxygen"
-RDEPEND="virtual/modutils sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
-MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG}) libiscsi(${MODULE_NAMES_ARG})"
-BUILD_TARGETS="all"
-CONFIG_CHECK="CRYPTO_CRC32C"
-ERROR_CFG="open-iscsi needs CRC32C support in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 15 ]; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-
-	# add RH patches, we need libiscsi for anaconda
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-update-initscripts-and-docs.patch
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-use-var-for-config.patch
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-use-red-hat-for-name.patch
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-ibft-sysfs.patch
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-print-ibft-net-info.patch
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-only-root-use.patch
-	epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-start-iscsid.patch
-
-	epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-add-libiscsi.patch
-	epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-no-exit.patch
-	epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-ibft-newer-kernel.patch
-	epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-485217.patch
-	epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-fwparam-ppc-crash.patch
-	epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-compile-fix.patch
-
-	# >=2.6.36 kernel support
-	epatch "${FILESDIR}"/${PN}-2.0.870-null-sysfs-str.patch
-
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-	if use modules; then
-		einfo "Building kernel modules"
-		export KSRC="${KERNEL_DIR}"
-		linux-mod_src_compile || die "failed to build modules"
-	fi
-
-	einfo "Building fwparam_ibft"
-	cd "${S}"/utils/fwparam_ibft && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-
-	einfo "Building userspace"
-	cd "${S}"/usr && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-
-	einfo "Building libiscsi"
-	cd "${S}"/libiscsi && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-	cd "${S}/libiscsi" && \
-		distutils_src_compile
-
-	if use utils; then
-		einfo "Building utils"
-		cd "${S}"/utils && \
-		CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
-			|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use modules; then
-		einfo "Installing kernel modules"
-		export KSRC="${KERNEL_DIR}"
-		linux-mod_src_install
-	fi
-
-	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
-
-	einfo "Installing libiscsi"
-	dodir /usr/$(get_libdir)
-	exeinto /usr/$(get_libdir)
-	doexe "${S}"/libiscsi/libiscsi.so.0
-	dosym /usr/$(get_libdir)/libiscsi.so.0 /usr/$(get_libdir)/libiscsi.so
-
-	dodir /usr/include
-	insinto /usr/include
-	doins "${S}"/libiscsi/libiscsi.h
-
-	cd "${S}/libiscsi"
-	distutils_src_install
-	cd "${S}"
-
-	if use utils; then
-		einfo "Installing utilities"
-		dosbin utils/iscsi-iname utils/iscsi_discovery
-	fi
-
-	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
-
-	einfo "Installing configuration"
-	insinto /etc/iscsi
-	doins etc/iscsid.conf
-
-	# only contains iscsi initiatorname, no need to update
-	if [ ! -e /etc/iscsi/initiatorname.iscsi ]; then
-		doins "${FILESDIR}"/initiatorname.iscsi
-	fi
-
-	# if there is a special conf.d for this version, use it
-	# otherwise, use the default: iscsid-conf.d
-	insinto /etc/conf.d
-	if [ -e "${FILESDIR}"/iscsid-${PV}.conf.d ]; then
-		newins "${FILESDIR}"/iscsid-${PV}.conf.d iscsid
-	else
-		newins "${FILESDIR}"/iscsid-conf.d iscsid
-	fi
-
-	# same for init.d
-	if [ -e "${FILESDIR}"/iscsid-${PV}.init.d ]; then
-		newinitd "${FILESDIR}"/iscsid-${PV}.init.d iscsid
-	else
-		newinitd "${FILESDIR}"/iscsid-init.d iscsid
-	fi
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
new file mode 100644
index 0000000..2ecc799
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit distutils versionator linux-info eutils flag-o-matic autotools
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/"
+MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
+SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug slp"
+DEPEND="net-libs/openslp"
+RDEPEND="${DEPEND}
+		sys-apps/util-linux"
+
+S="${WORKDIR}/${MY_PV}"
+
+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
+}
+
+src_prepare() {
+	export EPATCH_OPTS="-d${S}"
+	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
+	epatch "${FILESDIR}"/${P}-glibc212.patch
+	epatch "${FILESDIR}"/${P}-slp.patch
+	epatch "${FILESDIR}"/${P}-omg-calling-configure.patch
+
+	# add RH patches, we need libiscsi for anaconda
+	epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-update-initscripts-and-docs.patch
+	epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-use-var-for-config.patch
+	epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-use-red-hat-for-name.patch
+	epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-add-libiscsi.patch
+	epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-disable-isns-for-lib.patch
+	epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-fix-lib-sysfs-init.patch
+
+	if use slp; then
+		# workaround bug with lslp
+		cd "${S}"/utils/open-isns || die
+		eautoreconf
+		sed -i "s:-lisns:-lisns -lslp:g" "${S}"/usr/Makefile || die
+	fi
+}
+
+src_configure() {
+	einfo "Configuring userpsace"
+	cd "${S}/utils/open-isns" || die
+	econf $(use_with slp) || die
+}
+
+src_compile() {
+	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
+	einfo "Building userspace"
+	cd "${S}" || die
+	CFLAGS="" emake OPTFLAGS="${CFLAGS}" user || die "emake failed"
+}
+
+src_install() {
+	# build system is broken...
+	emake DESTDIR="${D}" sbindir="/usr/sbin" install_user || die "emake install_user failed"
+	# this doesn't get installed
+	dosbin usr/iscsistart
+
+	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
+
+	einfo "Installing libiscsi"
+	dodir /usr/$(get_libdir)
+	exeinto /usr/$(get_libdir)
+	doexe "${S}"/libiscsi/libiscsi.so.0
+	dosym libiscsi.so.0 /usr/$(get_libdir)/libiscsi.so
+
+	dodir /usr/include
+	insinto /usr/include
+	doins "${S}"/libiscsi/libiscsi.h
+
+	cd "${S}"/libiscsi || die
+	distutils_src_install
+
+}
+
+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
+}