suricata: attempt to fix cpu set creation

[kami (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kami <kisskamizeg%gmail.com@localhost>
Pushed By:	kami
Date:		Thu Oct 2 22:06:15 2025 +0200
Changeset:	e62c13563a1b1e967ee0f2bdd3c22411a53dafff

Modified Files:
	suricata/distinfo
	suricata/patches/patch-src_tm-threads.c
	suricata/patches/patch-src_util-affinity.c
	suricata/patches/patch-src_util-affinity.h

Log Message:
suricata: attempt to fix cpu set creation

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e62c13563a1b1e967ee0f2bdd3c22411a53dafff

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

diffstat:
 suricata/distinfo                          |  6 +++---
 suricata/patches/patch-src_tm-threads.c    |  6 ++++--
 suricata/patches/patch-src_util-affinity.c | 25 ++++++++++++++++++++++---
 suricata/patches/patch-src_util-affinity.h |  5 +++--
 4 files changed, 32 insertions(+), 10 deletions(-)

diffs:
diff --git a/suricata/distinfo b/suricata/distinfo
index f52a21cf42..5f667dea03 100644
--- a/suricata/distinfo
+++ b/suricata/distinfo
@@ -5,10 +5,10 @@ SHA512 (suricata-8.0.1.tar.gz) = e87c2049b783c9d4c6b688b84e67330fb4600911a2ae222
 Size (suricata-8.0.1.tar.gz) = 44098838 bytes
 SHA1 (patch-configure) = 379edddcef392fecd2d1f3cb2a66b2223a0fca33
 SHA1 (patch-src_threads.h) = bd3764e1ac575d2b2c7b6b88ea2dbd93c3c5a4cb
-SHA1 (patch-src_tm-threads.c) = cf2e747c3c26f72844184baf8dbdbf1aa9407665
+SHA1 (patch-src_tm-threads.c) = e3b905eac1de82b2af71cacce6c7395a61c156b1
 SHA1 (patch-src_unix-manager.c) = d5e64cff26de3865c0939383aa72011dd1cbf8d2
-SHA1 (patch-src_util-affinity.c) = eae96313d1f1978836373d2db19aca5507d6bdc4
-SHA1 (patch-src_util-affinity.h) = a5ede16436ae6b1d28615726bf8afa4a94159694
+SHA1 (patch-src_util-affinity.c) = d8856001e407eda237350f31473868bf3903bca1
+SHA1 (patch-src_util-affinity.h) = b691db63af11a8c05e6be2afb20879a67e76e8a8
 SHA1 (patch-src_util-byte.h) = 2f4dd27b60eccc55a684d513765346bdbd120552
 SHA1 (patch-src_util-fmemopen.c) = 49e52146820ff96dc6f257b1a348bf1805eed25b
 SHA1 (patch-src_util-fmemopen.h) = fa6ac320e7b31af2d7126f14fabb29327ac10e28
diff --git a/suricata/patches/patch-src_tm-threads.c b/suricata/patches/patch-src_tm-threads.c
index fdac01aafa..ae84751847 100644
--- a/suricata/patches/patch-src_tm-threads.c
+++ b/suricata/patches/patch-src_tm-threads.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 --- src/tm-threads.c.orig	2025-09-16 02:07:13.000000000 +0000
 +++ src/tm-threads.c
-@@ -65,13 +65,15 @@ thread_local uint64_t rwr_lock_wait_tick
+@@ -65,14 +65,16 @@ thread_local uint64_t rwr_lock_wait_tick
  thread_local uint64_t rwr_lock_cnt;
  #endif
  
@@ -14,11 +14,13 @@ $NetBSD$
  #include <sys/cpuset.h>
  #include <sys/thr.h>
  #define cpu_set_t cpuset_t
+-#endif /* OS_FREEBSD */
 +#elif defined __NetBSD__
 +#include <err.h>
- #endif /* OS_FREEBSD */
++#endif /* OS_FREEBSD __NetBSD__ */
  
  /* prototypes */
+ static int SetCPUAffinity(uint16_t cpu);
 @@ -705,6 +707,8 @@ static int SetCPUAffinitySet(cpu_set_t *
  #if defined OS_FREEBSD
      int r = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID,
diff --git a/suricata/patches/patch-src_util-affinity.c b/suricata/patches/patch-src_util-affinity.c
index b4c0dd1433..af66eceac8 100644
--- a/suricata/patches/patch-src_util-affinity.c
+++ b/suricata/patches/patch-src_util-affinity.c
@@ -2,11 +2,29 @@ $NetBSD$
 
 --- src/util-affinity.c.orig	2025-09-16 02:07:13.000000000 +0000
 +++ src/util-affinity.c
-@@ -35,6 +35,18 @@
+@@ -35,6 +35,37 @@
  #include "util-dpdk.h"
  #include "util-unittest.h"
  
-+#if defined __NetBSD_ && defined UNITTESTS
++#ifdef __NetBSD__
++
++#include "util-debug.h"
++
++void cpuZero(cpu_set_t *cset) {
++  if(*cset == NULL) {
++    // if the cpu set inst crated yet - create it
++    cpuset_t *new_cset = cpuset_create();
++    if(new_cset == NULL) {
++      FatalError("Error creating cpu set in cpuZero");
++      //      warnc(EXIT_FAILURE, "cpuset_create");
++      return;
++    }
++    *cset = new_cset;
++  }
++  cpuset_zero(*cset);
++}
++
++#ifdef UNITTESTS
 +int cpuCount(cpu_set_t *cset) {
 +  int c = 0;
 +  for (int i = 0; i < MAX_CPU_SET; i++) {
@@ -16,7 +34,8 @@ $NetBSD$
 +}
 +
 +#define CPU_COUNT(cset) (cpuCount(cset))
-+#endif
++#endif /* UNITTESTS */
++#endif /* __NetBSD__ */
 +
  ThreadsAffinityType thread_affinity[MAX_CPU_SET] = {
      {
diff --git a/suricata/patches/patch-src_util-affinity.h b/suricata/patches/patch-src_util-affinity.h
index f2ef1fef0f..91d3af1f76 100644
--- a/suricata/patches/patch-src_util-affinity.h
+++ b/suricata/patches/patch-src_util-affinity.h
@@ -2,7 +2,7 @@ $NetBSD$
 
 --- src/util-affinity.h.orig	2025-09-16 02:07:13.000000000 +0000
 +++ src/util-affinity.h
-@@ -43,6 +43,13 @@
+@@ -43,6 +43,14 @@
  #include <sched.h>
  #include <sys/param.h>
  #include <sys/resource.h>
@@ -12,7 +12,8 @@ $NetBSD$
 +#define cpu_set_t cpuset_t *
 +#define CPU_SET(cpu_id, cset) (cpuset_set(cpu_id, *cset))
 +#define CPU_ISSET(cpu_id, cset) (cpuset_isset(cpu_id, *cset) > 0)
-+#define CPU_ZERO(cset) (cpuset_zero(*cset))
++void cpuZero(cpu_set_t *cset);
++#define CPU_ZERO(cset) (cpuZero(cset))
  #elif defined OS_DARWIN
  #include <mach/mach.h>
  #include <mach/mach_init.h>