CVS commit: pkgsrc/net/libiscsi

"Adam Ciarcinski" <[email protected]> Fri, 7 Aug 2026 08:14:45 +0000

Newsgroups	gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID	<[email protected]>

Module Name:	pkgsrc
Committed By:	adam
Date:		Fri Aug  7 08:14:45 UTC 2026

Modified Files:
	pkgsrc/net/libiscsi: Makefile PLIST distinfo
Added Files:
	pkgsrc/net/libiscsi/patches: patch-include_sha.h
	    patch-lib_multithreading.c
Removed Files:
	pkgsrc/net/libiscsi/patches: patch-configure.ac

Log Message:
libiscsi: updated to 1.20.3

1.20.3

When queueing the first PDU to an idle socket, immediately try to write
it to the socket instead of waiting for the event-loop to
timeout/notice there is work to do.

Various other small bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/libiscsi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/libiscsi/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/libiscsi/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/libiscsi/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libiscsi/patches/patch-include_sha.h \
    pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

(unnamed) (text/x-diff, 5.3 KB)

Modified files:

Index: pkgsrc/net/libiscsi/Makefile
diff -u pkgsrc/net/libiscsi/Makefile:1.2 pkgsrc/net/libiscsi/Makefile:1.3
--- pkgsrc/net/libiscsi/Makefile:1.2	Mon Jul 25 11:12:27 2022
+++ pkgsrc/net/libiscsi/Makefile	Fri Aug  7 08:14:44 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2022/07/25 11:12:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2026/08/07 08:14:44 adam Exp $
 
-DISTNAME=	libiscsi-1.19.0
+DISTNAME=	libiscsi-1.20.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sahlberg/}
 
@@ -9,12 +9,13 @@ HOMEPAGE=	https://github.com/sahlberg/li
 COMMENT=	iscsi client library and utilities
 LICENSE=	gnu-lgpl-v2.1
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	aclocal autoconf automake autoreconf gmake
-
+USE_LIBTOOL=		yes
+USE_TOOLS+=		aclocal autoconf automake autoreconf gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-werror
 PKGCONFIG_OVERRIDE+=	libiscsi.pc.in
-BUILDLINK_TRANSFORM+=	rm:-Werror
+
+LIBS.NetBSD+=	-lpthread -lrt
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf -if

Index: pkgsrc/net/libiscsi/PLIST
diff -u pkgsrc/net/libiscsi/PLIST:1.1 pkgsrc/net/libiscsi/PLIST:1.2
--- pkgsrc/net/libiscsi/PLIST:1.1	Fri Mar 13 13:21:39 2020
+++ pkgsrc/net/libiscsi/PLIST	Fri Aug  7 08:14:44 2026
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2020/03/13 13:21:39 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/08/07 08:14:44 adam Exp $
+bin/iscsi-discard
 bin/iscsi-inq
 bin/iscsi-ls
+bin/iscsi-md5sum
 bin/iscsi-perf
+bin/iscsi-pr
 bin/iscsi-readcapacity16
+bin/iscsi-rtpg
 bin/iscsi-swp
 include/iscsi/iscsi.h
 include/iscsi/scsi-lowlevel.h
@@ -10,5 +14,6 @@ lib/libiscsi.la
 lib/pkgconfig/libiscsi.pc
 man/man1/iscsi-inq.1
 man/man1/iscsi-ls.1
+man/man1/iscsi-md5sum.1
 man/man1/iscsi-swp.1
 man/man1/iscsi-test-cu.1

Index: pkgsrc/net/libiscsi/distinfo
diff -u pkgsrc/net/libiscsi/distinfo:1.4 pkgsrc/net/libiscsi/distinfo:1.5
--- pkgsrc/net/libiscsi/distinfo:1.4	Tue Oct 26 11:05:54 2021
+++ pkgsrc/net/libiscsi/distinfo	Fri Aug  7 08:14:44 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:05:54 nia Exp $
+$NetBSD: distinfo,v 1.5 2026/08/07 08:14:44 adam Exp $
 
