From nobody Tue Jan 3 18:59:55 2023 X-Original-To: dev-commits-ports-main@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 4Nmhqw0yPZz2pR1L; Tue, 3 Jan 2023 18:59:56 +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 4Nmhqw0CXPz46gM; Tue, 3 Jan 2023 18:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672772396; 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=6/DWuVec0b+s4HJovxtCiEClifjwpNdqbEJY5ZAAK3g=; b=vh6zbito6jyf3wBDdwO32OhOQWZHFsDjZGV83VcPaZaTVPDmxqgt/80e8aLDeXuDI7iGZ5 UsyfqYSPagAJ0fs2lCsFUzR0J/uZ1lP7w46+ZL9cw5mVcxwKhDeEjjkPjMINkFgMAJ0eda kWX+vS7b2HGqHGVr9dz0biIDLBl1qspbb+WPto1zHIxjBRWRpn9QNmq/RZqhEMFtgM+i0p dAI+1Ct8PMiAAsaSg3Ua/o95ID9UYtIiDroJ43GWuX2nVPPTo4TSxO7xB0cdPl/nWdPDmd T/MQOCRpVZbRXzLvNzM1K6OuBEaLWpOWQ913upOxRPz0rKESiv5PDpn26pU2sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672772396; 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=6/DWuVec0b+s4HJovxtCiEClifjwpNdqbEJY5ZAAK3g=; b=bGIExghlI0tdbT4uRGBOeLeHnRK/+v+HWD/hd0WOwuUQuLHjnUU8lrsBkhcDunaZbkEVr8 s7jZUtxwEyag6VTdjGLVTJ/JwZIzHdL9c1qk8/UzoICnN2LpJM4ubNTpGcZrZukkyzApnr QLc/FVrW9gD3QyA5MPS8LsqbNGHMsPok2AkFRrWdZ3kjGWUzza14eMP8Mnbq3kcMT+Q93l 5eg5Ma2GslaXWqKuUL6nWgREV2n44g4HCrIcPomwWYpthdfPxgezelm2aiMXtlpBswOGkQ /GMYinOeErLzZtZLY5jFGCTJ1XZtX2hCqnqjAhH28xuedhl6P4hZzj9WKiYuiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672772396; a=rsa-sha256; cv=none; b=lrvulfFEAo64RW/wCTypWwXGSuQFQrR3+hNMoUimTMfKFa9ayUwjwaxIB7gGJ9701stD9u lFTJScFnBSuijWs9aR+BSD2dx1xc1gxAO5+D1Mxi3qa/vdndwYanW/mP6Ey40cX/k0J9KD n2OTTKS3VJP0rcJhLcOig74mDgCGGaxrnXPsDViDnqwPXRQN4Wve2+xqsIOZ63Na7DS0yU BY2FgZbDwAs172OG7H5bfeN30ynXiSnOp7VLZwIpcRhAGHMPtFzQ1bEys1qw0evOLGdxXO HbEY893rxtU/V7kMQJKQXF0FPRfbv00+5itD6PKK5dpuQSjTp9/hsekU+ud/9g== 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 4Nmhqv6Ln7zhqb; Tue, 3 Jan 2023 18:59:55 +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 303IxtJP004370; Tue, 3 Jan 2023 18:59:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 303IxtWO004369; Tue, 3 Jan 2023 18:59:55 GMT (envelope-from git) Date: Tue, 3 Jan 2023 18:59:55 GMT Message-Id: <202301031859.303IxtWO004369@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 1f3e72b3f6f9 - main - mail/spamassassin: Fix command_interpreter regression List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f3e72b3f6f9b79ad1aa36881ff1ab8c00daaf83 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f3e72b3f6f9b79ad1aa36881ff1ab8c00daaf83 commit 1f3e72b3f6f9b79ad1aa36881ff1ab8c00daaf83 Author: Cy Schubert AuthorDate: 2023-01-03 18:56:58 +0000 Commit: Cy Schubert CommitDate: 2023-01-03 18:56:58 +0000 mail/spamassassin: Fix command_interpreter regression PR/196517, the rc script unable to find its .pid file, has returned. Restore SVN r376379 (691102663fb), fixing this bug again. PR: 196517 Reported by: ler --- mail/spamassassin/Makefile | 1 + mail/spamassassin/files/sa-spamd.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 06247a49d10b..4c0c3d949cec 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,5 +1,6 @@ PORTNAME= spamassassin PORTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES?= mail perl5 MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} diff --git a/mail/spamassassin/files/sa-spamd.in b/mail/spamassassin/files/sa-spamd.in index a7f37032947f..a32ae96ffb3b 100644 --- a/mail/spamassassin/files/sa-spamd.in +++ b/mail/spamassassin/files/sa-spamd.in @@ -40,7 +40,6 @@ restart_precmd="precmd" pidfile=${spamd_pidfile:-"/var/run/${name}/${name}.pid"} command=%%PREFIX%%/bin/${name} command_args="-d -r ${pidfile}" -command_interpreter="%%PREFIX%%/bin/perl" required_dirs="%%PREFIX%%/share/spamassassin" precmd()