git: 9289343def2d - main - net/libiscsi: Update 1.20.0.240205 => 1.20.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Tue, 06 May 2025 17:39:14 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9289343def2dc178c035dbd203c14e81e7e3ca1c

commit 9289343def2dc178c035dbd203c14e81e7e3ca1c
Author:     Martin Birgmeier <d8zNeCFG@aon.at>
AuthorDate: 2025-05-06 17:24:42 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-06 17:35:37 +0000

    net/libiscsi: Update 1.20.0.240205 => 1.20.1
    
    Commit log:
    https://github.com/sahlberg/libiscsi/compare/1.20.1...1.20.2
    
    - Add libthr search to configure.ac.
    - Add STRIP_CMD as suggested by poudriere testport.
    - Refresh patches.
    - Bump consumers (emulators/qemu and emulators/qemu8) in next commmit
      because the soname is bumped.
    
    PR:             286546
    Co-authored-by: vvd
---
 net/libiscsi/Makefile                              |  5 ++---
 net/libiscsi/distinfo                              |  6 ++---
 net/libiscsi/files/patch-configure.ac              | 26 ++++++++++++++++++++--
 .../files/patch-include_iscsi-multithreading.h     | 12 ++++++++++
 net/libiscsi/files/patch-lib_multithreading.c      | 11 +++++++++
 net/libiscsi/files/patch-lib_socket.c              | 10 ++++-----
 net/libiscsi/files/patch-utils_iscsi-discard.c     |  2 +-
 net/libiscsi/pkg-plist                             |  4 ++--
 8 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/net/libiscsi/Makefile b/net/libiscsi/Makefile
index fa7e9b7ef526..2384d99953db 100644
--- a/net/libiscsi/Makefile
+++ b/net/libiscsi/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libiscsi
-DISTVERSION=	1.20.0.240205
+DISTVERSION=	1.20.1
 CATEGORIES=	net
 
 MAINTAINER=	d8zNeCFG@aon.at
@@ -14,13 +14,12 @@ LICENSE_FILE_LGPL21+ =	${WRKSRC}/LICENCE-LGPL-2.1.txt
 USES=		autoreconf compiler:c11 gmake libtool pathfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	sahlberg
-GH_TAGNAME=	fef688aa9980
 
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.10.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.11.0.0
 
 .include <bsd.port.mk>
diff --git a/net/libiscsi/distinfo b/net/libiscsi/distinfo
index 00f17b720f5b..9144771bb827 100644
--- a/net/libiscsi/distinfo
+++ b/net/libiscsi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711120874
-SHA256 (sahlberg-libiscsi-1.20.0.240205-fef688aa9980_GH0.tar.gz) = c600d951c86ea496374df2054f0bf602923870aef76922bcd68d20d83e302804
-SIZE (sahlberg-libiscsi-1.20.0.240205-fef688aa9980_GH0.tar.gz) = 302430
+TIMESTAMP = 1746280868
+SHA256 (sahlberg-libiscsi-1.20.1_GH0.tar.gz) = 6bd6feef2904de1bb1869cec935b58995bc1311cad57184a2221e09ed6137eec
+SIZE (sahlberg-libiscsi-1.20.1_GH0.tar.gz) = 323554
diff --git a/net/libiscsi/files/patch-configure.ac b/net/libiscsi/files/patch-configure.ac
index ddf9df4dee23..0c94e2655838 100644
--- a/net/libiscsi/files/patch-configure.ac
+++ b/net/libiscsi/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2024-02-05 23:51:38 UTC
+--- configure.ac.orig	2025-05-03 00:02:42 UTC
 +++ configure.ac
-@@ -170,7 +170,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@@ -205,7 +205,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  #include <infiniband/verbs.h>
  #include <rdma/rdma_cma.h>
