From: adrian-bl <adrian-bl@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] update to rspamd 3.6
Date: Sat, 02 Sep 2023 11:59:11 +0200 [thread overview]
Message-ID: <20230902095911.EugzYcn7ZfB237xlLxHK6GD-wlvqZ-Aq0YAmLPzhH3w@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45873@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
[WIP] update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 4429 bytes --]
From f8e76a76bc5b3d779e483f123f0d7b95e01b9a0d Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 12 +++---
2 files changed, 6 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..a9bd0b03d20fc 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
next prev parent reply other threads:[~2023-09-02 9:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 17:40 [PR PATCH] " adrian-bl
2023-09-02 9:59 ` adrian-bl [this message]
2023-09-02 10:04 ` [PR PATCH] [Updated] [WIP] " adrian-bl
2023-09-02 10:41 ` adrian-bl
2023-09-03 10:26 ` [PR PATCH] [Updated] " adrian-bl
2023-09-07 9:17 ` Bnyro
2023-09-07 14:01 ` [PR PATCH] [Updated] " adrian-bl
2023-09-07 14:16 ` rspamd: update to 3.6 adrian-bl
2023-09-23 13:15 ` Duncaen
2023-09-23 13:15 ` Duncaen
2023-09-23 13:15 ` Duncaen
2023-09-23 13:59 ` [PR PATCH] [Updated] " adrian-bl
2023-09-23 14:00 ` adrian-bl
2023-12-23 1:45 ` github-actions
2024-01-06 1:46 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230902095911.EugzYcn7ZfB237xlLxHK6GD-wlvqZ-Aq0YAmLPzhH3w@z \
--to=adrian-bl@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).