svn commit: r552279 - in head/mail/mailscanner: . files
Chris Rees
crees at FreeBSD.org
Tue Oct 13 19:44:43 UTC 2020
Author: crees
Date: Tue Oct 13 19:44:42 2020
New Revision: 552279
URL: https://svnweb.freebsd.org/changeset/ports/552279
Log:
Fix spamassassin symlink.
At some point in the distant past there was a config file called
spam.assassin.prefs.conf. This was renamed to spamassassin.conf,
but the symlink in %D/etc/mail/spamassassin still pointed to the
old location. This worked fine for old installs, but new installs
were left out. This should DTRT for both without administrator
intervention necessary.
Modified:
head/mail/mailscanner/Makefile
head/mail/mailscanner/files/pkg-install.in
head/mail/mailscanner/pkg-plist
Modified: head/mail/mailscanner/Makefile
==============================================================================
--- head/mail/mailscanner/Makefile Tue Oct 13 18:45:45 2020 (r552278)
+++ head/mail/mailscanner/Makefile Tue Oct 13 19:44:42 2020 (r552279)
@@ -3,7 +3,7 @@
PORTNAME= MailScanner
PORTVERSION= 5.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= https://s3.amazonaws.com/msv5/release/
DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix
Modified: head/mail/mailscanner/files/pkg-install.in
==============================================================================
--- head/mail/mailscanner/files/pkg-install.in Tue Oct 13 18:45:45 2020 (r552278)
+++ head/mail/mailscanner/files/pkg-install.in Tue Oct 13 19:44:42 2020 (r552279)
@@ -103,10 +103,16 @@ initial_config()
case $2 in
POST-INSTALL)
- [ "x${WITHOUT_SPAMASSASSIN_SYMLINK}" = "xno" ] \
- && [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \
- && ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \
- ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
+ if [ "${WITHOUT_SPAMASSASSIN_SYMLINK}" = "no" ] && \
+ [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ]; then
+ if [ -r ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ]; then
+ ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \
+ ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
+ else
+ ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spamassassin.conf \
+ ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
+ fi
+ fi
upgrade_lang_conf
[ -f ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf ] \
&& upgrade_mailscanner_conf
Modified: head/mail/mailscanner/pkg-plist
==============================================================================
--- head/mail/mailscanner/pkg-plist Tue Oct 13 18:45:45 2020 (r552278)
+++ head/mail/mailscanner/pkg-plist Tue Oct 13 19:44:42 2020 (r552279)
@@ -551,3 +551,4 @@ lib/MailScanner/systemd/ms-milter
lib/MailScanner/systemd/ms-systemd
lib/MailScanner/wrapper/sophos-autoupdate
lib/MailScanner/wrapper/sophos-wrapper
+ at postunexec [ -L %D/etc/mail/spamassassin/mailscanner.cf ] && rm %D/etc/mail/spamassassin/mailscanner.cf || true
More information about the svn-ports-all
mailing list