trafficserver: Add logic to check if NetBSD's accept filter is loaded

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: trafficserver: Add logic to check if NetBSD's accept filter is loaded
From: Andrew Parker (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 9 Nov 2026 15:34:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Andrew Parker <andrew%pmk1.net@localhost>
Pushed By:	andrewparker
Date:		Mon Nov 9 10:32:18 2026 -0500
Changeset:	1863e58b84580097cdbe4b8f2fa27e36e536f644

Modified Files:
	trafficserver/distinfo
	trafficserver/patches/patch-DbgCtl.h
	trafficserver/patches/patch-LogConfig.cc
	trafficserver/patches/patch-Server.cc
	trafficserver/patches/patch-swoc_file.h
	trafficserver/patches/patch-tsmemcache.cc
Removed Files:
	trafficserver/patches/patch-ink_inet.cc

Log Message:
trafficserver: Add logic to check if NetBSD's accept filter is loaded

Also cleanup other patch files per pkgsrc guide.

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

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

diffstat:
 trafficserver/distinfo                    | 11 ++++---
 trafficserver/patches/patch-DbgCtl.h      |  9 +++---
 trafficserver/patches/patch-LogConfig.cc  |  2 +-
 trafficserver/patches/patch-Server.cc     | 50 ++++++++++++++++---------------
 trafficserver/patches/patch-ink_inet.cc   | 18 -----------
 trafficserver/patches/patch-swoc_file.h   |  6 ++--
 trafficserver/patches/patch-tsmemcache.cc |  4 +--
 7 files changed, 41 insertions(+), 59 deletions(-)

diffs:
diff --git a/trafficserver/distinfo b/trafficserver/distinfo
index 9aa3e301f8..3531679370 100644
--- a/trafficserver/distinfo
+++ b/trafficserver/distinfo
@@ -4,9 +4,8 @@ BLAKE2s (trafficserver-10.2.1.tar.gz) = e3c65c35c895ede7ab624ebdfeee995c31604568
 SHA512 (trafficserver-10.2.1.tar.gz) = 154c939f53730a33d9103f0d5c30c9fc51063f734e4d811cbb4b196f1b02049a5a7be69e52f6697afa7f4fe8e218c6fd5c9c51be55dedd1772d291dfff8d370d
 Size (trafficserver-10.2.1.tar.gz) = 22139170 bytes
 SHA1 (patch-CMakeLists.txt) = 36685f8bce789b38290e6167ecea4d017eb3d493
-SHA1 (patch-DbgCtl.h) = dba56cab1c1248598d93f1398707f13c2ad28eeb
-SHA1 (patch-LogConfig.cc) = a25a469ed99440bc91abdfc75aba1ddcbdd6871a
-SHA1 (patch-Server.cc) = d5daec1c26f387898938d12631ce63746ea5fea4
-SHA1 (patch-ink_inet.cc) = 0f4c32c240f78737f0fc34ba76cd863f5cb6a239
-SHA1 (patch-swoc_file.h) = b31ae61a2715aed221eb336256d5dafdb9b39466
-SHA1 (patch-tsmemcache.cc) = 9f67648660fc74fbfdbaaf1d8be2b9b0be383557
+SHA1 (patch-DbgCtl.h) = c4197ec1b8f2a6303690d746bea9a03283edc391
+SHA1 (patch-LogConfig.cc) = 9697e82171eda7d4ae28b2c0d36a453e8c89e622
+SHA1 (patch-Server.cc) = 614a5a0e106c6b2bb9585e1757af1d54cea890b4
+SHA1 (patch-swoc_file.h) = 8fedabca62ec3f8815878b39d184dc6d3124f1b8
+SHA1 (patch-tsmemcache.cc) = dc7367b167fae2117159a0c88823972735e2f36e
diff --git a/trafficserver/patches/patch-DbgCtl.h b/trafficserver/patches/patch-DbgCtl.h
index b76a002244..96559284eb 100644
--- a/trafficserver/patches/patch-DbgCtl.h
+++ b/trafficserver/patches/patch-DbgCtl.h
@@ -1,18 +1,17 @@
 $NetBSD$
 
-- Include csstdarg for NetBSD
+- stdarg required for NetBSD build.
 
 diff --git include/tsutil/DbgCtl.h include/tsutil/DbgCtl.h
-index d20cf31b09..f143433fab 100644
+index d20cf31b09..910e7d4971 100644
 --- include/tsutil/DbgCtl.h
 +++ include/tsutil/DbgCtl.h
 @@ -29,6 +29,9 @@
  #include <atomic>
  #include <utility>
  #include <functional>
-+#if defined(__NetBSD__)
++#if !defined(_SYS_STDARG_H_)
 +#include <cstdarg>
 +#endif
- 
+
  #include <ts/apidefs.h> // For TS_PRINTFLIKE
- 
diff --git a/trafficserver/patches/patch-LogConfig.cc b/trafficserver/patches/patch-LogConfig.cc
index 8a63b6a662..f2de738af9 100644
--- a/trafficserver/patches/patch-LogConfig.cc
+++ b/trafficserver/patches/patch-LogConfig.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
-- Incorrect config string used here.  Need to fix upstream.
+- Incorrect param name used here.  This is an upstream bug.
 
 diff --git src/proxy/logging/LogConfig.cc src/proxy/logging/LogConfig.cc
 index f2c07d8a23..287977d04e 100644
diff --git a/trafficserver/patches/patch-Server.cc b/trafficserver/patches/patch-Server.cc
index a9fe7ef5a8..f3edb040a5 100644
--- a/trafficserver/patches/patch-Server.cc
+++ b/trafficserver/patches/patch-Server.cc
@@ -1,35 +1,50 @@
 $NetBSD$
 
-- kldfind is only on FreeBSD
-- Todo: Add logic for NetBSD
+- Handle accept filter and module load in NetBSD
 
 diff --git src/iocore/net/Server.cc src/iocore/net/Server.cc
-index 32a8c0f7ae..ae4e955f6c 100644
+index 32a8c0f7ae..d2c53c3314 100644
 --- src/iocore/net/Server.cc
 +++ src/iocore/net/Server.cc
-@@ -44,10 +44,13 @@
- #include <hwloc.h>
- #endif
+@@ -46,8 +46,14 @@
  
-+#undef SO_ACCEPTFILTER
  #ifdef SO_ACCEPTFILTER
  #include <sys/param.h>
-+#if !defined(__NetBSD__)
++#if defined(__NetBSD__)
++extern "C" {
++#include <sys/module.h>
++}
++#else
  #include <sys/linker.h>
  #endif
 +#endif
  
  namespace
  {
-@@ -361,6 +364,7 @@ Server::setup_fd_after_listen([[maybe_unused]] const NetProcessor::AcceptOptions
+@@ -361,6 +367,22 @@ Server::setup_fd_after_listen([[maybe_unused]] const NetProcessor::AcceptOptions
  #ifdef SO_ACCEPTFILTER
    // SO_ACCEPTFILTER needs to be set **after** listen
    if (opt.defer_accept > 0) {
-+#if !defined(__NetBSD__)
++#if defined(__NetBSD__)
++    modctl_load_t args = {
++      .ml_filename = "accf_dataready",
++      .ml_flags = MODCTL_NO_PROP,
++      .ml_props = NULL,
++      .ml_propslen = 0
++    };
++
++    if (modctl(MODCTL_LOAD, &args) != 0 && errno != EEXIST) {
++      if (errno == ENOENT) {
++        Error("[Server::listen] Ignored defer_accept config. Because accf_data module is missing errno=%d", errno);
++        } else {
++        Error("[Server::listen] Ignored defer_accept config. Because accf_data module cannot loaded errno=%d", errno);
++      }
++      return -errno;
++#else
      int file_id = kldfind("accf_data");
  
      struct kld_file_stat stat;
-@@ -369,6 +373,7 @@ Server::setup_fd_after_listen([[maybe_unused]] const NetProcessor::AcceptOptions
+@@ -369,6 +391,7 @@ Server::setup_fd_after_listen([[maybe_unused]] const NetProcessor::AcceptOptions
      if (kldstat(file_id, &stat) < 0) {
        Error("[Server::listen] Ignored defer_accept config. Because accf_data module is not loaded errno=%d", errno);
      } else {
@@ -37,16 +52,3 @@ index 32a8c0f7ae..ae4e955f6c 100644
        struct accept_filter_arg afa;
  
        bzero(&afa, sizeof(afa));
-@@ -378,9 +383,11 @@ Server::setup_fd_after_listen([[maybe_unused]] const NetProcessor::AcceptOptions
-         Error("[Server::listen] Defer accept is configured but set failed: %d", errno);
-         return -errno;
-       }
-+#if !defined(__NetBSD__)
-     }
--  }
- #endif
-+  }
- 
-+#endif
-   return 0;
- }
diff --git a/trafficserver/patches/patch-ink_inet.cc b/trafficserver/patches/patch-ink_inet.cc
deleted file mode 100644
index 8ca5fd0e31..0000000000
--- a/trafficserver/patches/patch-ink_inet.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-- Include sysctl.h for NetBSD
-
-diff --git src/tscore/ink_inet.cc src/tscore/ink_inet.cc
-index 6d8f9eda5e..8134a6e0f3 100644
---- src/tscore/ink_inet.cc
-+++ src/tscore/ink_inet.cc
-@@ -34,6 +34,9 @@
- #include "tscore/ink_assert.h"
- #include "ts/apidefs.h"
- #include "tscore/ink_inet.h"
-+#if defined(__NetBSD__)
-+#include "sys/sysctl.h"
-+#endif
- 
- IpAddr const IpAddr::INVALID;
- 
diff --git a/trafficserver/patches/patch-swoc_file.h b/trafficserver/patches/patch-swoc_file.h
index c53b7b8e9c..3760b19545 100644
--- a/trafficserver/patches/patch-swoc_file.h
+++ b/trafficserver/patches/patch-swoc_file.h
@@ -1,16 +1,16 @@
 $NetBSD$
 
-- Need to include climits for NetBSD
+- climits required for build on NetBSD.
 
 diff --git lib/swoc/include/swoc/swoc_file.h lib/swoc/include/swoc/swoc_file.h
-index 7e9423969b..52b586ef7f 100644
+index 7e9423969b..9c163662d7 100644
 --- lib/swoc/include/swoc/swoc_file.h
 +++ lib/swoc/include/swoc/swoc_file.h
 @@ -7,6 +7,10 @@
  
  #pragma once
  
-+#if defined(__NetBSD__)
++#if !defined(PATH_MAX)
 +#include <climits>
 +#endif
 +
diff --git a/trafficserver/patches/patch-tsmemcache.cc b/trafficserver/patches/patch-tsmemcache.cc
index ac7b9fcb93..95dd4da06f 100644
--- a/trafficserver/patches/patch-tsmemcache.cc
+++ b/trafficserver/patches/patch-tsmemcache.cc
@@ -1,9 +1,9 @@
 $NetBSD$
 
-- Address compiler warning about already defined value
+- Don't redefine last_flush
 
 diff --git plugins/experimental/memcache/tsmemcache.cc plugins/experimental/memcache/tsmemcache.cc
-index 5f742a4f11..4c531c0e39 100644
+index 5f742a4f11..7e57c8aa52 100644
 --- plugins/experimental/memcache/tsmemcache.cc
 +++ plugins/experimental/memcache/tsmemcache.cc
 @@ -44,7 +44,9 @@ static time_t base_day_time;
Prev by Date: Get rid of a few patches, using the subst framework instead.
Next by Date: Forgot a PKG_SYSCONFDIR used within manpages.
Previous by Thread: Get rid of a few patches, using the subst framework instead.
Next by Thread: Forgot a PKG_SYSCONFDIR used within manpages.
Indexes:
Home | Main Index | Thread Index | Old Index