gentoo auto-resync : 08:10:2024 - 04:26:34

7 files changed, 27 insertions, 197 deletions

diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 3acb1fb7683c..966e60226210 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,14 +1,7 @@
-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
-AUX libiscsi-1.19.0-fix-rdma-automagic.patch 1049 BLAKE2B ec194008113e2ba1f06666d8e8538fae9dfabb227884fae7f79a1512bcfab55f65c03c4bc10cb997e9aad32e6dfcf605c53e9efbdba5f7faf2fd75c8243113f5 SHA512 80c950ca0925109322fe45ba6296ea7dc4117e06a6e4de18c0dfe1405bc2768d137eeac786be8f6672f17d0e8423e9a922dc6b7e1865ec8cdf7a514013dde047
 AUX libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch 1151 BLAKE2B f3e4c14db9e523251de64fda11e1ae938977a0d60a8c16047da3fc54181f29922133ae054bfc4bc27f4f661870d618461954738f99d18b25a2a55f90712601ed SHA512 b566596be01822149c07c16148584c862b24268399b3606febca1081d0d0359621eba9d0a711f6845183f7691e6f0b485ae2246678a0e86c40cd03b4d7571097
-DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
-DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
-DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
 DIST libiscsi-1.19.0_p20230208.tar.gz 293283 BLAKE2B 8dafcdd87d66c8addea8734af264b1ce70ec7cbb7925becf1946b616821a94a0d22ed9a903f5f24c03d9b647353fc76a708cafed0f6482199a45cb628c143fff SHA512 d6416833b4e1352e91d869ae753fdc01968e303d5ce7de52f27692ce7f8d7ca4f648931d54f0ebfa1323f8b43531bfc81771ea0468af4dc9ad53df02c8bad55f
-EBUILD libiscsi-1.18.0.ebuild 902 BLAKE2B 5c32126ffa278fc217d7fde77dccfc57fb268269112623e300be02a5d80f6991f2a78a4a7f60542f287d352133668c0d8f0991e8571a04f46a6bcae1c9c8b280 SHA512 792b707126941ed1419409dadb287817b438b6528daae04137847fec547595f0f79ced2649537cbf030bf0f0d3af1b71e94ef5a2d053d28dbcaf064ddaaee99c
-EBUILD libiscsi-1.19.0-r2.ebuild 1376 BLAKE2B 327c0dd75970d24c4136163a07ab6315f390d78ae8768bd516d9c556cffe4ca5d20e4d8cb9b99e4d1f849d3b5d240d43bf9c5561001f8ae8cc35d5542993419f SHA512 f45ce5c1fc06703ee89ee047182b6055a2f3b3e0e814c1a6ab6a81ffc44f0298a86373492b6d5a30c52da9141104076bd7e6d57ca7605f8fe94cb596ef8226a4
+DIST libiscsi-1.20.0.tar.gz 302381 BLAKE2B 36d2d80ff51ece0a5577e43f3bfefa7160e2a6a9d026ad5587b64f87dc8c96957cd89251229ae7cab00236e1276c1dae5413b7b9192ce1cf3219c2629f542442 SHA512 f614f701671da1b1e7beda052886eb2d6a965482a5b7ae656cb6b5449a387d89302397fb8b6e3579307f98274d66b13d8b2a5d423826683185e5df0d9417d737
 EBUILD libiscsi-1.19.0_p20230208.ebuild 1407 BLAKE2B 19d8d923c5117867bb2644d4d3f09903b822d3f23933f26bcc015c163f3226f421b40ad27163ecd4e93679dab9f17749053000bdaf01ace9c06903efbc885a30 SHA512 727ed9b2c335ba35cc1d2471cc0109baf9231ad94245055d24f69ca3e13d17c262793e2a7065b348ced2382469a0290c70633c0f0c9a61256338863d94570271
