[update] mail/opensmtpd-filters/rspamd to 0.1.7
Hi!
Here is an update to the previously mentioned filter. The port update
contains:
- Switch to MODGO_*. This lets us drop the dependency on devel/go-sys
- Switch myself to maintainer as discussed here:
https://github.com/poolpOrg/filter-rspamd/pull/37
Changes for the actual tool are here:
https://github.com/poolpOrg/filter-rspamd/releases/tag/v0.1.7
If you are testing this, you will need to make sure your tree contains
the latest changes to lang/go/go.port.mk or else you won't be able to
fetch the distfiles properly.
OK?
Cheers,
Aaron
diff 314b17ec5bb7ab894b6284edf762fcbe3d967966 /usr/ports
blob - 2367d9b7fca0d1b8e084b4daaa600ebdd7a43ed7
file + mail/opensmtpd-filters/rspamd/Makefile
--- mail/opensmtpd-filters/rspamd/Makefile
+++ mail/opensmtpd-filters/rspamd/Makefile
@@ -2,17 +2,21 @@
COMMENT = rspamd integration to the OpenSMTPD daemon
-V = 0.1.6
+# V is used in opensmtpd-filters/Makefile.inc
+V = 0.1.7
+
+MODGO_MODNAME = github.com/poolpOrg/filter-rspamd
+MODGO_VERSION = v${V}
+
+DISTNAME = filter-rspamd-${MODGO_VERSION:S/v//}
+
FILTER_NAME = rspamd
-DISTNAME = filter-rspamd-${V}
CATEGORIES = mail
HOMEPAGE = https://github.com/poolpOrg/filter-rspamd/
-MAINTAINER = Gilles Chehade
+MAINTAINER = Aaron Bieber
-MASTER_SITES = https://github.com/poolpOrg/filter-rspamd/releases/download/${V}/
-
# ISC
PERMIT_PACKAGE = Yes
@@ -20,8 +24,7 @@ WANTLIB = c pthread
MODULES = lang/go
NO_TEST = Yes
-ALL_TARGET = filter-rspamd
+MODGO_MODULES = \
+ golang.org/x/sys v0.0.0-20200821140526-fda516888d29
-BUILD_DEPENDS = devel/go-sys
-
.include
blob - 88cf2fbc3313a445e7c7b4129aa1da17c31b3b38
file + mail/opensmtpd-filters/rspamd/distinfo
--- mail/opensmtpd-filters/rspamd/distinfo
+++ mail/opensmtpd-filters/rspamd/distinfo
@@ -1,2 +1,6 @@
-SHA256 (filter-rspamd-0.1.6.tar.gz) = Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
-SIZE (filter-rspamd-0.1.6.tar.gz) = 5096
+SHA256 (filter-rspamd-0.1.7.zip) = RvGkHuE/EsMcbOGRUTo7wPP8iOY9exXmGKsrzYC3fcw=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.zip) = 9D6FSRnTgg/29U0BzzgQkS/CYpz0oof79oFvaKI5nXw=
+SIZE (filter-rspamd-0.1.7.zip) = 9941
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.zip) = 1487242
Re: [UPDATE] mail/opensmtpd-filters/rspamd
nevermind, I missed the commit, sorry for the noise !
April 14, 2020 10:03 AM, gil...@poolp.org wrote:
> No feedback :-(
>
> Without this update, this filter will be broken when eric@ commits a
> protocol change in smtpd for 6.7 and might as well be removed before
> lock.
>
> Gilles
>
> April 11, 2020 12:10 AM, gil...@poolp.org wrote:
>
>> Hello,
>>
>> The following diff updates filter-rspamd from 0.1.5 to 0.1.6
>>
>> - adds pledge & unveil to filter
>> - fixes a bug in the processing of mail addresses
>> - better handles greylisting action from Rspamd
>> - support both current and upcoming version of the filter protocol
>>
>> ok ?
>>
>> Gilles
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 Makefile
>> --- Makefile 9 Dec 2019 20:23:29 - 1.5
>> +++ Makefile 10 Apr 2020 22:02:20 -
>> @@ -2,7 +2,7 @@
>>
>> COMMENT = rspamd integration to the OpenSMTPD daemon
>>
>> -V = 0.1.5
>> +V = 0.1.6
>> FILTER_NAME = rspamd
>> DISTNAME = filter-rspamd-${V}
>>
>> @@ -21,5 +21,7 @@ MODULES = lang/go
>> NO_TEST = Yes
>>
>> ALL_TARGET = filter-rspamd
>> +
>> +BUILD_DEPENDS = devel/go-sys
>>
>> .include
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 distinfo
>> --- distinfo 9 Dec 2019 20:23:29 - 1.5
>> +++ distinfo 10 Apr 2020 22:02:20 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (filter-rspamd-0.1.5.tar.gz) =
>> RFhwbhDNPrRxbsAim/45BlTpQmHax/JlC+1GhXCAayY=
>> -SIZE (filter-rspamd-0.1.5.tar.gz) = 4829
>> +SHA256 (filter-rspamd-0.1.6.tar.gz) =
>> Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
>> +SIZE (filter-rspamd-0.1.6.tar.gz) = 5096
Re: [UPDATE] mail/opensmtpd-filters/rspamd
No feedback :-(
Without this update, this filter will be broken when eric@ commits a
protocol change in smtpd for 6.7 and might as well be removed before
lock.
Gilles
April 11, 2020 12:10 AM, gil...@poolp.org wrote:
> Hello,
>
> The following diff updates filter-rspamd from 0.1.5 to 0.1.6
>
> - adds pledge & unveil to filter
> - fixes a bug in the processing of mail addresses
> - better handles greylisting action from Rspamd
> - support both current and upcoming version of the filter protocol
>
> ok ?
>
> Gilles
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 9 Dec 2019 20:23:29 - 1.5
> +++ Makefile 10 Apr 2020 22:02:20 -
> @@ -2,7 +2,7 @@
>
> COMMENT = rspamd integration to the OpenSMTPD daemon
>
> -V = 0.1.5
> +V = 0.1.6
> FILTER_NAME = rspamd
> DISTNAME = filter-rspamd-${V}
>
> @@ -21,5 +21,7 @@ MODULES = lang/go
> NO_TEST = Yes
>
> ALL_TARGET = filter-rspamd
> +
> +BUILD_DEPENDS = devel/go-sys
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 9 Dec 2019 20:23:29 - 1.5
> +++ distinfo 10 Apr 2020 22:02:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (filter-rspamd-0.1.5.tar.gz) =
> RFhwbhDNPrRxbsAim/45BlTpQmHax/JlC+1GhXCAayY=
> -SIZE (filter-rspamd-0.1.5.tar.gz) = 4829
> +SHA256 (filter-rspamd-0.1.6.tar.gz) =
> Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
> +SIZE (filter-rspamd-0.1.6.tar.gz) = 5096
Re: [UPDATE] mail/opensmtpd-filters/rspamd
w, thanks a lot giles :D
I can't wait to try this out.
On 4/10/20 6:10 PM, gil...@poolp.org wrote:
> Hello,
>
> The following diff updates filter-rspamd from 0.1.5 to 0.1.6
>
> - adds pledge & unveil to filter
> - fixes a bug in the processing of mail addresses
> - better handles greylisting action from Rspamd
> - support both current and upcoming version of the filter protocol
>
> ok ?
>
> Gilles
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 9 Dec 2019 20:23:29 - 1.5
> +++ Makefile 10 Apr 2020 22:02:20 -
> @@ -2,7 +2,7 @@
>
> COMMENT =rspamd integration to the OpenSMTPD daemon
>
> -V = 0.1.5
> +V = 0.1.6
> FILTER_NAME =rspamd
> DISTNAME = filter-rspamd-${V}
>
> @@ -21,5 +21,7 @@ MODULES = lang/go
> NO_TEST =Yes
>
> ALL_TARGET = filter-rspamd
> +
> +BUILD_DEPENDS = devel/go-sys
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 9 Dec 2019 20:23:29 - 1.5
> +++ distinfo 10 Apr 2020 22:02:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (filter-rspamd-0.1.5.tar.gz) =
> RFhwbhDNPrRxbsAim/45BlTpQmHax/JlC+1GhXCAayY=
> -SIZE (filter-rspamd-0.1.5.tar.gz) = 4829
> +SHA256 (filter-rspamd-0.1.6.tar.gz) =
> Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
> +SIZE (filter-rspamd-0.1.6.tar.gz) = 5096
>
[UPDATE] mail/opensmtpd-filters/rspamd
Hello,
The following diff updates filter-rspamd from 0.1.5 to 0.1.6
- adds pledge & unveil to filter
- fixes a bug in the processing of mail addresses
- better handles greylisting action from Rspamd
- support both current and upcoming version of the filter protocol
ok ?
Gilles
Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile9 Dec 2019 20:23:29 - 1.5
+++ Makefile10 Apr 2020 22:02:20 -
@@ -2,7 +2,7 @@
COMMENT = rspamd integration to the OpenSMTPD daemon
-V =0.1.5
+V =0.1.6
FILTER_NAME = rspamd
DISTNAME = filter-rspamd-${V}
@@ -21,5 +21,7 @@ MODULES = lang/go
NO_TEST = Yes
ALL_TARGET = filter-rspamd
+
+BUILD_DEPENDS = devel/go-sys
.include
Index: distinfo
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo9 Dec 2019 20:23:29 - 1.5
+++ distinfo10 Apr 2020 22:02:20 -
@@ -1,2 +1,2 @@
-SHA256 (filter-rspamd-0.1.5.tar.gz) =
RFhwbhDNPrRxbsAim/45BlTpQmHax/JlC+1GhXCAayY=
-SIZE (filter-rspamd-0.1.5.tar.gz) = 4829
+SHA256 (filter-rspamd-0.1.6.tar.gz) =
Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
+SIZE (filter-rspamd-0.1.6.tar.gz) = 5096
[update] mail/opensmtpd-filters/rspamd
hello,
this updates filter-rspamd to 0.1.4 which doesn't bring any feature
but fixes a bug in handling of DATA lines that causes some mails to
be incorrectly DKIM-signed or DKIM-verified.
ok ?
Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Sep 2019 09:52:06 - 1.3
+++ Makefile22 Oct 2019 19:49:35 -
@@ -2,7 +2,7 @@
COMMENT = rspamd integration to the OpenSMTPD daemon
-V =0.1.3
+V =0.1.4
FILTER_NAME = rspamd
DISTNAME = filter-rspamd-${V}
Index: distinfo
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo29 Sep 2019 09:52:06 - 1.3
+++ distinfo22 Oct 2019 19:49:35 -
@@ -1,2 +1,2 @@
-SHA256 (filter-rspamd-0.1.3.tar.gz) =
horszy5OsVWArs+TWjm/XR3G5G/od2In2ZtEIGVEDmI=
-SIZE (filter-rspamd-0.1.3.tar.gz) = 4193
+SHA256 (filter-rspamd-0.1.4.tar.gz) =
F96BD539f0gS4dV2uD8VfCF37Oz0d4l/SW3S2Zq7gyw=
+SIZE (filter-rspamd-0.1.4.tar.gz) = 4299
Re: [Update] mail/opensmtpd-filters/rspamd
September 29, 2019 9:22 AM, "Florian Obser" wrote: > On Sat, Sep 28, 2019 at 07:46:16PM +0200, Florian Obser wrote: > >> On Sat, Sep 28, 2019 at 08:18:57AM +, gil...@poolp.org wrote: >> Hello, >> >> The following diff updates filter-rspamd to 0.1.3: >> >> - fixes a concurrency-related crash which has been observed by patrick@ and >> otto@ >> - adds X-Spam-Symbols which was requested by florian@ >> >> Requested it such a strong word. I completely missed how all this >> stuff interconnects. I thougt rspamd itself adds those headers. ;) >> >> Thank you very much. Unfortunately I haven't gotten any spam yet, the >> rdns filters are just too good :D so I can't tell if it actually works. > > nd I got some spam and happy to report that it works: > > (I fiddled around with the score values, my rspamd never rejects, but > this is quite an impressively high score) > Perfect, committed ! In a future version we'll rework the X-Spam-Symbols header so that it's a bit more compact and so it also displays the individual score for matches but I think this version is good enough for the next OpenBSD release. Unless someone finds a very annoying bug I won't update it before release of OpenBSD 6.6. Thanks for testing :-)
Re: [Update] mail/opensmtpd-filters/rspamd
On Sat, Sep 28, 2019 at 07:46:16PM +0200, Florian Obser wrote: > On Sat, Sep 28, 2019 at 08:18:57AM +, gil...@poolp.org wrote: > > Hello, > > > > The following diff updates filter-rspamd to 0.1.3: > > > > - fixes a concurrency-related crash which has been observed by patrick@ and > > otto@ > > - adds X-Spam-Symbols which was requested by florian@ > > Requested it such a strong word. I completely missed how all this > stuff interconnects. I thougt rspamd itself adds those headers. ;) > > Thank you very much. Unfortunately I haven't gotten any spam yet, the > rdns filters are just too good :D so I can't tell if it actually works. nd I got some spam and happy to report that it works: (I fiddled around with the score values, my rspamd never rejects, but this is quite an impressively high score) X-Spam: yes X-Spam-Score: 39.95 / 6 X-Spam-Symbols: R_SPF_SOFTFAIL, RCPT_COUNT_ONE, FROM_EQ_ENVFROM, ARC_NA, RBL_BLOCKLISTDE, RBL_SPAMHAUS_XBL_ANY, RCVD_NO_TLS_LAST, R_DKIM_NA, TO_MATCH_ENVRCPT_ALL, REPLYTO_EQ_FROM, HFILTER_HOSTNAME_5, TO_DN_NONE, SEM_URIBL, VIOLATED_DIRECT_SPF, FREEMAIL_REPLYTO, MIME_TRACE, RECEIVED_BLOCKLISTDE, HAS_REPLYTO, FREEMAIL_ENVFROM, FROM_HAS_DN, RBL_SPAMHAUS_CSS, RSPAMD_URIBL, HTML_SHORT_LINK_IMG_1, RECEIVED_SPAMHAUS_CSS, MID_RHS_MATCH_FROM, PREVIOUSLY_DELIVERED, URIBL_SBL, URIBL_BLACK, FREEMAIL_FROM, DBL_SPAM, FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN, DMARC_POLICY_SOFTFAIL, RCVD_COUNT_THREE, ASN, RBL_SENDERSCORE, RECEIVED_SPAMHAUS_PBL, MANY_INVISIBLE_PARTS, MIME_HTML_ONLY -- I'm not entirely sure you are real.
Re: [Update] mail/opensmtpd-filters/rspamd
On Sat, Sep 28, 2019 at 08:18:57AM +, gil...@poolp.org wrote:
> Hello,
>
> The following diff updates filter-rspamd to 0.1.3:
>
> - fixes a concurrency-related crash which has been observed by patrick@ and
> otto@
> - adds X-Spam-Symbols which was requested by florian@
Requested it such a strong word. I completely missed how all this
stuff interconnects. I thougt rspamd itself adds those headers. ;)
Thank you very much. Unfortunately I haven't gotten any spam yet, the
rdns filters are just too good :D so I can't tell if it actually works.
> - adds support for Rspamd headers addition / removals
>
> ok ?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 20 Sep 2019 16:41:53 - 1.2
> +++ Makefile 28 Sep 2019 08:15:01 -
> @@ -2,7 +2,7 @@
>
> COMMENT = rspamd integration to the OpenSMTPD daemon
the diff is mangled and didn't apply, space vs tab in this line ^
OK florian fwiw
>
> -V = 0.1.2
> +V = 0.1.3
> FILTER_NAME = rspamd
> DISTNAME = filter-rspamd-${V}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 20 Sep 2019 16:41:53 - 1.2
> +++ distinfo 28 Sep 2019 08:15:01 -
> @@ -1,2 +1,2 @@
> -SHA256 (filter-rspamd-0.1.2.tar.gz) =
> CD/0T2Bt0NrLdnEvOgGWCdkZHA6jMzLHs++mQPA+ves=
> -SIZE (filter-rspamd-0.1.2.tar.gz) = 3593
> +SHA256 (filter-rspamd-0.1.3.tar.gz) =
> horszy5OsVWArs+TWjm/XR3G5G/od2In2ZtEIGVEDmI=
> +SIZE (filter-rspamd-0.1.3.tar.gz) = 4193
--
I'm not entirely sure you are real.
[Update] mail/opensmtpd-filters/rspamd
Hello,
The following diff updates filter-rspamd to 0.1.3:
- fixes a concurrency-related crash which has been observed by patrick@ and
otto@
- adds X-Spam-Symbols which was requested by florian@
- adds support for Rspamd headers addition / removals
ok ?
Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 20 Sep 2019 16:41:53 - 1.2
+++ Makefile 28 Sep 2019 08:15:01 -
@@ -2,7 +2,7 @@
COMMENT = rspamd integration to the OpenSMTPD daemon
-V = 0.1.2
+V = 0.1.3
FILTER_NAME = rspamd
DISTNAME = filter-rspamd-${V}
Index: distinfo
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 20 Sep 2019 16:41:53 - 1.2
+++ distinfo 28 Sep 2019 08:15:01 -
@@ -1,2 +1,2 @@
-SHA256 (filter-rspamd-0.1.2.tar.gz) =
CD/0T2Bt0NrLdnEvOgGWCdkZHA6jMzLHs++mQPA+ves=
-SIZE (filter-rspamd-0.1.2.tar.gz) = 3593
+SHA256 (filter-rspamd-0.1.3.tar.gz) =
horszy5OsVWArs+TWjm/XR3G5G/od2In2ZtEIGVEDmI=
+SIZE (filter-rspamd-0.1.3.tar.gz) = 4193
[Update] mail/opensmtpd-filters/rspamd
Hello,
This bumps filter-rspamd to version 0.1.2 which fixes a few bugs so
it's all nice and shiny for the next OpenSMTPD release.
I fixed the README while at it, somehow a \n got lost somewhere and
we don't need absolute paths to filters anymore.
OK ?
Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- Makefile4 Sep 2019 12:27:42 - 1.1
+++ Makefile20 Sep 2019 15:14:24 -
@@ -2,7 +2,7 @@
COMMENT = rspamd integration to the OpenSMTPD daemon
-V =0.1.1
+V =0.1.2
FILTER_NAME = rspamd
DISTNAME = filter-rspamd-${V}
Index: distinfo
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- distinfo4 Sep 2019 12:27:42 - 1.1
+++ distinfo20 Sep 2019 15:14:24 -
@@ -1,2 +1,2 @@
-SHA256 (filter-rspamd-0.1.1.tar.gz) =
+rBcyCQ85bDWfrSZV7EmpmIQO4yR/0H5hehafmcSMlA=
-SIZE (filter-rspamd-0.1.1.tar.gz) = 3475
+SHA256 (filter-rspamd-0.1.2.tar.gz) =
CD/0T2Bt0NrLdnEvOgGWCdkZHA6jMzLHs++mQPA+ves=
+SIZE (filter-rspamd-0.1.2.tar.gz) = 3593
Index: pkg/README
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/pkg/README,v
retrieving revision 1.1
diff -u -p -r1.1 README
--- pkg/README 4 Sep 2019 12:27:42 - 1.1
+++ pkg/README 20 Sep 2019 15:14:24 -
@@ -8,11 +8,12 @@ To use filter-rspamd, you must declare i
Edit the /etc/mail/smtpd.conf file to declare the filter:
- filter "rspamd" proc-exec "${PREFIX}/libexec/smtpd/filter-rspamd"
+ filter "rspamd" proc-exec "filter-rspamd"
Then add the filter to each listener that should be filtered:
- listen on socket filter "rspamd" listen on all filter "rspamd"
+ listen on socket filter "rspamd"
+ listen on all filter "rspamd"
The filter itself doesn't have configuration and is controlled by
the Rspamd configuration itself.
