summaryrefslogtreecommitdiff
path: root/sys-block/open-iscsi
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
commita978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree8c764c1cc0576389ce22abd317bceba71ea5732d /sys-block/open-iscsi
parent40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
gentoo resync : 04.05.2021
Diffstat (limited to 'sys-block/open-iscsi')
-rw-r--r--sys-block/open-iscsi/Manifest8
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch161
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch24
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild96
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.1.3.ebuild5
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild5
6 files changed, 6 insertions, 293 deletions
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 85e723287d58..0ed60bc649ef 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,19 +3,15 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d
AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a
AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
AUX iscsidev.sh 2119 BLAKE2B 60d71177fa788b942ece6d1a1d17b9157956ccd5a1781b022a56da6f13c9dc8485008fd3c6530ae9b798ce3034c9cc3c960d43a196bfb06b73746390a8af91e7 SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813
-AUX open-iscsi-2.0.873-Makefiles.patch 5441 BLAKE2B 62e50709bc2241fb12dc4c31982e323b4d766997470bb141fd209afde7db936141fe3138cc894eddf0676a1ce4aa45332c73e520806953719b9ffaa14431abb1 SHA512 8dd3433db748f2fd0da0ab6a1059d7058eb09c527e9d039e768bc359a6b665da3e5c13463c32f35d7c630a3b901a689315ece3adb88cccabe452352658705f33
-AUX open-iscsi-2.0.873-memset.patch 680 BLAKE2B 52ce4e6f1ad919334c154205bf335a3dcfe6e3c499cb4db06ec3775af33c91175caf776bb9b1efcec6fcbd57328cf80037d42d18f0b03c7a2c7ba9ecd2df2df7 SHA512 1fb0615d443ce913409f5e6e3cc217149c2586cf1b4175d34512337929c1e2209391808e8f2192742d2f3bfb382e21eaa90e596b6c3e3383ee1a5b735a30fd9b
AUX open-iscsi-2.0.874-Makefiles.patch 4087 BLAKE2B cba133471f1c22987cd8be4e7ea4629ef415f8a50da81fc53068745a85fff1aae0f82d9401035b3066906e9cab7d307249402bacc8cd767bf46d8d1a740061fb SHA512 c535a45c627aaa8fd168d4c96f782090b9ae829003ec59c6ead7f34d15f4e52c71916aa014209ac35fd3b29296bb46b603d8df2072be463c5fcc90338784665c
AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03
AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382
AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064
AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
-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.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-EBUILD open-iscsi-2.0.873-r1.ebuild 2542 BLAKE2B 3bad7daf68d479e7d458fa57ebc997c2027e4852f475e5bb5435c42b339c9c8268104b975f1b1e3383ac8b511230d84e75ca2481aba878429ab9ba6f1616af89 SHA512 a057f4a49b1e8e38ce20177520eac1f6e0e36200019bfd2ae4d019c1e2075a5420367596c756343508979d383be0410636d1ac768485acdba5e37ecdbae6f75f
EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2
-EBUILD open-iscsi-2.1.3.ebuild 4031 BLAKE2B 9326eae6ab5b87246c57c8d22eb8eb405067a788aaa770fd2dd9ebc0b6e8ffab649ec93fc3de2739357f261a2bf1368a3691b420a4b9defa4017602f7422d85e SHA512 bb812652153d0f2df9b3ade204b28373d55b9490bb06d5793d2b53b2ff31e2bd3ea677761ddc13a73e5efcacf181f2371c1e6be0d623daa3d3567afe86511c03
-EBUILD open-iscsi-2.1.4-r1.ebuild 4055 BLAKE2B c2f93f6e5fd37d4a539f14f4f47f01ac1d36bb885388a7563d699a26aa82f7eeba1c3a601d19cb1f1fb920ca398bdf76a189c9d310fc07882c7f112bb9d23de3 SHA512 49fb0acc1ebe9ff0b8a56e39d18edcf41976011275a79ded8801285922358b932cfc13930237632a4ba99c501d3a2a0c96a3d6aa1767c01dde8b691078b4aa77
+EBUILD open-iscsi-2.1.3.ebuild 3971 BLAKE2B 04dd9d677937f775b07ec0c6cd85e7410908b6f718a2b342f461b1fa081c7f43c915958ef15fc9c421680772540da11540c2418761f42b5683b6831e4b3dc332 SHA512 f372f6ee0273731f6d68492f704fa332729817167fd10be8de0ddf53efaf9185de40324fb3c1fd5f54a1b443330b5444ae27140ea51febcfd24ca13a128a0909
+EBUILD open-iscsi-2.1.4-r1.ebuild 3995 BLAKE2B 23e00f5793c64838e6b41994ccc3917f6dc3d4862f40bba19ff0964dac000d1e84c1760363384a39af09f929b3dbadc235abc69843a91c6844d82300d7939e13 SHA512 06bf03dd81e8b121eaff611d1f3467775def562b5d32a270114262475ea6f0639464048fa7f5a36e2a917f8215c91dab96e78570183f212167da0da86cb980bf
MISC metadata.xml 458 BLAKE2B 78071dafcae7bfa7045dcc2724e55ffa92b12658356bdc0a7b7f01214a7681c265a986bc7113e9b4f5f73f3a795a11ba88a2040f0e791129cdd89c70c6dfbaf7 SHA512 3a84213f60f1baee774962a70a4f5f2dbd5f8f353e746a88217451d409561613d6656b56ea1e917441dd300a0945441473f1b090b16d40d8887ad5680dc59c01
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch
deleted file mode 100644
index db5d6d14ec5a..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c5d9700..4dbff18 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man
- etcdir = /etc
- initddir = $(etcdir)/init.d
-
--MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8
--PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname
-+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 doc/iscsi-iname.8
-+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname usr/iscsistart
- INSTALL = install
- ETCFILES = etc/iscsid.conf
- IFACEFILES = etc/iface.example
-@@ -84,11 +84,11 @@ install_programs: $(PROGRAMS)
- # ugh, auto-detection is evil
- # Gentoo maintains their own init.d stuff
- install_initd:
-- if [ -f /etc/debian_version ]; then \
-+ if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \
- $(MAKE) install_initd_debian ; \
-- elif [ -f /etc/redhat-release ]; then \
-+ elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \
- $(MAKE) install_initd_redhat ; \
-- elif [ -f /etc/SuSE-release ]; then \
-+ elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \
- $(MAKE) install_initd_suse ; \
- fi
-
-@@ -115,7 +115,7 @@ install_iface: $(IFACEFILES)
- $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
-
- install_etc: $(ETCFILES)
-- if [ ! -f /etc/iscsi/iscsid.conf ]; then \
-+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \
- $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
- $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
- fi
-@@ -128,11 +128,11 @@ install_kernel:
- $(MAKE) -C kernel install_kernel
-
- install_iname:
-- if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \
-- echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \
-+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \
-+ echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \
- echo "***************************************************" ; \
-- echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \
-- echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \
-+ echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi`" ; \
-+ echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \
- echo "***************************************************" ; \
- fi
-
-diff --git a/usr/Makefile b/usr/Makefile
-index 673b7f1..83507f3 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -54,18 +54,18 @@ all: $(PROGRAMS)
-
- iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- iscsid.o session_mgmt.o discoveryd.o
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns
-
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns
-
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
-- $(CC) $(CFLAGS) -static $^ -o $@
-+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@
- 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
-diff --git a/utils/Makefile b/utils/Makefile
-index 2c7e891..62c49fa 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -1,17 +1,18 @@
- # This Makefile will work only with GNU make.
-
--CFLAGS += $(OPTFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g
-+OPTFLAGS ?= -O2 -g
-+CFLAGS += $(OPTFLAGS) -fno-inline -Wall -Wstrict-prototypes
- PROGRAMS = iscsi-iname
-
- all: $(PROGRAMS)
-
- iscsi-iname: md5.o iscsi-iname.o
-- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
-
- clean:
-- rm -f *.o $(PROGRAMS) .depend
-+ $(RM) *.o $(PROGRAMS) .depend
-
- depend:
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-+ $(GCC) $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
-diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile
-index c72bb7f..a36c2d2 100644
---- a/utils/fwparam_ibft/Makefile
-+++ b/utils/fwparam_ibft/Makefile
-@@ -26,18 +26,18 @@ OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o
- OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o
- CLEANFILES = $(OBJS) *.output *~
-
--OPTFLAGS ?= -O2 -g -fPIC
-+OPTFLAGS ?= -O2 -g
- WARNFLAGS ?= -Wall -Wstrict-prototypes
--CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../../include -I../../usr -D_GNU_SOURCE
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fPIC -I../../include -I../../usr -D_GNU_SOURCE
-
- 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
-diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile
-index 53c10e5..19cfe19 100644
---- a/utils/sysdeps/Makefile
-+++ b/utils/sysdeps/Makefile
-@@ -1,15 +1,16 @@
- # This Makefile will work only with GNU make.
-
--CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g
-+OPTFLAGS ?= -O2 -g
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-inline -Wall -Wstrict-prototypes
-
- 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
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch
deleted file mode 100644
index c56669192f09..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-clear the size of the storage, not the size of the pointer
-
---- a/usr/md5.c
-+++ b/usr/md5.c
-@@ -127,7 +127,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx)
-
- byteSwap(ctx->buf, 4);
- memcpy(digest, ctx->buf, 16);
-- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
-+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
- }
-
- #ifndef ASM_MD5
---- a/utils/md5.c
-+++ b/utils/md5.c
-@@ -133,7 +133,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx)
-
- byteSwap(ctx->buf, 4);
- memcpy(digest, ctx->buf, 16);
-- memset(ctx, 0, sizeof (ctx)); /* In case it's sensitive */
-+ memset(ctx, 0, sizeof (*ctx)); /* In case it's sensitive */
- }
-
- #ifndef ASM_MD5
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
deleted file mode 100644
index 18707375b859..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator linux-info epatch 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"
-
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
- sys-fs/lsscsi
- sys-apps/util-linux"
-
-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 builtion 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!
- CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
- if linux_config_exists; then
- for module in ${CONFIG_CHECK_MODULES}; do
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
- done
- 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.1.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index 01e5e10c4e07..923041df6776 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -12,15 +12,14 @@ 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"
+IUSE="debug infiniband +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= )
+ dev-libs/openssl:0=
systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 48c3a385ff33..32d4e406f51f 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -12,15 +12,14 @@ 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"
+IUSE="debug infiniband +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= )
+ dev-libs/openssl:0=
systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}