On 2023/11/07 22:44:56 +0100, Giovanni Bechis <giova...@openbsd.org> wrote: > On 11/7/23 20:16, Omar Polo wrote: > > 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: 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)) > does this still works with previous protocol versions ?
The only difference between 0.6 and 0.7 is the order of the link-auth fields (`result' and `username' were swapped.) As far as I can see, filter-spamassassin doesn't use it, so it should work as usual on both 0.6 and 0.7 versions. > ok giovanni@ in any case for current and 7.4 since it will be a no-op on > OpenBSD. Thanks :)