* [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/files/, net-libs/libiscsi/
@ 2018-03-17 9:24 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-03-17 9:24 UTC (permalink / raw
To: gentoo-commits
commit: f4f8ec01121955d5aed48083915b35355f2c4c91
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 09:15:03 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 09:21:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f8ec01
net-libs/libiscsi: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-libs/libiscsi/Manifest | 2 --
...users-to-disable-Werror-at-configure-time.patch | 35 -------------------
net-libs/libiscsi/libiscsi-1.15.0.ebuild | 35 -------------------
net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild | 39 ----------------------
4 files changed, 111 deletions(-)
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index faa62a375ae..3b6663f831d 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,3 +1 @@
-DIST libiscsi-1.15.0.tar.gz 223380 BLAKE2B b5658422d51d51c8e8ec7294e627b89112a83f7448dc8eca2599befd5fca15995ea45dd011c6073d875f9e30be6daccb7ee222f785319a628c105a34857ff6c6 SHA512 22c566d4cf10454b9c6208d64f5dab8e32806a5036cd328f8b2d8bf14f9e9c2d519db8df4fc8884f468bad27d645ccf719502d49f6937eace88f590946366e06
DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
-DIST libiscsi-1.9.0.tar.gz 182123 BLAKE2B 258ba352fe2ecc52254efdc0c4c054d9a08b4aaaf7955e0e5730ce7e9bc823b4a4b0d57811bf64315dd6b8d9135d0c3797ee72b5fcbf476febad7f30ceee495f SHA512 cf88c0f32a21193499720d24f215fb02e7a46ef07999ef59cdad9cad14f92399b3d2e46e8e6f54574dc77225a5b437608216da242971e0d6f35c71830371415a
diff --git a/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch b/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch
deleted file mode 100644
index 31868ceab09..00000000000
--- a/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2d43a056a9e7b57bc03d580a850a8dca534e61d5 Mon Sep 17 00:00:00 2001
-From: Doug Goldstein <doug.goldstein@pikewerks.com>
-Date: Wed, 5 Jun 2013 14:28:48 -0500
-Subject: [PATCH] Allow users to disable -Werror at configure time
-
-Some users and distro packagers might not want to build with -Werror,
-this allows them to disable using -Werror but enables it in the default
-case so as to maintain the current behavior.
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d06e3a..6dce230 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,8 +11,14 @@ AC_CANONICAL_HOST
- AM_CONDITIONAL(LD_ISCSI,
- [expr "$host_os" : linux > /dev/null 2>&1])
-
-+AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror],
-+ [Disables building with -Werror by default])])
-+
- if test "$ac_cv_prog_gcc" = yes; then
-- WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror -Wno-strict-aliasing"
-+ WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Wno-strict-aliasing"
-+ if test "x$enable_werror" != "xno"; then
-+ WARN_CFLAGS="$WARN_CFLAGS -Werror"
-+ fi
- fi
- AC_SUBST(WARN_CFLAGS)
-
---
-1.8.2.1
-
diff --git a/net-libs/libiscsi/libiscsi-1.15.0.ebuild b/net-libs/libiscsi/libiscsi-1.15.0.ebuild
deleted file mode 100644
index 119afd5414e..00000000000
--- a/net-libs/libiscsi/libiscsi-1.15.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="iscsi client library and utilities"
-HOMEPAGE="https://github.com/sahlberg/libiscsi"
-SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-manpages \
- --disable-werror \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild
deleted file mode 100644
index 37483db963b..00000000000
--- a/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-inherit eutils autotools-utils
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
- KEYWORDS="~alpha ~hppa ~ppc64"
-else
- SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~hppa ~ppc64 x86"
-fi
-
-DESCRIPTION="iscsi client library and utilities"
-HOMEPAGE="https://github.com/sahlberg/libiscsi"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/ld_iscsi.so"
-
-myeconfargs=( "--disable-werror" )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-00*.patch
-
- epatch_user
-
- autotools-utils_src_prepare
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/files/, net-libs/libiscsi/
@ 2021-01-07 10:08 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2021-01-07 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 21c320c1a5455367d0df77c43005b26a8685cdff
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Jan 7 10:08:22 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 10:08:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c320c1
net-libs/libiscsi: Port to EAPI 7
* Disable static-libs
* Fix build with gcc-10
Closes: https://bugs.gentoo.org/708526
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/libiscsi-1.18.0-fno-common.patch | 14 +++++++++++++
net-libs/libiscsi/libiscsi-1.18.0.ebuild | 23 ++++++++++++++--------
2 files changed, 29 insertions(+), 8 deletions(-)
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
new file mode 100644
index 00000000000..e5ce2f7bd49
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch
@@ -0,0 +1,14 @@
+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/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
index 652b0b2953a..d5f2c942c2d 100644
--- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
@@ -1,22 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+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"
-SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="static-libs"
RDEPEND="dev-libs/libgcrypt:0="
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
src_prepare() {
default
eautoreconf
@@ -25,11 +32,11 @@ src_prepare() {
src_configure() {
econf \
--enable-manpages \
- --disable-werror \
- $(use_enable static-libs static)
+ --disable-static \
+ --disable-werror
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/files/, net-libs/libiscsi/
@ 2021-12-14 19:40 John Helmert III
0 siblings, 0 replies; 4+ messages in thread
From: John Helmert III @ 2021-12-14 19:40 UTC (permalink / raw
To: gentoo-commits
commit: cc263284ef21c967e53f1245482533c0353fd0b3
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 19:38:09 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 19:40:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc263284
net-libs/libiscsi: update EAPI 7 -> 8, fix rdma automagic
Closes: https://bugs.gentoo.org/829185
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
.../files/libiscsi-1.19.0-fix-rdma-automagic.patch | 26 +++++++++++
net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild | 51 ++++++++++++++++++++++
net-libs/libiscsi/metadata.xml | 3 ++
3 files changed, 80 insertions(+)
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
new file mode 100644
index 000000000000..987544ffca68
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
@@ -0,0 +1,26 @@
+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.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
new file mode 100644
index 000000000000..b44971289d2f
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="rdma"
+
+RDEPEND="dev-libs/libgcrypt:0=
+ rdma? ( sys-cluster/rdma-core )"
+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
+ "${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
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml
index fae5428e41b5..afb733ae6305 100644
--- a/net-libs/libiscsi/metadata.xml
+++ b/net-libs/libiscsi/metadata.xml
@@ -5,4 +5,7 @@
<upstream>
<remote-id type="github">sahlberg/libiscsi</remote-id>
</upstream>
+ <use>
+ <flag name="rdma">Enable infiniband support via <pkg>sys-fabric/librdmacm</pkg></flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/files/, net-libs/libiscsi/
@ 2024-10-07 12:58 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-10-07 12:58 UTC (permalink / raw
To: gentoo-commits
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 <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.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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-07 12:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-14 19:40 [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/files/, net-libs/libiscsi/ John Helmert III
-- strict thread matches above, loose matches on Subject: below --
2024-10-07 12:58 Joonas Niilola
2021-01-07 10:08 David Seifert
2018-03-17 9:24 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox