From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F193E139085 for ; Mon, 2 Jan 2017 16:55:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2109122419C; Mon, 2 Jan 2017 16:55:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E78FD22419C for ; Mon, 2 Jan 2017 16:55:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6A91341026 for ; Mon, 2 Jan 2017 16:55:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72EB72521 for ; Mon, 2 Jan 2017 16:55:35 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1483376115.47fd69ecdf0411ae786a83ed41e4dae74f9e4af4.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/open-iscsi/files/musl-fixes.patch sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild X-VCS-Directories: sys-block/open-iscsi/files/ sys-block/open-iscsi/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 47fd69ecdf0411ae786a83ed41e4dae74f9e4af4 X-VCS-Branch: master Date: Mon, 2 Jan 2017 16:55:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: efb6807e-8b46-4164-94db-bfec3457fda4 X-Archives-Hash: b714c257d3621c9e4a7e521f37812bf2 commit: 47fd69ecdf0411ae786a83ed41e4dae74f9e4af4 Author: Matthew Thode gentoo org> AuthorDate: Mon Jan 2 16:53:25 2017 +0000 Commit: Matt Thode gentoo org> CommitDate: Mon Jan 2 16:55:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fd69ec sys-block/open-iscsi: bup to fix musl breakage Package-Manager: portage-2.3.0 sys-block/open-iscsi/files/musl-fixes.patch | 64 ++++++++++++ sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild | 115 ++++++++++++++++++++++ 2 files changed, 179 insertions(+) diff --git a/sys-block/open-iscsi/files/musl-fixes.patch b/sys-block/open-iscsi/files/musl-fixes.patch new file mode 100644 index 00000000..f101eda --- /dev/null +++ b/sys-block/open-iscsi/files/musl-fixes.patch @@ -0,0 +1,64 @@ +--- ./utils/open-isns/isns.h.orig ++++ ./utils/open-isns/isns.h +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include "types.h" +--- ./utils/fwparam_ibft/fwparam_ppc.c.orig ++++ ./utils/fwparam_ibft/fwparam_ppc.c +@@ -356,7 +356,7 @@ + * Sort the nics into "natural" order. The proc fs + * device-tree has them in somewhat random, or reversed order. + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp); + + snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); + dev_count = 0; +--- ./usr/idbm.c.orig ++++ ./usr/idbm.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- ./usr/iscsiadm.c.orig 2012-05-21 02:59:24.000000000 +0200 ++++ ./usr/iscsiadm.c 2016-07-20 22:00:54.430451701 +0200 +@@ -2403,6 +2403,7 @@ main(int argc, char **argv) + int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0; + int packet_size=32, ping_count=1, ping_interval=0; + int do_discover = 0, sub_mode = -1; ++ int argerror = 0; + struct sigaction sa_old; + struct sigaction sa_new; + struct list_head ifaces; +@@ -2553,7 +2554,11 @@ main(int argc, char **argv) + return 0; + case 'h': + usage(0); +- } ++ ++ case '?': ++ log_error("unrecognized character '%c'", optopt); ++ argerror = 1; ++ } + + if (name && value) { + param = idbm_alloc_user_param(name, value); +@@ -2568,8 +2573,7 @@ main(int argc, char **argv) + } + } + +- if (optopt) { +- log_error("unrecognized character '%c'", optopt); ++ if (argerror) { + rc = ISCSI_ERR_INVAL; + goto free_ifaces; + diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild new file mode 100644 index 00000000..9581963 --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev + +MY_P="${PN}-$(replace_version_separator 2 "-")" + +DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.org/" +SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug slp +tcp infiniband rdma" + +DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed )" +RDEPEND="${DEPEND} + sys-fs/lsscsi + sys-apps/util-linux" +REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is -lt 2 6 16; 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 builtin options don't work. See this for + # more information: + # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 + # If there's a new release, check whether this is still valid! + TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + RDMA_MODULES="INFINIBAND_ISER" + INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS" + CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )" + if linux_config_exists; then + if use tcp; then + for module in ${TCP_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + if use infiniband; then + for module in ${INFINIBAND_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + if use rdma; then + for module in ${RDMA_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$ + done + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-Makefiles.patch + epatch "${FILESDIR}"/${P}-memset.patch + epatch "${FILESDIR}"/musl-fixes.patch + + epatch_user + + sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die +} + +src_configure() { + use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI + append-lfs-flags + + cd utils/open-isns || die + + # SSL (--with-security) is broken + econf $(use_with slp) \ + --without-security +} + +src_compile() { + # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build + # is messed up already here, so it's not making it that much worse. + KSRC="${KV_DIR}" CFLAGS="" \ + emake \ + OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + user +} + +src_install() { + emake DESTDIR="${ED}" sbindir="/usr/sbin" install + + dodoc README THANKS + + docinto test/ + dodoc test/* + + insinto /etc/iscsi + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + + # udev pieces + udev_dorules "${FILESDIR}"/99-iscsi.rules + exeinto /etc/udev/scripts + doexe "${FILESDIR}"/iscsidev.sh + + newconfd "${FILESDIR}"/iscsid-conf.d iscsid + newinitd "${FILESDIR}"/iscsid-init.d iscsid + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi + fperms 600 /etc/iscsi/iscsid.conf +}