Hi, On Sat, Sep 24, 2016 at 09:32:42AM +0100, Stuart Henderson wrote: > Correct, /var/run things shouldn't be @sample'd in PLIST.
Indeed. My bad. > so if _rspamd:_rspamd is needed, it needs fixing in the rc script. The lock file mode is like this: -rw-r--r-- 1 root wheel 5 Sep 27 17:29 rspamd.pid So I think it is fine the way it is. Updated diff below -- I have one OK, anyone else? Index: Makefile =================================================================== RCS file: /home/edd/cvsync/ports/mail/rspamd/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 12 Sep 2016 09:48:37 -0000 1.21 +++ Makefile 27 Sep 2016 16:28:44 -0000 @@ -3,6 +3,7 @@ COMMENT= event-driven spam filtering system in C/Lua DISTNAME = rspamd-1.3.5 +REVISION = 0 EXTRACT_SUFX= .tar.xz CATEGORIES= mail Index: patches/patch-src_libserver_html_c =================================================================== RCS file: patches/patch-src_libserver_html_c diff -N patches/patch-src_libserver_html_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_libserver_html_c 27 Sep 2016 16:28:44 -0000 @@ -0,0 +1,35 @@ +$OpenBSD$ + +Fix crash due to memcpy on overlapping memory regions. + +https://github.com/vstakhov/rspamd/commit/9ac183e4ae31c1a5637dc371fbfff53a9adb2531 + +--- src/libserver/html.c.orig Thu Aug 25 13:14:57 2016 ++++ src/libserver/html.c Tue Sep 20 14:41:03 2016 +@@ -691,7 +691,7 @@ rspamd_html_decode_entitles_inplace (gchar *s, guint l + t += rep_len; + } + else { +- memcpy (t, e, h - e); ++ memmove (t, e, h - e); + t += h - e; + } + } +@@ -713,7 +713,7 @@ rspamd_html_decode_entitles_inplace (gchar *s, guint l + } + if (end_ptr != NULL && *end_ptr != '\0') { + /* Skip undecoded */ +- memcpy (t, e, h - e); ++ memmove (t, e, h - e); + t += h - e; + } + else { +@@ -736,7 +736,7 @@ rspamd_html_decode_entitles_inplace (gchar *s, guint l + t += g_unichar_to_utf8 (val, t); + } + else { +- memcpy (t, e, h - e); ++ memmove (t, e, h - e); + t += h - e; + } + } Index: patches/patch-src_libserver_url_c =================================================================== RCS file: patches/patch-src_libserver_url_c diff -N patches/patch-src_libserver_url_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_libserver_url_c 27 Sep 2016 16:28:44 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Fix crash in url_email_start(). + +https://github.com/vstakhov/rspamd/commit/1b33ef8ab63be63ba712a456c846fe427c347d37 + +--- src/libserver/url.c.orig Thu Aug 25 13:14:57 2016 ++++ src/libserver/url.c Fri Sep 23 14:01:32 2016 +@@ -1925,9 +1925,13 @@ url_email_start (struct url_callback_data *cb, + cb->last_at = NULL; + return FALSE; + } ++ else if (pos == cb->begin) { ++ /* Just @ at the start of input */ ++ return FALSE; ++ } + } + +- if (pos > cb->begin - 1) { ++ if (pos >= cb->begin + 1) { + match->st = *(pos - 1); + } + else { -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