+EBUILD libiscsi-1.20.0.ebuild 1402 BLAKE2B b50ec587586733ea577f3f25d3b4ab63d8c202fc493a8d625b9194d1f7cbe31a357df5c54eb51427a15eb590374031fe59f9b2fc547530f7f93122ea21577ec0 SHA512 2afb2ad983f43cae24a367c43c3df66116ddb4e35186684190124840ec2458c4efaf169fef3fbf0a6f2f531cbdc9ab76113abe028c358a0d9895495cf8fd5824
 EBUILD libiscsi-9999.ebuild 1379 BLAKE2B 3703023cbdbf65ff64e4e8b4c6c1917b1a6a90378371c89319fd60fd382f3830b01ca9471e69a23dca28d7b97bbde1a0285e9336ab841a321443108cbd2e730b SHA512 1eac24a0a26232c6b9700e667b7c2465136f9ad4334efae2172b6889ba1db2eb3c9f80cf18279e818f45ea066fc2e329e109962d40e138219a96680db4712a90
 MISC metadata.xml 353 BLAKE2B 3c729c58e8fe95f38a6f5ea14eba047ebb50b2b80819d53acfaae83d81f51510b652b618c3a7c59d16fe0d1a4e397246c5ea6b0b6807197d580a61f3784cb79f SHA512 070979945abed956dd34ae0d1cc93ea45d30a9eb555262de9f767107d2f3323260df6377c151b8705de5fffd001febd21b9bb3d8fc278b56e52ddb47a081add9
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
deleted file mode 100644
index abb561982ba8..000000000000
--- a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index e3c34aa6fdbc..000000000000
--- a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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/files/libiscsi-1.18.0-fno-common.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch
deleted file mode 100644
index e5ce2f7bd493..000000000000
--- a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/708526
-Taken from: https://github.com/sahlberg/libiscsi/pull/307
-Author: wanghonghao <wanghonghao@bytedance.com>
---- a/include/iser-private.h
-+++ b/include/iser-private.h
-@@ -159,7 +159,7 @@ struct iser_tx_desc {
- struct iser_cm_hdr {
- 	uint8_t      flags;
- 	uint8_t      rsvd[3];
--} __packed;
-+};
- 
- struct iser_pdu {
- 	struct iscsi_pdu              iscsi_pdu;
diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
deleted file mode 100644
index 987544ffca68..000000000000
--- a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5fe1deb..9efe153 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -140,6 +140,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then
-     AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support])
- fi
- 
-+AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support]))
-+
- AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[
- AC_TRY_COMPILE([
- #include <infiniband/verbs.h>
-@@ -147,10 +149,10 @@ AC_TRY_COMPILE([
- #include <rdma/rdma_verbs.h>],
- [int ibv = IBV_WC_SEND;],
- libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)])
--if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then
-+if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then
-     AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support])
- fi
--AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes])
-+AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"])
- 
- AC_CACHE_CHECK([whether libcunit is available],
-                [ac_cv_have_cunit],
diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
deleted file mode 100644
index 1a4577e27a77..000000000000
--- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 ~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}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-fno-common-2.patch
-	"${FILESDIR}"/${P}-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
-}
diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild b/net-libs/libiscsi/libiscsi-1.20.0.ebuild
index 6dde9252b438..0c4f828655c5 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.20.0.ebuild
@@ -1,16 +1,24 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools
 
-if [[ ${PV} == *9999 ]] ; then
+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"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
+	if [[ ${PV} == *_p* ]]; then
+		# The S path is too long for the test suite otherwise.
+		inherit vcs-snapshot
+
+		MY_COMMIT=""
+		SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -20,8 +28,7 @@ HOMEPAGE="https://github.com/sahlberg/libiscsi"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 IUSE="rdma test"
-# test_9000_compareandwrite.sh failure needs investigation
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libgcrypt:=
@@ -31,26 +38,29 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-util/cunit )
 "
+BDEPEND="test? ( >=sys-block/tgt-1.0.58 )"
 
 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
-	"${FILESDIR}"/${PN}-1.19.0-fix-rdma-automagic.patch
-	"${WORKDIR}"/${P}-remove-ld-iscsi.patch
+	"${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch
 )
 
 src_prepare() {
 	default
+
+	# bug #906063
+	rm tests/test_0600_ipv6.sh || die
+
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--enable-manpages \
-		$(use_with rdma) \
-		--disable-werror \
+	local myeconfargs=(
+		--enable-manpages
+		--disable-werror
+		$(use_with rdma)
 		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {