From 71d17c58c12ad5435a690dd5f72ed88bae364de8 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 6 May 2019 14:53:47 +0200 Subject: sys-block/open-iscsi: Removed old. Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler --- sys-block/open-iscsi/Manifest | 1 - sys-block/open-iscsi/files/musl-fixes.patch | 64 ----------- .../open-iscsi-2.0.874-include-sysmacros.patch | 20 ---- .../open-iscsi-2.0.875-include-sysmacros.patch | 21 ---- sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 111 ------------------- sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild | 114 ------------------- sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild | 122 --------------------- 7 files changed, 453 deletions(-) delete mode 100644 sys-block/open-iscsi/files/musl-fixes.patch delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch delete mode 100644 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild delete mode 100644 sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild delete mode 100644 sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild (limited to 'sys-block') diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index cc8641428057..a76fa9eec9de 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -1,5 +1,4 @@ DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b -DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf diff --git a/sys-block/open-iscsi/files/musl-fixes.patch b/sys-block/open-iscsi/files/musl-fixes.patch deleted file mode 100644 index f101eda6ddeb..000000000000 --- a/sys-block/open-iscsi/files/musl-fixes.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- ./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/files/open-iscsi-2.0.874-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch deleted file mode 100644 index 05d5d1239cb5..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/iscsiuio/src/unix/libs/bnx2.c -+++ b/iscsiuio/src/unix/libs/bnx2.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - #include "config.h" - ---- a/iscsiuio/src/unix/libs/bnx2x.c -+++ b/iscsiuio/src/unix/libs/bnx2x.c -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - - #include "config.h" - diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch deleted file mode 100644 index 7c19a1e6ba23..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6d68ef5871c94c6ebbbe6e6b1fe0bc2dce711052 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Sat, 2 Dec 2017 14:19:26 -0800 -Subject: [PATCH] Include to properly define minor() - ---- - iscsiuio/src/unix/libs/qedi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c -index c6ff6e77..b81fecdf 100644 ---- a/iscsiuio/src/unix/libs/qedi.c -+++ b/iscsiuio/src/unix/libs/qedi.c -@@ -58,6 +58,7 @@ - #include - #include - #include -+#include - - #include "config.h" - diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild deleted file mode 100644 index 4ea93fca3377..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev - -MY_P="${PN}-$(replace_version_separator 2 "-")" - -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.com/" -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 - - 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 -} 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 deleted file mode 100644 index 72734745c811..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev - -MY_P="${PN}-$(replace_version_separator 2 "-")" - -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.com/" -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 -} diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild deleted file mode 100644 index 24e8be24de11..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev systemd - -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.com/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug infiniband +tcp rdma" - -DEPEND="sys-block/open-isns:= - infiniband? ( sys-fabric/ofed )" -RDEPEND="${DEPEND} - sys-fs/lsscsi - sys-apps/util-linux" -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" - -PATCHES=( - "${FILESDIR}/${P}-Makefiles.patch" - "${FILESDIR}/${P}-musl-fixes.patch" - "${FILESDIR}/${P}-musl-ethtool-compat.patch" - "${FILESDIR}/${P}-include-sysmacros.patch" -) - -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() { - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die - default - - pushd iscsiuio >/dev/null || die - eautoreconf - popd >/dev/null || die -} - -src_configure() { - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI - append-lfs-flags -} - -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 - # Upstream make is not deterministic, per bug #601514 - rm -f "${ED}"/etc/initiatorname.iscsi - - dodoc README THANKS - - docinto test/ - dodoc test/* - - insinto /etc/iscsi - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example - - newconfd "${FILESDIR}"/iscsid-conf.d iscsid - newinitd "${FILESDIR}"/iscsid-init.d iscsid - - systemd_dounit "${S%/}"/etc/systemd/iscsid.service - - keepdir /var/db/iscsi - fperms 700 /var/db/iscsi - fperms 600 /etc/iscsi/iscsid.conf -} - -pkg_postinst() { - in='/etc/iscsi/initiatorname.iscsi' - if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then - { - cat "${EROOT}${in}.example" - echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" - echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" - } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}" - fi -} -- cgit v1.2.3-65-gdbad