sys-block/open-iscsi: Bump to version 2.1.1

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

2 files changed, 141 insertions, 0 deletions

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 064a1bebae5a..c0adee972fc6 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,3 +3,4 @@ DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b0
 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 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
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
new file mode 100644
index 000000000000..43f3ee2b89ff
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
@@ -0,0 +1,140 @@
+# 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"
+)
+
+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 $(find test -maxdepth 1 -type f ! -name ".*")
+
+	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
+}