pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
suricata: use "fmem wrapper", fix chmod on socket func, update TODO
Module Name: pkgsrc-wip
Committed By: kami <kisskamizeg%gmail.com@localhost>
Pushed By: kami
Date: Wed Sep 24 22:29:42 2025 +0200
Changeset: a94e4326000ee8d05dd78a11a31cc878282e6428
Modified Files:
suricata/TODO
suricata/distinfo
suricata/patches/patch-src_util-ioctl.c
Added Files:
suricata/patches/patch-src_unix-manager.c
suricata/patches/patch-src_util-fmemopen.c
suricata/patches/patch-src_util-fmemopen.h
Log Message:
suricata: use "fmem wrapper", fix chmod on socket func, update TODO
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a94e4326000ee8d05dd78a11a31cc878282e6428
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
suricata/TODO | 13 +++++++------
suricata/distinfo | 5 ++++-
suricata/patches/patch-src_unix-manager.c | 13 +++++++++++++
suricata/patches/patch-src_util-fmemopen.c | 26 ++++++++++++++++++++++++++
suricata/patches/patch-src_util-fmemopen.h | 15 +++++++++++++++
suricata/patches/patch-src_util-ioctl.c | 2 +-
6 files changed, 66 insertions(+), 8 deletions(-)
diffs:
diff --git a/suricata/TODO b/suricata/TODO
index 00e6afd328..306a74c1dc 100644
--- a/suricata/TODO
+++ b/suricata/TODO
@@ -2,19 +2,20 @@
#+title: TODO for Suricata 8 package
* Makefile
-- pkgconfig overrides for rust/vendor/libz-sys not enabled yet
- - probably needs patches
-
+- check rust/vendor/* need
+
* Configure
- libunwind and dev header not found
- check not found includes, features that exists on NetBSD
and add support
-* Build
+* Build / porting
- revise creation and use of cpu sets
-
+
* Tests
-- run tests, evaluate and fix them
+- enable and run tests, evaluate and fix them
- run executables, fix errors
+* Package
+
* Install
diff --git a/suricata/distinfo b/suricata/distinfo
index a166e40724..ecdc83bfa1 100644
--- a/suricata/distinfo
+++ b/suricata/distinfo
@@ -6,6 +6,9 @@ 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_unix-manager.c) = d5e64cff26de3865c0939383aa72011dd1cbf8d2
SHA1 (patch-src_util-affinity.h) = a5ede16436ae6b1d28615726bf8afa4a94159694
SHA1 (patch-src_util-byte.h) = 2f4dd27b60eccc55a684d513765346bdbd120552
-SHA1 (patch-src_util-ioctl.c) = 00b8a07ebeea7e386fc5a24b79bbca0d3bf0494c
+SHA1 (patch-src_util-fmemopen.c) = 49e52146820ff96dc6f257b1a348bf1805eed25b
+SHA1 (patch-src_util-fmemopen.h) = fa6ac320e7b31af2d7126f14fabb29327ac10e28
+SHA1 (patch-src_util-ioctl.c) = 40692c8a73c8de544740258eb347f068f563c8e3
diff --git a/suricata/patches/patch-src_unix-manager.c b/suricata/patches/patch-src_unix-manager.c
new file mode 100644
index 0000000000..aa7578c0c1
--- /dev/null
+++ b/suricata/patches/patch-src_unix-manager.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/unix-manager.c.orig 2025-09-16 02:07:13.000000000 +0000
++++ src/unix-manager.c
+@@ -186,7 +186,7 @@ static int UnixNew(UnixCommand * this)
+ return 0;
+ }
+
+-#if !(defined OS_FREEBSD || defined __OpenBSD__)
++#if !(defined OS_FREEBSD || defined __OpenBSD__ || defined __NetBSD__)
+ /* Set file mode: will not fully work on most system, the group
+ * permission is not changed on some Linux. *BSD won't do the
+ * chmod: it returns EINVAL when calling chmod on sockets. */
diff --git a/suricata/patches/patch-src_util-fmemopen.c b/suricata/patches/patch-src_util-fmemopen.c
new file mode 100644
index 0000000000..caaa5f04b2
--- /dev/null
+++ b/suricata/patches/patch-src_util-fmemopen.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- src/util-fmemopen.c.orig 2025-09-16 02:07:13.000000000 +0000
++++ src/util-fmemopen.c
+@@ -33,6 +33,10 @@
+ #define USE_FMEM_WRAPPER 1
+ #endif
+
++#ifdef __NetBSD__
++#define USE_FMEM_WRAPPER 1
++#endif
++
+ #ifdef __OpenBSD__
+ #define USE_FMEM_WRAPPER 1
+ #endif
+@@ -76,6 +80,10 @@ typedef struct SCFmem_ {
+ char *buffer;
+ } SCFmem;
+
++#ifdef __NetBSD__
++#define fpos_t off_t
++#endif
++
+ /**
+ * \brief Seek the mem file from offset and whence
+ * \param handler pointer to the memfile
diff --git a/suricata/patches/patch-src_util-fmemopen.h b/suricata/patches/patch-src_util-fmemopen.h
new file mode 100644
index 0000000000..e8686ea645
--- /dev/null
+++ b/suricata/patches/patch-src_util-fmemopen.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/util-fmemopen.h.orig 2025-09-16 02:07:13.000000000 +0000
++++ src/util-fmemopen.h
+@@ -37,6 +37,10 @@
+ #define USE_FMEM_WRAPPER 1
+ #endif
+
++#ifdef __NetBSD__
++#define USE_FMEM_WRAPPER 1
++#endif
++
+ #ifdef __OpenBSD__
+ #define USE_FMEM_WRAPPER 1
+ #endif
diff --git a/suricata/patches/patch-src_util-ioctl.c b/suricata/patches/patch-src_util-ioctl.c
index d805430be5..02b75bc932 100644
--- a/suricata/patches/patch-src_util-ioctl.c
+++ b/suricata/patches/patch-src_util-ioctl.c
@@ -1,6 +1,6 @@
$NetBSD$
---- src/util-ioctl.c.orig 2025-09-22 18:04:28.981310802 +0000
+--- src/util-ioctl.c.orig 2025-09-16 02:07:13.000000000 +0000
+++ src/util-ioctl.c
@@ -196,6 +196,8 @@ int SetIfaceFlags(const char *ifname, in
#ifdef OS_FREEBSD
Home |
Main Index |
Thread Index |
Old Index