From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QWutd-0007Kh-5b for garchives@archives.gentoo.org; Wed, 15 Jun 2011 18:32:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B15AA1C0B0; Wed, 15 Jun 2011 18:32:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5FC941C081 for ; Wed, 15 Jun 2011 18:32:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A6DA1B4024 for ; Wed, 15 Jun 2011 18:32:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CEEB48003C for ; Wed, 15 Jun 2011 18:32:46 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: <575da58d19b0dd094c6f9a4383569b3105438c0d.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda-overlay:master commit in: sys-block/open-iscsi/ X-VCS-Repository: proj/anaconda-overlay X-VCS-Files: sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild sys-block/open-iscsi/open-iscsi-2.0.872.ebuild X-VCS-Directories: sys-block/open-iscsi/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 575da58d19b0dd094c6f9a4383569b3105438c0d Date: Wed, 15 Jun 2011 18:32:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4e1385e2a522c55d8d80cf25b2fe4d9a commit: 575da58d19b0dd094c6f9a4383569b3105438c0d Author: wiktor w brodlo brodlo net> AuthorDate: Wed Jun 15 18:27:14 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Wed Jun 15 18:27:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda-over= lay.git;a=3Dcommit;h=3D575da58d sys-block/open-iscsi version downgrade --- .../open-iscsi/open-iscsi-2.0.870.3-r1.ebuild | 156 ++++++++++++++= ++++++ sys-block/open-iscsi/open-iscsi-2.0.872.ebuild | 106 ------------- 2 files changed, 156 insertions(+), 106 deletions(-) diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild b/sys-bl= ock/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild new file mode 100644 index 0000000..58c35b2 --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild @@ -0,0 +1,156 @@ +# 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.8= 70.3-r1.ebuild,v 1.1 2009/10/27 19:47:34 dertobi123 Exp $ + +inherit distutils versionator linux-mod eutils flag-o-matic + +DESCRIPTION=3D"Open-iSCSI is a high performance, transport independent, = multi-platform implementation of RFC3720" +HOMEPAGE=3D"http://www.open-iscsi.org/" +MY_PV=3D"${PN}-$(replace_version_separator 2 "-" $MY_PV)" +SRC_URI=3D"http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~x86 ~amd64 ~ppc ~mips" +IUSE=3D"modules utils debug" +DEPEND=3D"virtual/linux-sources app-doc/doxygen" +RDEPEND=3D"virtual/modutils sys-apps/util-linux" + +S=3D"${WORKDIR}/${MY_PV}" + +MODULE_NAMES_ARG=3D"kernel/drivers/scsi:${S}/kernel" +MODULE_NAMES=3D"iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MO= DULE_NAMES_ARG}) libiscsi(${MODULE_NAMES_ARG})" +BUILD_TARGETS=3D"all" +CONFIG_CHECK=3D"CRYPTO_CRC32C" +ERROR_CFG=3D"open-iscsi needs CRC32C support in your kernel." + +src_unpack() { + unpack ${A} + export EPATCH_OPTS=3D"-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-an= d-docs.patch + epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-use-var-for-config.pa= tch + 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.p= atch + 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 + + # >=3D2.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=3D"${KERNEL_DIR}" + linux-mod_src_compile || die "failed to build modules" + fi + + einfo "Building fwparam_ibft" + cd "${S}"/utils/fwparam_ibft && \ + CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ + || die "emake failed" + + einfo "Building userspace" + cd "${S}"/usr && \ + CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ + || die "emake failed" + + einfo "Building libiscsi" + cd "${S}"/libiscsi && \ + CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ + || die "emake failed" + cd "${S}/libiscsi" && \ + distutils_src_compile + + if use utils; then + einfo "Building utils" + cd "${S}"/utils && \ + CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ + || die "emake failed" + fi +} + +src_install() { + if use modules; then + einfo "Installing kernel modules" + export KSRC=3D"${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/o= pen-iscsi/open-iscsi-2.0.872.ebuild deleted file mode 100644 index 2ecc799..0000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D3 -inherit distutils versionator linux-info eutils flag-o-matic autotools - -DESCRIPTION=3D"Open-iSCSI is a high performance, transport independent, = multi-platform implementation of RFC3720" -HOMEPAGE=3D"http://www.open-iscsi.org/" -MY_PV=3D"${PN}-$(replace_version_separator 2 "-" $MY_PV)" -SRC_URI=3D"mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/$= {MY_PV}.tar.gz" -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"debug slp" -DEPEND=3D"net-libs/openslp" -RDEPEND=3D"${DEPEND} - sys-apps/util-linux" - -S=3D"${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=3D"-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-initscri= pts-and-docs.patch - epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-use-var-for-con= fig.patch - epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-use-red-hat-for= -name.patch - epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-add-libiscsi.pa= tch - epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-disable-isns-fo= r-lib.patch - epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-fix-lib-sysfs-i= nit.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=3D"" emake OPTFLAGS=3D"${CFLAGS}" user || die "emake failed" -} - -src_install() { - # build system is broken... - emake DESTDIR=3D"${D}" sbindir=3D"/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=3D'/etc/iscsi/initiatorname.iscsi' - if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then - cp -f "${ROOT}${in}.example" "${ROOT}${in}" - fi -}