gentoo Easter resync : 12.04.2020

5 files changed, 16 insertions, 185 deletions

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index ba16182713ef..a8e21c967a4d 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -10,16 +10,14 @@ AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b7
 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.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240
-AUX open-iscsi-2.0.877-optional_systemd.patch 2308 BLAKE2B 32ad0dd559cae999e5fa1cd2164a825bc7c17bfea07d8ab3ffc9bd469d14538b4ec469f241daed9dfcc376a11dd29dc15d0e14bc2b3d59667719b13e27571ffb SHA512 ed00b9155f623ccc6f871247f0388d7f453997b8ce5c04aba38eab36d5379c6e94896e3a0d6b16fe9ed52b96694ddb9b5e07b8bb9051940b4f4274a89ffb7c1c
-AUX open-iscsi-2.0.877-pkgconfig.patch 2882 BLAKE2B f763ae55aa0bc9e7d2f525a069bd7b35cc8f71fa51c5251ef1ca917373cf963f3ad26418bd72f68cadaa1678f86c9f246070a4ae03fc21fa49b52428a30b6290 SHA512 0da14100fa93fd256d6f6cbe4126be1f2fb874d3570fcdc09e8cb77052cc98413d8bde2bcaca6b7bc286b2494f8cca7c707813ecd4f290cc63cc8aa2ea8347af
 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.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
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
-EBUILD open-iscsi-2.0.875.ebuild 3713 BLAKE2B b3ec80066fd3c7bf72e56361e59213ba8b8a4d57e777394e5842458620a712c14ad93cc1b69f47f266360570cc6c63be94582ea3f460730ef920320a5635c397 SHA512 8af21fe4129b7af58f2e126bb5c6f8e7f6b764246686dd2a7c80e13ea90f691bcb6722a8a4a6d688d096fa7d414fd52c0a214d7c1212d40495bbbddd241b7132
-EBUILD open-iscsi-2.0.877.ebuild 4038 BLAKE2B e9b029d7ce68a087b74dd898fb16131081f9258151b7b066dd56ca7d4be7d44a3f6087e98174b9fb0682a9b9efff1e3d6ecf553c2465f812398b9f61b7e98843 SHA512 75c8dc09217e30f3bc7a2ed99b8102b4244587baee647edc6583bcabce63d4a5a85447fe09e87a215746e66b265ca3c24c589f5ba08b96f786f708b992d2b50a
+EBUILD open-iscsi-2.0.875.ebuild 3714 BLAKE2B 4d50d94574f3e16ef32a94287048719d83085457b66157ab402bc4c1b8674575910a3275baeef1cd462e8b6cdfa8efd37acb55dcac08e0d47a130d7fea6e2603 SHA512 e82f636a9c91d8dce36d248de9f2e2123505435dd15f1ac9273ccf6628641e8809ff9fd6cfd8b037b88699641e49170d145b2d8fa349156ff6aad2d833cba6a9
 EBUILD open-iscsi-2.0.878.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
 EBUILD open-iscsi-2.1.0.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
