aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2024-02-07 20:04:05 +0000
committerCy Schubert <cy@FreeBSD.org>2024-02-07 20:31:20 +0000
commit528a08b5e895ddc8e78a3d9b37583ccb88fe0339 (patch)
treeeffae661d46e2cc9da6cf224da6fa463b7e4e753
parentba5777140ec41aae909456f6da77e1b336f52fcb (diff)
downloadports-528a08b5e895ddc8e78a3d9b37583ccb88fe0339.tar.gz
ports-528a08b5e895ddc8e78a3d9b37583ccb88fe0339.zip
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
-rw-r--r--mail/spamassassin-devel/Makefile2
-rw-r--r--mail/spamassassin-devel/files/pkg-message.in3
-rw-r--r--mail/spamassassin-devel/pkg-plist1
-rw-r--r--mail/spamassassin/Makefile2
-rw-r--r--mail/spamassassin/files/pkg-message.in3
-rw-r--r--mail/spamassassin/pkg-plist1
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