commit: 134f546a4d4d5151c82c518e051020f1d95afb43
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 21:25:27 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 21:41:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134f546a
sys-block/open-iscsi: Removed old
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-block/open-iscsi/Manifest | 2 -
.../files/open-iscsi-2.0.876-Makefiles.patch | 61 ---------
.../open-iscsi-2.0.878-gcc10-fno-common.patch | 107 ----------------
sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild | 141 ---------------------
sys-block/open-iscsi/open-iscsi-2.1.0.ebuild | 140 --------------------
5 files changed, 451 deletions(-)
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 96afd5717d8..c19643f4813 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,6 +1,4 @@
DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
SHA512
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
SHA512
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
SHA512
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
-DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B
1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f
SHA512
bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
SHA512
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B
13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a
SHA512
a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd21760cccc7f7ef07128d1aef8ee2e3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
deleted file mode 100644
index 2cfa4362285..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS)
$(FW_BOOT_SRCS) \
- iscsistart.o statics.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
- clean:
-- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
-
- depend:
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
-
- clean:
-- rm -f *.o $(PROGRAMS) .depend
-+ $(RM) *.o $(PROGRAMS) .depend
-
- depend:
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
---- a/utils/fwparam_ibft/Makefile
-+++ b/utils/fwparam_ibft/Makefile
-@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
- all: $(OBJS)
-
- clean:
-- rm -f *.o $(CLEANFILES) .depend
-+ $(RM) *.o $(CLEANFILES) .depend
-
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
-
- depend:
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
---- a/utils/sysdeps/Makefile
-+++ b/utils/sysdeps/Makefile
-@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
- all: $(SYSDEPS_OBJS)
-
- clean:
-- rm -f *.o .depend
-+ $(RM) *.o .depend
-
- depend:
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
---
-2.16.2
-
diff --git
a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
deleted file mode 100644
index b61476555fb..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001
-From: Lee Duncan <ldun...@suse.com>
-Date: Tue, 28 Jan 2020 16:36:56 -0800
-Subject: [PATCH] Updates to support gcc -fno-common option.
-
-This meant cleaning up the definition of some
-global variables, so that they were only defined
-in one place and refered to as external elsewhere.
----
- include/iscsi_err.h | 6 ++++--
- iscsiuio/configure.ac | 2 +-
- iscsiuio/src/uip/uip.h | 4 ++--
- usr/iscsi_err.c | 2 ++
- usr/log.c | 1 +
- usr/log.h | 2 +-
- 6 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/include/iscsi_err.h b/include/iscsi_err.h
-index ed000dd0..04a8723e 100644
---- a/include/iscsi_err.h
-+++ b/include/iscsi_err.h
-@@ -4,7 +4,7 @@
- #ifndef _ISCSI_ERR_
- #define _ISCSI_ERR_
-
--enum {
-+enum iscsi_error_list {
- ISCSI_SUCCESS = 0,
- /* Generic error */
- ISCSI_ERR = 1,
-@@ -73,7 +73,9 @@ enum {
-
- /* Always last. Indicates end of error code space */
- ISCSI_MAX_ERR_VAL,
--} iscsi_err;
-+};
-+
-+extern enum iscsi_error_list iscsi_err;
-
- extern void iscsi_err_print_msg(int err);
- extern char *iscsi_err_to_str(int err);
-diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
-index b41df0ec..8099f09c 100644
---- a/iscsiuio/configure.ac
-+++ b/iscsiuio/configure.ac
-@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[
- else
- echo 'char *build_date = "'`date`'";' > src/unix/build_date.c
- fi
-- echo 'char *build_date;'> src/unix/build_date.h
-+ echo 'extern char *build_date;'> src/unix/build_date.h
- ]],[[]])
-
- AC_PREFIX_DEFAULT()
-diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h
-index 1180ab50..9d9428a2 100644
---- a/iscsiuio/src/uip/uip.h
-+++ b/iscsiuio/src/uip/uip.h
-@@ -70,8 +70,8 @@ struct uip_stack;
- typedef u16_t uip_ip4addr_t[2];
- typedef u16_t uip_ip6addr_t[8];
-
--const uip_ip6addr_t all_zeroes_addr6;
--const uip_ip4addr_t all_zeroes_addr4;
-+extern const uip_ip6addr_t all_zeroes_addr6;
-+extern const uip_ip4addr_t all_zeroes_addr4;
-
- #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf)
- #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf)
-diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c
-index 23c61fc3..4a057d57 100644
---- a/usr/iscsi_err.c
-+++ b/usr/iscsi_err.c
-@@ -21,6 +21,8 @@
- #include "iscsi_err.h"
- #include "log.h"
-
-+enum iscsi_error_list iscsi_err;
-+
- static char *iscsi_err_msgs[] = {
- /* 0 */ "",
- /* 1 */ "unknown error",
-diff --git a/usr/log.c b/usr/log.c
-index f29b54b3..6e16e7ce 100644
---- a/usr/log.c
-+++ b/usr/log.c
-@@ -33,6 +33,7 @@
-
- char *log_name;
- int log_level = 0;
-+struct logarea *la = NULL;
-
- static int log_stop_daemon = 0;
- static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap);
-diff --git a/usr/log.h b/usr/log.h
-index 486a08ea..c548791e 100644
---- a/usr/log.h
-+++ b/usr/log.h
-@@ -64,7 +64,7 @@ struct logarea {
- union semun semarg;
- };
-
--struct logarea *la;
-+extern struct logarea *la;
-
- extern int log_init(char *program_name, int size,
- void (*func)(int prio, void *priv, const char *fmt, va_list ap),
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
b/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
deleted file mode 100644
index a622e3b62f5..00000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
- sys-apps/kmod
- sys-block/open-isns:=
- sys-kernel/linux-headers
- infiniband? ( sys-fabric/ofed )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
- sys-fs/lsscsi
- sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
- "${FILESDIR}/${PN}-2.0.878-gcc10-fno-common.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 -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
- -i etc/iscsid.conf || die
- sed -e 's@\(/sbin/\)@/usr\1@' \
- -i etc/systemd/iscsi* || 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} $(usex systemd ''
-DNO_SYSTEMD)" \
- AR="$(tc-getAR)" CC="$(tc-getCC)" \
- $(usex systemd '' NO_SYSTEMD=1) \
- 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
-
- local unit
- local units=(
- iscsi.service
- iscsid.{service,socket}
- iscsiuio.{service,socket}
- )
- for unit in ${units[@]} ; do
- systemd_dounit etc/systemd/${unit}
- done
-
- 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}" ]] && [[ -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
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
b/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
deleted file mode 100644
index a1f80e0a347..00000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
- sys-apps/kmod
- sys-block/open-isns:=
- sys-kernel/linux-headers
- infiniband? ( sys-fabric/ofed )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
- sys-fs/lsscsi
- sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.876-Makefiles.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 -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
- -i etc/iscsid.conf || die
- sed -e 's@\(/sbin/\)@/usr\1@' \
- -i etc/systemd/iscsi* || 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} $(usex systemd ''
-DNO_SYSTEMD)" \
- AR="$(tc-getAR)" CC="$(tc-getCC)" \
- $(usex systemd '' NO_SYSTEMD=1) \
- 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
-
- local unit
- local units=(
- iscsi.service
- iscsid.{service,socket}
- iscsiuio.{service,socket}
- )
- for unit in ${units[@]} ; do
- systemd_dounit etc/systemd/${unit}
- done
-
- 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}" ]] && [[ -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
-}
