commit: a7c870fa625a7be30b37f28abdc8903d55bdb40b Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Thu Sep 5 18:22:41 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Oct 7 12:55:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c870fa
net-libs/libiscsi: drop old Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-libs/libiscsi/Manifest | 3 -- .../files/libiscsi-1.18.0-fno-common-2.patch | 53 ------------------ .../files/libiscsi-1.18.0-fno-common-3.patch | 34 ------------ .../files/libiscsi-1.18.0-fno-common.patch | 14 ----- .../files/libiscsi-1.19.0-fix-rdma-automagic.patch | 26 --------- net-libs/libiscsi/libiscsi-1.18.0.ebuild | 46 ---------------- net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild | 63 ---------------------- 7 files changed, 239 deletions(-) diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest index 4973396f00fe..f5cd486396a8 100644 --- a/net-libs/libiscsi/Manifest +++ b/net-libs/libiscsi/Manifest @@ -1,4 +1 @@ -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 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> ---- 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.19.0-r2.ebuild deleted file mode 100644 index 6dde9252b438..000000000000 --- a/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="iscsi client library and utilities" -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" - -RDEPEND=" - dev-libs/libgcrypt:= - rdma? ( sys-cluster/rdma-core ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cunit ) -" - -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 -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --enable-manpages \ - $(use_with rdma) \ - --disable-werror \ - $(use_enable test tests) -} - -src_test() { - emake -C tests test -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -}
