From owner-svn-ports-head@freebsd.org Tue Oct 13 19:44:43 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 54490449D7F; Tue, 13 Oct 2020 19:44:43 +0000 (UTC) (envelope-from crees@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C9mGM1Yt4z4CQb; Tue, 13 Oct 2020 19:44:43 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00E8B2294D; Tue, 13 Oct 2020 19:44:43 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09DJig3W005862; Tue, 13 Oct 2020 19:44:42 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09DJig5N005860; Tue, 13 Oct 2020 19:44:42 GMT (envelope-from crees@FreeBSD.org) Message-Id: <202010131944.09DJig5N005860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Tue, 13 Oct 2020 19:44:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552279 - in head/mail/mailscanner: . files X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head/mail/mailscanner: . files X-SVN-Commit-Revision: 552279 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2020 19:44:43 -0000 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 +@postunexec [ -L %D/etc/mail/spamassassin/mailscanner.cf ] && rm %D/etc/mail/spamassassin/mailscanner.cf || true