CVS commit: pkgsrc/net/libiscsi

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep  9 11:58:13 UTC 2026

Modified Files:
        pkgsrc/net/libiscsi: distinfo
        pkgsrc/net/libiscsi/patches: patch-lib_multithreading.c

Log Message:
libiscsi: Extend patch to support illumos too.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/libiscsi/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.

Modified files:

Index: pkgsrc/net/libiscsi/distinfo
diff -u pkgsrc/net/libiscsi/distinfo:1.5 pkgsrc/net/libiscsi/distinfo:1.6
--- pkgsrc/net/libiscsi/distinfo:1.5    Fri Aug  7 08:14:44 2026
+++ pkgsrc/net/libiscsi/distinfo        Wed Sep  9 11:58:12 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2026/08/07 08:14:44 adam Exp $
+$NetBSD: distinfo,v 1.6 2026/09/09 11:58:12 jperkin Exp $
 
 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
+SHA1 (patch-lib_multithreading.c) = 3fed6d37794e3e24ea169564a4d933e3b0bf7f16

Index: pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c
diff -u pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c:1.1 pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c:1.2
--- pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c:1.1  Fri Aug  7 08:14:45 2026
+++ pkgsrc/net/libiscsi/patches/patch-lib_multithreading.c      Wed Sep  9 11:58:13 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_multithreading.c,v 1.1 2026/08/07 08:14:45 adam Exp $
+$NetBSD: patch-lib_multithreading.c,v 1.2 2026/09/09 11:58:13 jperkin 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
+@@ -144,6 +144,15 @@ int iscsi_mt_sem_wait(libiscsi_sem_t* se
  #include <signal.h>
  #include <unistd.h>
  #include <sys/syscall.h>
@@ -15,10 +15,13 @@ https://github.com/sahlberg/libiscsi/pul
 +#if defined(__NetBSD__)
 +#include <lwp.h>
 +#endif
++#if defined(__illumos__)
++#include <thread.h>
++#endif
  
  iscsi_tid_t iscsi_mt_get_tid(void)
  {
-@@ -151,6 +157,15 @@ iscsi_tid_t iscsi_mt_get_tid(void)
+@@ -151,6 +160,18 @@ iscsi_tid_t iscsi_mt_get_tid(void)
          iscsi_tid_t tid;
          pthread_threadid_np(NULL, &tid);
          return tid;
@@ -31,6 +34,9 @@ https://github.com/sahlberg/libiscsi/pul
 +#elif defined(__NetBSD__)
 +        lwpid_t tid = _lwp_self();
 +        return tid;
++#elif defined(__illumos__)
++      thread_t tid = thr_self();
++      return tid;
  #elif defined(SYS_gettid)
          pid_t tid = syscall(SYS_gettid);
          return tid;