@@ -10,3 +10,25 @@
  [[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
+@@ -229,6 +230,21 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test x$libiscsi_cv_HAV
+ 	   AC_DEFINE(HAVE_MULTITHREADING,1,[Whether we have multithreading support])
+ 	fi
+ AM_CONDITIONAL([HAVE_PTHREAD], [test x$libiscsi_cv_HAVE_PTHREAD = xyes])
++
++AC_CACHE_CHECK([whether libthr is available],
++               [ac_cv_have_thr],
++               [ac_save_CFLAGS="$CFLAGS"
++                ac_save_LIBS="$LIBS"
++                CFLAGS="$CFLAGS $GLIB_CFLAGS"
++                LIBS="$GLIB_LIBS $LIBS -lthr"
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                    #include <pthread.h>
++                    ]], [[]])],[ac_cv_have_thr=yes],[ac_cv_have_thr=no])
++                CFLAGS="$ac_save_CFLAGS"
++                LIBS="$ac_save_LIBS"])
++if test "$ac_cv_have_thr" = yes ; then
++	LIBS="$LIBS -lthr"
++fi
+ 
+ AC_CACHE_CHECK([whether libcunit is available],
+                [ac_cv_have_cunit],
diff --git a/net/libiscsi/files/patch-include_iscsi-multithreading.h b/net/libiscsi/files/patch-include_iscsi-multithreading.h
new file mode 100644
index 000000000000..455692032244
--- /dev/null
+++ b/net/libiscsi/files/patch-include_iscsi-multithreading.h
@@ -0,0 +1,12 @@
+--- include/iscsi-multithreading.h.orig	2025-05-03 00:02:42 UTC
++++ include/iscsi-multithreading.h
+@@ -46,6 +46,9 @@ typedef uint64_t iscsi_tid_t;
+ #endif
+ #ifdef HAVE_PTHREAD_THREADID_NP
+ typedef uint64_t iscsi_tid_t;
++#elif defined(__FreeBSD__)
++#include <pthread_np.h>
++typedef int iscsi_tid_t;
+ #else
+ typedef pid_t iscsi_tid_t;
+ #endif
diff --git a/net/libiscsi/files/patch-lib_multithreading.c b/net/libiscsi/files/patch-lib_multithreading.c
new file mode 100644
index 000000000000..48f51331ce5d
--- /dev/null
+++ b/net/libiscsi/files/patch-lib_multithreading.c
@@ -0,0 +1,11 @@
+--- lib/multithreading.c.orig	2025-05-03 00:02:42 UTC
++++ lib/multithreading.c
+@@ -154,6 +154,8 @@ iscsi_tid_t iscsi_mt_get_tid(void)
+ #elif defined(SYS_gettid)
+         pid_t tid = syscall(SYS_gettid);
+         return tid;
++#elif defined(__FreeBSD__)
++	return pthread_getthreadid_np();
+ #else
+ #error "SYS_gettid unavailable on this system"
+ #endif
diff --git a/net/libiscsi/files/patch-lib_socket.c b/net/libiscsi/files/patch-lib_socket.c
index 25ed1fdaece0..73abffcea2e6 100644
--- a/net/libiscsi/files/patch-lib_socket.c
+++ b/net/libiscsi/files/patch-lib_socket.c
@@ -1,15 +1,15 @@
---- lib/socket.c.orig	2024-02-05 23:51:38 UTC
+--- lib/socket.c.orig	2025-05-03 00:02:42 UTC
 +++ lib/socket.c
-@@ -140,7 +140,7 @@ iscsi_add_to_outqueue(struct iscsi_context *iscsi, str
- 	pdu->next = NULL;
+@@ -162,7 +162,7 @@ iscsi_add_to_outqueue(struct iscsi_context *iscsi, str
+         return;
  }
  
 -void iscsi_decrement_iface_rr() {
 +void iscsi_decrement_iface_rr(void) {
+         /* TODO QQQ use an atomic here */
  	iface_rr--;
  }
- 
-@@ -531,7 +531,7 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscs
+@@ -579,7 +579,7 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscs
  
  	if (pos < iovector->offset) {
  		iscsi_set_error(iscsi, "%s: iovector reset. pos(%d) is smaller than"
diff --git a/net/libiscsi/files/patch-utils_iscsi-discard.c b/net/libiscsi/files/patch-utils_iscsi-discard.c
index a1452a04ac04..f81134c17c76 100644
--- a/net/libiscsi/files/patch-utils_iscsi-discard.c
+++ b/net/libiscsi/files/patch-utils_iscsi-discard.c
@@ -1,4 +1,4 @@
---- utils/iscsi-discard.c.orig	2024-02-05 23:51:38 UTC
+--- utils/iscsi-discard.c.orig	2025-05-03 00:02:42 UTC
 +++ utils/iscsi-discard.c
 @@ -220,7 +220,11 @@ int main(int argc, char *argv[])
  
diff --git a/net/libiscsi/pkg-plist b/net/libiscsi/pkg-plist
index 9dde0241b0ac..237fe5d52a92 100644
--- a/net/libiscsi/pkg-plist
+++ b/net/libiscsi/pkg-plist
@@ -10,8 +10,8 @@ include/iscsi/iscsi.h
 include/iscsi/scsi-lowlevel.h
 lib/libiscsi.a
 lib/libiscsi.so
-lib/libiscsi.so.10
-lib/libiscsi.so.10.0.0
+lib/libiscsi.so.11
+lib/libiscsi.so.11.0.0
 libdata/pkgconfig/libiscsi.pc
 share/man/man1/iscsi-inq.1.gz
 share/man/man1/iscsi-ls.1.gz