From nobody Wed Feb 07 20:31:58 2024 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 4TVWxV6v2Pz5B2Ty; Wed, 7 Feb 2024 20:31:58 +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 4TVWxV4j4wz48WX; Wed, 7 Feb 2024 20:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707337918; 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=JSsCijhKKZDqD5zBLCIsFkK9EjjfK6M+HMRU2whE9Z4=; b=tgX/1BpWlNbkapiF6Y145+UGIAGLQJmA47Q0o+inETcD4lcsWgEqXcaVALJKahatsiyOD7 AY+qxZ505Wo5BoId/T/8u5m+oVnvPiL8JIXu7ZN+Ooi2DLEyq7bJpWeYAnubGmR8zzf23e 4erJVjGX9J5j8oH3tK80+Z/WIUXcG1cx97ylg/NpHXF11yr8Y9LdKlWf1s2VQ3clZxlObT N51GvY05wptKfx/DVQrC4yhwbRJfp46AgDqgOBvPI2o9EhhhX8WgwVTbOzsKe2SAcK2w8w d3g33CajoAWPRNXXeiH0CbC3W6aErh5cxKTPxoGU0Byc8esScxxjBKVs0S2wNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707337918; 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=JSsCijhKKZDqD5zBLCIsFkK9EjjfK6M+HMRU2whE9Z4=; b=KflpmcYpOg2rr2O7FrYp9rSMtfVZ9Z8JTspMpqnuM8rD90V9Roxa1a4WZEleW3dH7ZH2xt cWghM1asz9ES9CwDgtgax8CmCBEmOXEWwYQJtHPnXlbEm2xjZG8PlaISitJi229z9dTpIZ F9JdhzyjX6yZ3oYjfhamU/S9Vc17tZdltCuaeYoDRbmcI5fTQN/xr9tJfh/6529uAox67G e8TnlbrnmR+Pp2x+1rtdHu4fifZH0lgesdYoqKcFsFJDqAMxdPf8RalwExOnWj7CT6JTcB //c1gJd+tdlVsNr3yTNBO0Y7ljjPo3rIdi1d0R/l8msj36SJElEryq8yLnEzmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707337918; a=rsa-sha256; cv=none; b=Hxh3mkVoPWX8ZYCkuqm+Vnt6dIdjtP+UiR0Nxi7Tqar0cSlyKiroZvzAUTK91lPoqZKEhM GvogrCBClPocCxx+vUSx61oG3lXstxNvpgf0VDtLkSjM6BKdYXzGSQm+bhgE3Rcd9kdsuB T4xEfBRjz40kC8zpZz7FyOeLTtY03We+3nbRBO3asOtXVJu/JFYamEPmv6L2he0LLpq8O3 euRjU1LjPSIETn4fvvgJ/+tYKj2kRDW6gKDdBFaHb7kA4S8C0LWBa6sa5kmGQ5qsSMukYN fCvZJxhZSL+Y/b4Isqoh5lNepg4ritQhgr8gZQMFHU+13DfhnK9LJ+f21zOxqg== 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 4TVWxV3p1nzLfS; Wed, 7 Feb 2024 20:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 417KVwDl004319; Wed, 7 Feb 2024 20:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 417KVwsI004316; Wed, 7 Feb 2024 20:31:58 GMT (envelope-from git) Date: Wed, 7 Feb 2024 20:31:58 GMT Message-Id: <202402072031.417KVwsI004316@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: 528a08b5e895 - main - mail/spamassassin*: Keep sa-update-keys 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: 528a08b5e895ddc8e78a3d9b37583ccb88fe0339 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=528a08b5e895ddc8e78a3d9b37583ccb88fe0339 commit 528a08b5e895ddc8e78a3d9b37583ccb88fe0339 Author: Cy Schubert AuthorDate: 2024-02-07 20:04:05 +0000 Commit: Cy Schubert CommitDate: 2024-02-07 20:31:20 +0000 mail/spamassassin*: Keep sa-update-keys sa-update-keys was removed in 2015 due to upstream bug #7208. The requestor asks that they be retained after deinstall to facilite updates. Reported by: ler --- mail/spamassassin-devel/Makefile | 2 +- mail/spamassassin-devel/files/pkg-message.in | 3 +++ mail/spamassassin-devel/pkg-plist | 1 - mail/spamassassin/Makefile | 2 +- mail/spamassassin/files/pkg-message.in | 3 +++ mail/spamassassin/pkg-plist | 1 - 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mail/spamassassin-devel/Makefile b/mail/spamassassin-devel/Makefile index e755fc037e8a..19694f7a1648 100644 --- a/mail/spamassassin-devel/Makefile +++ b/mail/spamassassin-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= spamassassin PORTVERSION= ${SA_COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= mail perl5 PKGNAMESUFFIX= -devel diff --git a/mail/spamassassin-devel/files/pkg-message.in b/mail/spamassassin-devel/files/pkg-message.in index 0a666d5b4407..69ef48ab1713 100644 --- a/mail/spamassassin-devel/files/pkg-message.in +++ b/mail/spamassassin-devel/files/pkg-message.in @@ -23,6 +23,9 @@ You should complete the following post-installation tasks: 5) Install mail/spamass-rules if you want some third-party spam-catching rulesets + 6) Remove %%ETCDIR%%/sa-update-keys if this software is no + longer needed. + SECURITY NOTE: By default, spamd runs as root (the AS_ROOT option). If you wish to change this, add the following to /etc/rc.conf: diff --git a/mail/spamassassin-devel/pkg-plist b/mail/spamassassin-devel/pkg-plist index 8bd3b186036b..1409f5cdad43 100644 --- a/mail/spamassassin-devel/pkg-plist +++ b/mail/spamassassin-devel/pkg-plist @@ -6,7 +6,6 @@ bin/sa-update bin/spamassassin bin/spamc bin/spamd -@preunexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true @sample %%ETCDIR%%/init.pre.sample @sample %%ETCDIR%%/local.cf.sample @sample %%ETCDIR%%/v310.pre.sample diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index dbc859c64884..6104f9183f61 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,6 +1,6 @@ PORTNAME= spamassassin PORTVERSION= 4.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES?= mail perl5 MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} diff --git a/mail/spamassassin/files/pkg-message.in b/mail/spamassassin/files/pkg-message.in index e9e9aa9476a8..e3deef4e7f40 100644 --- a/mail/spamassassin/files/pkg-message.in +++ b/mail/spamassassin/files/pkg-message.in @@ -23,6 +23,9 @@ You should complete the following post-installation tasks: 5) Install mail/spamass-rules if you want some third-party spam-catching rulesets + 6) Remove %%ETCDIR%%/sa-update-keys if this software is no + longer needed. + SECURITY NOTE: By default, spamd runs as root (the AS_ROOT option). If you wish to change this, add the following to /etc/rc.conf: diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist index c3b3c08aac80..7cd9c3a9f0b1 100644 --- a/mail/spamassassin/pkg-plist +++ b/mail/spamassassin/pkg-plist @@ -6,7 +6,6 @@ bin/sa-update bin/spamassassin bin/spamc bin/spamd -@preunexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true @sample %%ETCDIR%%/init.pre.sample @sample %%ETCDIR%%/local.cf.sample @sample %%ETCDIR%%/v310.pre.sample