From nobody Sat Apr 9 18:01:58 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 21E901AAD56D; Sat, 9 Apr 2022 18:01:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KbNHB4cJsz3NJW; Sat, 9 Apr 2022 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649527318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R9SvfgcCLW/joB4d/iKaEvrLCrGa/8KkiIsJ2C33n+o=; b=sylGTKtreMwWGEi5N4Fo5i32UVduau893Wg5HtI5c10MAe0OlqQrAXOyAOwwyCz5AXE6cQ ZR4zjahkplf6yq1sKHOaet5z8l/pqtDTeif6nx+5AoMapMvKza0ZZMEyz48EmpijEikkPz Ck0HN7S6aK1oBO4SHs+2GafoMi6Bynx+eeyRQAANKUiTtNLoMNvAdCKuxi4ih3lY6HdjOs KIRhn4/j3qfFB7mohczfof6afe+cX9Ip/NENaPvMYmb1AiaQd7EMm565B1CcqO+GwH6Hpi BDKEkgXNmnyzVB4B7AnYe46JR8iCy5HzOfGOMeoQkYKDCLSXJ9YtCpJW5SSLgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68B491E8D5; Sat, 9 Apr 2022 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 239I1wDm097441; Sat, 9 Apr 2022 18:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 239I1w0x097440; Sat, 9 Apr 2022 18:01:58 GMT (envelope-from git) Date: Sat, 9 Apr 2022 18:01:58 GMT Message-Id: <202204091801.239I1w0x097440@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Michael Gmelin Subject: git: 318255d4921c - 2022Q2 - mail/spampd: Unbreak with spamassassin 3.4+ List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 318255d4921caaf82c3c48d90bd9135d0ff41453 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649527318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R9SvfgcCLW/joB4d/iKaEvrLCrGa/8KkiIsJ2C33n+o=; b=UvMLldmk0ABI4CYVMuDevje+BI7DtvR0424arnHZf00JVsKo//5dGd9MyNzr1ewAdqpAyu U/I1D2Mc9qS2uSU3VEXSJHvQvRiPtDOd72gaAb7iikyEsSo14ND193Ggi+IaqMILuZB0H2 Nx+0gpIhsEw0QNLnm5MXGHfy7SKtTQzx/MQEA88/U3iqz6H4SebKxE56kiPo8NB82s2wxT UxXCiVCzKmsPzGiwZyr4cFymBMvn7FU3DdvOlFrK7kR0DMvZUvdli1eoA0HsX00PdhhuRn 0TQWk0bAIDFKtEJnpJXRZFLdB2SYcz+bntIRcXxSNVOSIG+TBv+UCs85BHABlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649527318; a=rsa-sha256; cv=none; b=N5MOB58QuG/I8IEC6puIB8GNpzAXEBry5pzrgFXh53Hbh8mblbHrVk0/V45fAjWqGW0UxB EY2KfZ7LzK9zUEy8KSflVfhPiMwvB+0SClLuW5h3YF662vb0bwm8YrSlDlQubFUNc7EG6e I6MmsY8ez3DHdG9xSGulleoxvScC5vDrgnnVi8E/2+K/uklsz7GzXvltgpG3rgjEznGNrq Ghi6eHX4Das/EI+Bmjq1yAgUFv30sZh66k22wVemRBTX0tTuFFICB70F81U9XTc10qzdfJ cP9YIKFimj9u0uUyarulhBQh0CevXe7A1223kyXKdzym9Lt0fSXc3R5Pa5eTcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=318255d4921caaf82c3c48d90bd9135d0ff41453 commit 318255d4921caaf82c3c48d90bd9135d0ff41453 Author: Jonathan Chen AuthorDate: 2022-04-09 17:58:22 +0000 Commit: Michael Gmelin CommitDate: 2022-04-09 18:01:23 +0000 mail/spampd: Unbreak with spamassassin 3.4+ PR: 262235 (cherry picked from commit adbaba0606ebeb620dc7425d43b8fe83a6eff08f) --- mail/spampd/Makefile | 2 +- mail/spampd/files/spampd.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mail/spampd/Makefile b/mail/spampd/Makefile index b32e09bd6346..a722e979fb4e 100644 --- a/mail/spampd/Makefile +++ b/mail/spampd/Makefile @@ -2,7 +2,7 @@ PORTNAME= spampd PORTVERSION= 2.61 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail perl5 MAINTAINER= ports@FreeBSD.org diff --git a/mail/spampd/files/spampd.in b/mail/spampd/files/spampd.in index e74206334207..b55059fdfaf0 100644 --- a/mail/spampd/files/spampd.in +++ b/mail/spampd/files/spampd.in @@ -22,8 +22,7 @@ rcvar=spampd_enable : ${spampd_enable="NO"} : ${spampd_pidfile="/var/run/spamd/spampd.pid"} -: ${spampd_flags="--user=spamd --group=spamd --host 127.0.0.1:10024 --relayhost=127.0.0.1:10025 --dose --tagall --auto-whitelist"} - +: ${spampd_flags="--user=spamd --group=spamd --homedir=/var/spool/spamd --host=127.0.0.1:10025 --relayhost=127.0.0.1:10026 --dose --tagall"} load_rc_config $name command="%%PREFIX%%/sbin/$name"