On 2023/11/07 19:30:43 +0100, Harald Dunkel <ha...@afaics.de> wrote:
> Hi Omar,
>
> sorry for the delay, but I have good news: The patch seems to
> work. Of course I will continue to watch it.
Thanks for verifying!
Before bumping the smtp-filter protocol version I took at look at what
we had in the port tree to know what would break, but this slipped.
apologize.
If it's OK for Giovanni and Joerg I'd like to commit this and backport
to 7.4-stable (same diff tested by Harald, reattaching for convenience.)
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/opensmtpd-filters/spamassassin/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 26 Sep 2023 12:28:14 -0000 1.8
+++ Makefile 5 Nov 2023 09:20:27 -0000
@@ -4,7 +4,7 @@ V = 0.7
FILTER_NAME = spamassassin
DISTNAME = filter-spamassassin-${V}
HOMEPAGE = https://www.umaxx.net/
-REVISION = 0
+REVISION = 1
CATEGORIES = mail
Index: patches/patch-filter-spamassassin_go
===================================================================
RCS file: patches/patch-filter-spamassassin_go
diff -N patches/patch-filter-spamassassin_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-filter-spamassassin_go 7 Nov 2023 19:14:58 -0000
@@ -0,0 +1,14 @@
+handle the smtpd filter-protocol version 0.7
+
+Index: filter-spamassassin.go
+--- filter-spamassassin.go.orig
++++ filter-spamassassin.go
+@@ -211,7 +211,7 @@ func run() {
+ for in.Scan() {
+ f := strings.Split(in.Text(), "|")
+ t, ver, ev, sid := f[0], f[1], f[4], f[5]
+- if (t != "filter" && t != "report") || ver != "0.6" {
++ if (t != "filter" && t != "report") || ver != "0.7" {
+ l3.Err(fmt.Sprintln(sid, "protocol", t, ver))
+ return
+ }
