From owner-svn-ports-all@freebsd.org Tue Feb 25 00:42:14 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 11C6224A038; Tue, 25 Feb 2020 00:42:14 +0000 (UTC) (envelope-from bmah@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48RKrj6mpWz47Zd; Tue, 25 Feb 2020 00:42:13 +0000 (UTC) (envelope-from bmah@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E19036237; Tue, 25 Feb 2020 00:42:13 +0000 (UTC) (envelope-from bmah@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01P0gDla029024; Tue, 25 Feb 2020 00:42:13 GMT (envelope-from bmah@FreeBSD.org) Received: (from bmah@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01P0gD3P029022; Tue, 25 Feb 2020 00:42:13 GMT (envelope-from bmah@FreeBSD.org) Message-Id: <202002250042.01P0gD3P029022@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bmah set sender to bmah@FreeBSD.org using -f From: "Bruce A. Mah" Date: Tue, 25 Feb 2020 00:42:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527056 - in head/mail/spamass-milter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bmah X-SVN-Commit-Paths: in head/mail/spamass-milter: . files X-SVN-Commit-Revision: 527056 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2020 00:42:14 -0000 Author: bmah Date: Tue Feb 25 00:42:13 2020 New Revision: 527056 URL: https://svnweb.freebsd.org/changeset/ports/527056 Log: mail/spamass-milter: Fix a problem where DKIM results would always fail. Imported a patch submitted to upstream to fix CR/LF handling [1]. Also see [2]. [1] https://savannah.nongnu.org/bugs/index.php?57626 [2] https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7785 Reported by: Keith Clarke Added: head/mail/spamass-milter/files/patch-spamass-milter.cpp (contents, props changed) Modified: head/mail/spamass-milter/Makefile Modified: head/mail/spamass-milter/Makefile ============================================================================== --- head/mail/spamass-milter/Makefile Mon Feb 24 23:46:25 2020 (r527055) +++ head/mail/spamass-milter/Makefile Tue Feb 25 00:42:13 2020 (r527056) @@ -3,7 +3,7 @@ PORTNAME= spamass-milter PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SAVANNAH/spamass-milt Added: head/mail/spamass-milter/files/patch-spamass-milter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamass-milter/files/patch-spamass-milter.cpp Tue Feb 25 00:42:13 2020 (r527056) @@ -0,0 +1,27 @@ +--- spamass-milter.cpp ++++ spamass-milter.cpp +@@ -1206,7 +1206,23 @@ mlfi_header(SMFICTX* ctx, char* headerf, + assassin->set_subject(headerv); + + // assemble header to be written to SpamAssassin +- string header = string(headerf) + ": " + headerv + "\r\n"; ++ string header = headerv; ++ ++ // Replace all LF with CRLF ++ // As milter documentation says: ++ // headerv Header field value. The content of the header may ++ // include folded white space, i.e., multiple lines with following ++ // white space where lines are separated by LF (not CR/LF). The ++ // trailing line terminator (CR/LF) is removed. ++ // Need to make sure folded header line breaks are sent to SA as CRLF ++ string::size_type idx = header.size(); ++ while ( (idx = header.rfind("\n", idx)) != string::npos ) ++ { ++ header.replace(idx,1,"\r\n"); ++ } ++ ++ // final assembly ++ header = string(headerf) + ": " + header + "\r\n"; + + try { + // write to SpamAssassin client