-BLAKE2s (libiscsi-1.19.0.tar.gz) = de0bce0acdbb34988dd4bf69e9dd6845e47eda6123dc1ffc4e493a4ed045a35d
-SHA512 (libiscsi-1.19.0.tar.gz) = 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
-Size (libiscsi-1.19.0.tar.gz) = 284969 bytes
-SHA1 (patch-configure.ac) = 44b797fae92942ba6886b7ed5d158fd920aab9a5
+BLAKE2s (libiscsi-1.20.3.tar.gz) = 49df8577055ab6a5789bef3d6650f2cc87674e845b4fc5ce46b4db47e84ab1aa
+SHA512 (libiscsi-1.20.3.tar.gz) = 3ce33c028dc92b902d08e30dd6ec71ca7eff9f729c7a62fd463d687286a10b068327ddc9a929b0102fcd0483a755370d2194af6f7ba65e66d17ac571b44b4ae9
+Size (libiscsi-1.20.3.tar.gz) = 327211 bytes
+SHA1 (patch-include_sha.h) = e6ba3b5b48fa9f69b125696caccc7dd74a1c28fa
+SHA1 (patch-lib_multithreading.c) = c7b21dc62b517e5d4d727a384ea2ff352381530f

Added files:

Index: pkgsrc/net/libiscsi/patches/patch-include_sha.h
diff -u /dev/null pkgsrc/net/libiscsi/patches/patch-include_sha.h:1.1
--- /dev/null	Fri Aug  7 08:14:45 2026
+++ pkgsrc/net/libiscsi/patches/patch-include_sha.h	Fri Aug  7 08:14:45 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-include_sha.h,v 1.1 2026/08/07 08:14:45 adam Exp $
+
+Comment out unused hmac definions to avoid conflict on NetBSD.
+
+--- include/sha.h.orig	2026-08-07 07:44:14.462361966 +0000
++++ include/sha.h
+@@ -305,6 +305,7 @@ extern int USHAHashSizeBits (enum SHAversion whichSha)
+ extern int USHAHashSize (enum SHAversion whichSha);
+ extern int USHAHashSizeBits (enum SHAversion whichSha);
+ 
++#if 0
+ /*
+  * HMAC Keyed-Hashing for Message Authentication, RFC2104,
+  * for all SHAs.
+@@ -330,5 +331,6 @@ extern int hmacResult (HMACContext * ctx, uint8_t *dig
+ extern int hmacFinalBits (HMACContext * ctx, const uint8_t bits,
+ 			  size_t bitcount);
+ extern int hmacResult (HMACContext * ctx, uint8_t *digest);
++#endif
+ 
+ #endif /* _SHA_H_ */
Index: pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c
diff -u /dev/null pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c:1.1
--- /dev/null	Fri Aug  7 08:14:45 2026
+++ pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c	Fri Aug  7 08:14:45 2026
@@ -0,0 +1,36 @@
+$NetBSD: patch-lib_multithreading.c,v 1.1 2026/08/07 08:14:45 adam Exp $
+
+Add thread id retrieval for FreeBSD/DragonFly, OpenBSD and NetBSD.
+https://github.com/sahlberg/libiscsi/pull/466
+
+--- lib/multithreading.c.orig	2025-07-15 09:27:12.000000000 +0000
++++ lib/multithreading.c
+@@ -144,6 +144,12 @@ int iscsi_mt_sem_wait(libiscsi_sem_t* se
+ #include <signal.h>
+ #include <unistd.h>
+ #include <sys/syscall.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <pthread_np.h>
++#endif
++#if defined(__NetBSD__)
++#include <lwp.h>
++#endif
+ 
+ iscsi_tid_t iscsi_mt_get_tid(void)
+ {
+@@ -151,6 +157,15 @@ iscsi_tid_t iscsi_mt_get_tid(void)
+         iscsi_tid_t tid;
+         pthread_threadid_np(NULL, &tid);
+         return tid;
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
++        int tid = pthread_getthreadid_np();
++        return tid;
++#elif defined(__OpenBSD__)
++        pid_t tid = getthrid();
++        return tid;
++#elif defined(__NetBSD__)
++        lwpid_t tid = _lwp_self();
++        return tid;
+ #elif defined(SYS_gettid)
+         pid_t tid = syscall(SYS_gettid);
+         return tid;