Attachment #240097 for bug #269502




PORTNAME=	libiscsi
DISTVERSION=	1.19.0.230208
CATEGORIES=	net

MAINTAINER=	d8zNeCFG@aon.at

LICENSE_FILE_LGPL21+  =	${WRKSRC}/LICENCE-LGPL-2.1.txt
LICENSE_FILE_GPLv2+   =	${WRKSRC}/LICENCE-GPL-2.txt

USES=		autoreconf compiler:c11 gmake libtool pathfix
USE_GITHUB=	yes
USE_LDCONFIG=	yes

GH_ACCOUNT=	sahlberg
GH_TAGNAME=	22f7b2656776

GNU_CONFIGURE=	yes


Lines 1-3 Link Here

(-)b/net/libiscsi/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1588264800	1	TIMESTAMP = 1676144386
2	SHA256 (sahlberg-libiscsi-1.19.0_GH0.tar.gz) = c7848ac722c8361d5064654bc6e926c2be61ef11dd3875020a63931836d806df	2	SHA256 (sahlberg-libiscsi-1.19.0.230208-22f7b2656776_GH0.tar.gz) = e4560a88fc37465ac1ec43354c788141fac4cd459be039ee78df6a49b586b035
3	SIZE (sahlberg-libiscsi-1.19.0_GH0.tar.gz) = 284969	3	SIZE (sahlberg-libiscsi-1.19.0.230208-22f7b2656776_GH0.tar.gz) = 293039




--- ./configure.ac.ORIG	2023-02-11 20:12:38.532565000 +0100
+++ ./configure.ac	2023-02-11 20:14:27.194137000 +0100
@@ -170,7 +170,8 @@
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <infiniband/verbs.h>
 #include <rdma/rdma_cma.h>
-#include <rdma/rdma_verbs.h>]],
+#include <rdma/rdma_verbs.h>
+#error not on FreeBSD]],
 [[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




--- lib/login.c.orig	2019-07-13 22:04:44 UTC
+++ lib/login.c
@@ -1242,11 +1242,11 @@ iscsi_process_login_reply(struct iscsi_context *iscsi,
 
         /* iSER specific keys */
         if (!strncmp(ptr, "InitiatorRecvDataSegmentLength=", 31)) {
-			iscsi->initiator_max_recv_data_segment_length = MIN(strtol(ptr + 31, NULL, 10),
+			iscsi->initiator_max_recv_data_segment_length = MIN(strtoul(ptr + 31, NULL, 10),
                                                              iscsi->initiator_max_recv_data_segment_length);
         }
         if (!strncmp(ptr, "TargetRecvDataSegmentLength=", 28)) {
-			iscsi->target_max_recv_data_segment_length = MIN(strtol(ptr + 28, NULL, 10),
+			iscsi->target_max_recv_data_segment_length = MIN(strtoul(ptr + 28, NULL, 10),
                                                              iscsi->target_max_recv_data_segment_length);
         }
 

Lines 1-6 Link Here

(-)b/net/libiscsi/pkg-plist (+1 lines)
1	bin/iscsi-inq	1	bin/iscsi-inq
2	bin/iscsi-ls	2	bin/iscsi-ls
3	bin/iscsi-perf	3	bin/iscsi-perf
		4	bin/iscsi-pr
4	bin/iscsi-readcapacity16	5	bin/iscsi-readcapacity16
5	bin/iscsi-swp	6	bin/iscsi-swp
6	include/iscsi/iscsi.h	7	include/iscsi/iscsi.h

Return to bug 269502

Lines 1-5 Link Here

(-)b/net/libiscsi/Makefile (-2 / +3 lines)
1	PORTNAME= libiscsi	1	PORTNAME= libiscsi
2	DISTVERSION= 1.19.0	2	DISTVERSION= 1.19.0.230208
3	CATEGORIES= net	3	CATEGORIES= net
4		4
5	MAINTAINER= d8zNeCFG@aon.at	5	MAINTAINER= d8zNeCFG@aon.at
Lines 11-21 LICENSE_COMB= multi Link Here
11	LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENCE-LGPL-2.1.txt	11	LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENCE-LGPL-2.1.txt
12	LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENCE-GPL-2.txt	12	LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENCE-GPL-2.txt
13		13
14	USES= autoreconf compiler:c11 libtool pathfix	14	USES= autoreconf compiler:c11 gmake libtool pathfix
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17		17
18	GH_ACCOUNT= sahlberg	18	GH_ACCOUNT= sahlberg
		19	GH_TAGNAME= 22f7b2656776
19		20
20	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
21		22

Lines 1-12 Link Here

(-)b/net/libiscsi/files/patch-configure.ac (-8 / +8 lines)
1	--- configure.ac.orig 2019-07-13 22:04:44 UTC	1	--- ./configure.ac.ORIG 2023-02-11 20:12:38.532565000 +0100
2	+++ configure.ac	2	+++ ./configure.ac 2023-02-11 20:14:27.194137000 +0100
3	@@ -144,7 +144,8 @@ AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LIN	3	@@ -170,7 +170,8 @@
4	AC_TRY_COMPILE([	4	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
5	#include <infiniband/verbs.h>	5	#include <infiniband/verbs.h>
6	#include <rdma/rdma_cma.h>	6	#include <rdma/rdma_cma.h>
7	-#include <rdma/rdma_verbs.h>],	7	-#include <rdma/rdma_verbs.h>]],
8	+#include <rdma/rdma_verbs.h>	8	+#include <rdma/rdma_verbs.h>
9	+#error not on FreeBSD],	9	+#error not on FreeBSD]],
10	[int ibv = IBV_WC_SEND;],	10	[[int ibv = IBV_WC_SEND;]])],
11	libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)])	11	[libiscsi_cv_HAVE_LINUX_ISER=yes],[libiscsi_cv_HAVE_LINUX_ISER=no])])
12	if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then	12	if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then

Removed Link Here

(-)a/net/libiscsi/files/patch-lib_login.c (-16 lines)
1	--- lib/login.c.orig 2019-07-13 22:04:44 UTC
2	+++ lib/login.c
3	@@ -1242,11 +1242,11 @@ iscsi_process_login_reply(struct iscsi_context *iscsi,
4
5	/* iSER specific keys */
6	if (!strncmp(ptr, "InitiatorRecvDataSegmentLength=", 31)) {
7	- iscsi->initiator_max_recv_data_segment_length = MIN(strtol(ptr + 31, NULL, 10),
8	+ iscsi->initiator_max_recv_data_segment_length = MIN(strtoul(ptr + 31, NULL, 10),
9	iscsi->initiator_max_recv_data_segment_length);
10	}
11	if (!strncmp(ptr, "TargetRecvDataSegmentLength=", 28)) {
12	- iscsi->target_max_recv_data_segment_length = MIN(strtol(ptr + 28, NULL, 10),
13	+ iscsi->target_max_recv_data_segment_length = MIN(strtoul(ptr + 28, NULL, 10),
14	iscsi->target_max_recv_data_segment_length);
15	}
16