Sun Oct 30 15:38:54 2022 UTC ()
rspamd: Various build fixes.
(jperkin)
diff -r1.44 -r1.45 pkgsrc/mail/rspamd/distinfo
diff -r0 -r1.1 pkgsrc/mail/rspamd/patches/patch-src_libserver_symcache_symcache__impl.cxx
diff -r0 -r1.1 pkgsrc/mail/rspamd/patches/patch-src_libserver_symcache_symcache__internal.hxx
diff -r0 -r1.1 pkgsrc/mail/rspamd/patches/patch-src_rspamd.c
--- pkgsrc/mail/rspamd/distinfo 2022/10/15 19:56:55 1.44
+++ pkgsrc/mail/rspamd/distinfo 2022/10/30 15:38:54 1.45
| @@ -1,9 +1,12 @@ | | | @@ -1,9 +1,12 @@ |
| 1 | $NetBSD: distinfo,v 1.44 2022/10/15 19:56:55 triaxx Exp $ | | 1 | $NetBSD: distinfo,v 1.45 2022/10/30 15:38:54 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (rspamd-3.3.tar.gz) = 3859e25081ef504e8c9f1e0799d71c2221c2fd41920e4bee5ee39f6b8af4fbeb | | 3 | BLAKE2s (rspamd-3.3.tar.gz) = 3859e25081ef504e8c9f1e0799d71c2221c2fd41920e4bee5ee39f6b8af4fbeb |
| 4 | SHA512 (rspamd-3.3.tar.gz) = 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c | | 4 | SHA512 (rspamd-3.3.tar.gz) = 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c |
| 5 | Size (rspamd-3.3.tar.gz) = 5680874 bytes | | 5 | Size (rspamd-3.3.tar.gz) = 5680874 bytes |
| 6 | SHA1 (patch-CMakeLists.txt) = 04cace824a93ba92fba3f8cbf3d30452b1138725 | | 6 | SHA1 (patch-CMakeLists.txt) = 04cace824a93ba92fba3f8cbf3d30452b1138725 |
| 7 | SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783 | | 7 | SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783 |
| 8 | SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab | | 8 | SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab |
| 9 | SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 | | 9 | SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 |
| | | 10 | SHA1 (patch-src_libserver_symcache_symcache__impl.cxx) = 8a5c69ab343409427619a9cbc0dc080d548b9c53 |
| | | 11 | SHA1 (patch-src_libserver_symcache_symcache__internal.hxx) = 9b4ce55f42d4bc637efdb6eb91ec93a5e33517fe |
| | | 12 | SHA1 (patch-src_rspamd.c) = b02512138fbcba443997a2e080fc82b00675e3b3 |
$NetBSD: patch-src_libserver_symcache_symcache__impl.cxx,v 1.1 2022/10/30 15:38:54 jperkin Exp $
Explicitly use std::pow().
--- src/libserver/symcache/symcache_impl.cxx.orig 2022-10-01 14:19:21.000000000 +0000
+++ src/libserver/symcache/symcache_impl.cxx
@@ -31,6 +31,8 @@
#endif
#include <cmath>
+using std::pow;
+
namespace rspamd::symcache {
INIT_LOG_MODULE_PUBLIC(symcache)
$NetBSD: patch-src_libserver_symcache_symcache__internal.hxx,v 1.1 2022/10/30 15:38:54 jperkin Exp $
Avoid _L define.
--- src/libserver/symcache/symcache_internal.hxx.orig 2022-10-01 14:19:21.000000000 +0000
+++ src/libserver/symcache/symcache_internal.hxx
@@ -139,8 +139,8 @@ struct delayed_cache_condition {
int cbref;
lua_State *L;
public:
- delayed_cache_condition(std::string_view _sym, int _cbref, lua_State *_L) :
- sym(_sym), cbref(_cbref), L(_L) {}
+ delayed_cache_condition(std::string_view _sym, int _cbref, lua_State *lstate) :
+ sym(_sym), cbref(_cbref), L(lstate) {}
};
class delayed_symbol_elt {
$NetBSD: patch-src_rspamd.c,v 1.1 2022/10/30 15:38:54 jperkin Exp $
Avoid sun define.
--- src/rspamd.c.orig 2022-10-01 14:19:21.000000000 +0000
+++ src/rspamd.c
@@ -451,7 +451,7 @@ systemd_get_socket (struct rspamd_main *
union {
struct sockaddr_storage ss;
struct sockaddr sa;
- struct sockaddr_un sun;
+ struct sockaddr_un s_un;
struct sockaddr_in6 s6;
} addr_storage;
socklen_t slen = sizeof (addr_storage);