+EBUILD open-iscsi-2.1.1.ebuild 4035 BLAKE2B e4598fce1ae544c5c9ede913c7563d18709cfa680af073560d6c0c698b2391db53d031042e793405b0af5c1b6f1aa8a412a4425acb09d06b4d1e97c5f04e4e09 SHA512 edbeca592c733d952c707d997d5e97a2d1fa313e4e03efc8a0f512e489615cac4ad0c62173dcad6aacf6ff831e698da32734451c90f054d048911a91a008ffd6
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
deleted file mode 100644
index b1f1a8f1d078..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Tue, 14 May 2019 13:11:34 -0700
-Subject: [PATCH] Make iscsid systemd usage optional
-
-You can compile without system now by using something
-like:
-
-	make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
-
-This will skip systemd code for iscsid and iscsiuio.
----
- Makefile     | 5 +++++
- usr/Makefile | 2 ++
- usr/iscsid.c | 6 ++++++
- 3 files changed, 13 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index c941740c..9a337741 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS))
- export CFLAGS
- endif
- 
-+# export systemd disablement if set
-+ifneq ($(NO_SYSTEMD),)
-+export NO_SYSTEMD
-+endif
-+
- # Random comments:
- # using '$(MAKE)' instead of just 'make' allows make to run in parallel
- # over multiple makefile.
-diff --git a/usr/Makefile b/usr/Makefile
-index f1c35aa7..0203127c 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
-+ifeq ($(NO_SYSTEMD),)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
-+endif
- PROGRAMS = iscsid iscsiadm iscsistart
- 
- # libc compat files
-diff --git a/usr/iscsid.c b/usr/iscsid.c
-index 0c984409..37c13b39 100644
---- a/usr/iscsid.c
-+++ b/usr/iscsid.c
-@@ -34,7 +34,9 @@
- #include <sys/wait.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef	NO_SYSTEMD
- #include <systemd/sd-daemon.h>
-+#endif
- 
- #include "iscsid.h"
- #include "mgmt_ipc.h"
-@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file)
- /* called right before we enter the event loop */
- static void set_state_to_ready(void)
- {
-+#ifndef	NO_SYSTEMD
- 	if (sessions_to_recover)
- 		sd_notify(0, "READY=1\n"
- 				"RELOADING=1\n"
-@@ -346,14 +349,17 @@ static void set_state_to_ready(void)
- 	else
- 		sd_notify(0, "READY=1\n"
- 				"STATUS=Ready to process requests\n");
-+#endif
- }
- 
- /* called when recovery process has been reaped */
- static void set_state_done_reloading(void)
- {
-+#ifndef	NO_SYSTEMD
- 	sessions_to_recover = 0;
- 	sd_notifyf(0, "READY=1\n"
- 			"STATUS=Ready to process requests\n");
-+#endif
- }
- 
- int main(int argc, char *argv[])
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch
deleted file mode 100644
index 1756196e6b33..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 623a81123c494f5c69dc6616bd72e838862e2f1f Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Mon, 12 Nov 2018 13:10:04 -0800
-Subject: [PATCH] Use pkg-config in Makefiles for newer libraries.
-
-These two recently-added libraries can be in different
-locations on different distros, so use pkg-config to
-added the appropriate actions in the make files.
----
- libopeniscsiusr/Makefile |  8 +++++++-
- usr/Makefile             | 11 ++++++++---
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index bf7c96c7..a045a459 100644
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -23,6 +23,8 @@ endif
- INCLUDE_DIR ?= $(prefix)/include
- PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
- 
-+PKG_CONFIG = /usr/bin/pkg-config
-+
- LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
- 
- LIBISCSI_USR_VERSION_MAJOR=0
-@@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
- 
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
-+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
-+
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
- 
- LIBADD =
- 
- all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc
- 
- $(LIBS): $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD)
-+	@echo CFLAGS= $(CFLAGS)
-+	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD)
- 	ln -sf $@ $(DEVLIB)
- 
- $(LIBS_MAJOR): $(LIBS)
-diff --git a/usr/Makefile b/usr/Makefile
-index f9445ada..f1c35aa7 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o
- endif
- endif
- 
-+PKG_CONFIG = /usr/bin/pkg-config
-+
- CFLAGS ?= -O2 -g
- WARNFLAGS ?= -Wall -Wstrict-prototypes
- CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- 	  -I$(TOPDIR)/libopeniscsiusr
-+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
- PROGRAMS = iscsid iscsiadm iscsistart
- 
- # libc compat files
-@@ -60,14 +65,14 @@ all: $(PROGRAMS)
- 
- iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- 	iscsid.o session_mgmt.o discoveryd.o mntcheck.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@  -lisns -lcrypto -lrt -lmount $(ISCSI_LIB)
-+	$(CC) $(CFLAGS) $^ -o $@  -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB)
- 
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB)
-+	$(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB)
- 
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
-+	$(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB)
- clean:
- 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
- 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index 3ee56434ec49..dcb2eadf66ab 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
index 3c166cfb0a40..43f3ee2b89ff 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,6 @@ REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
-	"${FILESDIR}/${PN}-2.0.877-pkgconfig.patch"
-	"${FILESDIR}/${PN}-2.0.877-optional_systemd.patch"
 )
 
 pkg_setup() {
@@ -107,7 +105,7 @@ src_install() {
 	dodoc README THANKS
 
 	docinto test/
-	dodoc test/*
+	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
 
 	insinto /etc/iscsi
 	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
@@ -115,9 +113,15 @@ src_install() {
 	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
 	newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
-	systemd_dounit etc/systemd/iscsi.service
-	systemd_dounit etc/systemd/iscsid.service
-	systemd_dounit etc/systemd/iscsid.socket
+	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
@@ -126,7 +130,7 @@ src_install() {
 
 pkg_postinst() {
 	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
+	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
 		{
 		  cat "${EROOT}${in}.example"
 		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"