diff options
| author | Chris Rees <crees@FreeBSD.org> | 2020-10-13 19:44:42 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2020-10-13 19:44:42 +0000 |
| commit | 05d73e85e9338e287b1d3c19d729a15a6f4cbb26 (patch) | |
| tree | b76809063761865d1d9e562371f255dc906f1448 /mail/mailscanner | |
| parent | 8428bff8b74bc56e3b59f0b54f7cdb53e019ca61 (diff) | |
| download | ports-05d73e85e9338e287b1d3c19d729a15a6f4cbb26.tar.gz ports-05d73e85e9338e287b1d3c19d729a15a6f4cbb26.zip | |
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.
Notes
Notes:
svn path=/head/; revision=552279
Diffstat (limited to 'mail/mailscanner')
| -rw-r--r-- | mail/mailscanner/Makefile | 2 | ||||
| -rw-r--r-- | mail/mailscanner/files/pkg-install.in | 14 | ||||
| -rw-r--r-- | mail/mailscanner/pkg-plist | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 42a61c355586..9e5fb0b23e4c 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -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 diff --git a/mail/mailscanner/files/pkg-install.in b/mail/mailscanner/files/pkg-install.in index 84af0bef5d19..63fa31e171c2 100644 --- a/mail/mailscanner/files/pkg-install.in +++ b/mail/mailscanner/files/pkg-install.in @@ -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 diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist index 624a568d5a43..956cdd852044 100644 --- a/mail/mailscanner/pkg-plist +++ b/mail/mailscanner/pkg-plist @@ -551,3 +551,4 @@ lib/MailScanner/systemd/ms-milter lib/MailScanner/systemd/ms-systemd lib/MailScanner/wrapper/sophos-autoupdate lib/MailScanner/wrapper/sophos-wrapper +@postunexec [ -L %D/etc/mail/spamassassin/mailscanner.cf ] && rm %D/etc/mail/spamassassin/mailscanner.cf || true |