CVS commit: pkgsrc/mail/rspamd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov  4 11:42:45 UTC 2025

Modified Files:
        pkgsrc/mail/rspamd: Makefile distinfo
        pkgsrc/mail/rspamd/patches: patch-src_lua_lua__util.c

Log Message:
rspamd: improve NetBSD support, from upstream

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/rspamd/patches/patch-src_lua_lua__util.c

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

Modified files:

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.128 pkgsrc/mail/rspamd/Makefile:1.129
--- pkgsrc/mail/rspamd/Makefile:1.128   Sun Nov  2 21:17:43 2025
+++ pkgsrc/mail/rspamd/Makefile Tue Nov  4 11:42:45 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.128 2025/11/02 21:17:43 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2025/11/04 11:42:45 wiz Exp $
 #
 # When updating this, run 'make cfgfiles'.
 
 DISTNAME=      rspamd-3.13.2
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rspamd/}
 

Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.68 pkgsrc/mail/rspamd/distinfo:1.69
--- pkgsrc/mail/rspamd/distinfo:1.68    Sun Nov  2 21:17:43 2025
+++ pkgsrc/mail/rspamd/distinfo Tue Nov  4 11:42:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2025/11/02 21:17:43 wiz Exp $
+$NetBSD: distinfo,v 1.69 2025/11/04 11:42:45 wiz Exp $
 
 BLAKE2s (rspamd-3.13.2.tar.gz) = e1ee82597db1781c24b0cc986f42586db7072f969511ad63144c0a33d7875cee
 SHA512 (rspamd-3.13.2.tar.gz) = ff8d9c59f6d0caabf563e2c07bff5adf8cb82dd0988d595900e0206a0315433c69ee425c50d4b5073c3d14f16615f11d7776986fe77b41daed7801e7522244ba
@@ -9,6 +9,6 @@ SHA1 (patch-contrib_fpconv_fpconv.c) = b
 SHA1 (patch-lualib_rspamadm_dmarc__report.lua) = 93ccb04512dd84ea83de44c394571ef2bebe6bd2
 SHA1 (patch-src_libserver_symcache_symcache__impl.cxx) = 8a5c69ab343409427619a9cbc0dc080d548b9c53
 SHA1 (patch-src_libstat_backends_redis__backend.cxx) = 4c60287a574066a841c76081cd88512a57f0b27f
-SHA1 (patch-src_lua_lua__util.c) = 97c68cd5e981afc290b3e1d624b086fb87cd7334
+SHA1 (patch-src_lua_lua__util.c) = 11c99335b6fe18f38c9dc713b65ac7554f6eaa8e
 SHA1 (patch-src_plugins_lua_dmarc.lua) = 972b78415e11bde2f8b224632291ba299d02656c
 SHA1 (patch-src_rspamd.c) = 1903994d5970af57de9c5d522df3dd12576c8418

Index: pkgsrc/mail/rspamd/patches/patch-src_lua_lua__util.c
diff -u pkgsrc/mail/rspamd/patches/patch-src_lua_lua__util.c:1.4 pkgsrc/mail/rspamd/patches/patch-src_lua_lua__util.c:1.5
--- pkgsrc/mail/rspamd/patches/patch-src_lua_lua__util.c:1.4    Sun Nov  2 21:17:43 2025
+++ pkgsrc/mail/rspamd/patches/patch-src_lua_lua__util.c        Tue Nov  4 11:42:45 2025
@@ -1,15 +1,39 @@
-$NetBSD: patch-src_lua_lua__util.c,v 1.4 2025/11/02 21:17:43 wiz Exp $
+$NetBSD: patch-src_lua_lua__util.c,v 1.5 2025/11/04 11:42:45 wiz Exp $
 
-NetBSD's kinfo_proc is not the same as the other *BSDs.
-https://github.com/rspamd/rspamd/issues/5723
+Fix build on NetBSD.
+https://github.com/rspamd/rspamd/pull/5726/files
 
 --- src/lua/lua_util.c.orig    2025-10-05 18:04:57.000000000 +0000
 +++ src/lua/lua_util.c
-@@ -2532,7 +2532,7 @@ lua_util_get_memory_usage(lua_State *L)
+@@ -34,6 +34,9 @@
+ #ifdef __FreeBSD__
+ #include <sys/user.h>
+ #endif
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
+ #endif
+ #ifdef __APPLE__
+ #include <mach/mach.h>
+@@ -2532,7 +2535,21 @@ lua_util_get_memory_usage(lua_State *L)
                lua_pushinteger(L, info.virtual_size);
                lua_settable(L, -3);
        }
 -#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__NetBSD__)
++      struct kinfo_proc2 kp;
++      size_t len = sizeof(kp);
++      int mib[6] = {CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1};
++
++      if (sysctl(mib, 6, &kp, &len, NULL, 0) == 0) {
++              lua_pushstring(L, "rss");
++              lua_pushinteger(L, kp.p_vm_rssize * getpagesize());
++              lua_settable(L, -3);
++
++              lua_pushstring(L, "vsize");
++              lua_pushinteger(L, kp.p_vm_vsize * getpagesize());
++              lua_settable(L, -3);
++      }
 +#elif defined(__FreeBSD__) || defined(__OpenBSD__)
        struct kinfo_proc kp;
        size_t len = sizeof(kp);