gentoo resync : 28.04.2021

5 files changed, 144 insertions, 2 deletions

diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 3230aa217c7d..2661ee8d40e4 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,5 +1,9 @@
+AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8092fd5471ebe8df4bc6ff17786214a3d927b90928c014984ecf90b6c8950f8d2e74b5094ff7f903067ca939fcd14ed7006ee SHA512 e19867d6ca9373176bccf9ecb4b78a312f210bd719947a0bb590e8f18862da58d6254f396bab7b84410ca1bbd3ad1c24adfe3e3994e9e6424a4a27e17c65e420
+AUX libiscsi-1.18.0-fno-common-3.patch 1387 BLAKE2B f8bacb84a3c340a528576f56b52026fefc97792b9d5a136150bf348e378cd60b9ea702101b8e9443a320ddafe5a21d646f98a4a3434661adb39f595e2e9dc52e SHA512 b0c359393b70ee6a808e254a8aeb58d7bea25307fc0f957696369e74d82eced2d7b3edcbc18dc0c3be0b45016bdf331183bcf8fdfe853b292861ea28238aad2f
 AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
-EBUILD libiscsi-1.18.0.ebuild 829 BLAKE2B f412c0154a82852ddaa96053c326f976d73dcd3bdd041698de82f94b650516835e9dd4d9ec72c31e66f75b3211750fe70163e681a6f0094a53a4371ca4bd1597 SHA512 f197f360b60fdebffdc0332b4575abcdca1b46e7d89a7854f4b4a0e6f67168e5acb91fbac079c11f40f640ce4e495608dafb1029bbfdeaffb3059efe8561dd29
+DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
+EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
+EBUILD libiscsi-1.19.0.ebuild 975 BLAKE2B 6e239b8f48437edd357f760a3a1c7c18ebdc8192570bf1ed4a1e42135f73e9709547ac7ce3606b9da9eebec6e7a63b6b6f5aa3746428e7904bb56e8f4eea8dd2 SHA512 142777c88a783033ba46fc6a73be7b540c766249b965ad408d4d841d731eadde16382cca0aa6ace7429c59550137bb3af71671d2a4afa25300b37e8c913cb9da
 EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
 MISC metadata.xml 247 BLAKE2B 3951ab56f9a5dd54a6da332a8f5a7c2b445ec812f8ba6ff6e8957e0ea605c197954b403c8da0d81fc02ee829ccbf807ee8fb929b05ff6d347e67bc22d8023c26 SHA512 8188eee6fd9f0b2bf471e9ceec1bb6459f1ef84ba7ef3dc372747043d3a6db6256dccd4e9e12596a07a04e778576e83fcb56350e59a7e5e09c43ac4dac789af9
diff --git a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch
new file mode 100644
index 000000000000..abb561982ba8
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch
@@ -0,0 +1,53 @@
+From ea89dcdbf167acd634300296172926c2e8d85804 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Sat, 15 Feb 2020 18:03:11 -0500
+Subject: [PATCH] test-tool: Use 'extern int' in headers
+
+Without this, linking fails on Fedora rawhide. Example:
+
+...
+/usr/bin/ld: test_async_lu_reset_simple.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:59: multiple definition of `param_list_len_err_ascqs'; iscsi-test-cu.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:59: first defined here
+/usr/bin/ld: test_async_lu_reset_simple.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:58: multiple definition of `invalid_cdb_ascqs'; iscsi-test-cu.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:58: first defined here
+...
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ test-tool/iscsi-support.h | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h
+index 7aa9e45..9c3a461 100644
+--- a/test-tool/iscsi-support.h
++++ b/test-tool/iscsi-support.h
+@@ -53,17 +53,17 @@ extern const char *initiatorname2;
+ #define EXPECT_RESERVATION_CONFLICT SCSI_STATUS_RESERVATION_CONFLICT, 0, NULL, 0
+ #define EXPECT_COPY_ABORTED SCSI_STATUS_CHECK_CONDITION, SCSI_SENSE_COPY_ABORTED, copy_aborted_ascqs, 3
+ 
+-int no_medium_ascqs[3];
+-int lba_oob_ascqs[1];
+-int invalid_cdb_ascqs[2];
+-int param_list_len_err_ascqs[1];
+-int too_many_desc_ascqs[2];
+-int unsupp_desc_code_ascqs[2];
+-int write_protect_ascqs[3];
+-int sanitize_ascqs[1];
+-int removal_ascqs[1];
+-int miscompare_ascqs[1];
+-int copy_aborted_ascqs[3];
++extern int no_medium_ascqs[3];
++extern int lba_oob_ascqs[1];
++extern int invalid_cdb_ascqs[2];
++extern int param_list_len_err_ascqs[1];
++extern int too_many_desc_ascqs[2];
++extern int unsupp_desc_code_ascqs[2];
++extern int write_protect_ascqs[3];
++extern int sanitize_ascqs[1];
++extern int removal_ascqs[1];
++extern int miscompare_ascqs[1];
++extern int copy_aborted_ascqs[3];
+ 
+ extern int loglevel;
+ #define LOG_SILENT  0
+-- 
+2.31.1
+
diff --git a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch
new file mode 100644
index 000000000000..e3c34aa6fdbc
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch
@@ -0,0 +1,34 @@
+--- a/test-tool/iscsi-support.c
++++ b/test-tool/iscsi-support.c
+@@ -119,7 +119,8 @@ int readonly;
+ int sbc3_support;
+ int maximum_transfer_length;
+ 
+-int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++static int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
+ 
+ static const unsigned char zeroBlock[4096];
+ 
+--- a/test-tool/iscsi-support.h
++++ b/test-tool/iscsi-support.h
+@@ -779,7 +779,7 @@ struct iscsi_async_state {
+ void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *test_state);
+ 
+ struct iscsi_pdu;
+-int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++extern int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
+ 
+ struct scsi_command_descriptor *get_command_descriptor(int opcode, int sa);
+ 
+--- a/test-tool/iscsi-test-cu.c
++++ b/test-tool/iscsi-test-cu.c
+@@ -63,7 +63,7 @@ static unsigned int maxsectors;
+  * this allows us to redefine how PDU are queued, at times, for
+  * testing purposes
+  */
+-int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) = NULL;
+ 
+ /*****************************************************************
+  *
diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
index d5f2c942c2dc..444ee4b744fd 100644
--- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
@@ -22,7 +22,11 @@ LICENSE="GPL-2 LGPL-2"
 RDEPEND="dev-libs/libgcrypt:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fno-common-2.patch
+	"${FILESDIR}"/${P}-fno-common-3.patch
+)
 
 src_prepare() {
 	default
diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
new file mode 100644
index 000000000000..ac0e12e20ddf
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--disable-static \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/ld_iscsi.so || die
+}