Date: Mon, 7 Nov 2016 00:59:19 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425590 - in head/mail/spamassassin: . files Message-ID: <201611070059.uA70xJHF053141@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Nov 7 00:59:19 2016 New Revision: 425590 URL: https://svnweb.freebsd.org/changeset/ports/425590 Log: Follow up to r425497. sa-update isn't the problem, it's sa-update in the plist. Remove the UPDATE_ON_INSTALL option entirely, and just add a blurb to the pkg-message instructing people to run sa-update and sa-compile manually. Thanks to Matthew Fuller for prodding a better solution. Deleted: head/mail/spamassassin/files/patch-sa-update.raw Modified: head/mail/spamassassin/Makefile head/mail/spamassassin/files/pkg-message.in head/mail/spamassassin/pkg-plist Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Mon Nov 7 00:27:54 2016 (r425589) +++ head/mail/spamassassin/Makefile Mon Nov 7 00:59:19 2016 (r425590) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.1 -PORTREVISION?= 8 # also bump japanese/spamassassin +PORTREVISION?= 9 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} @@ -46,7 +46,7 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/et LOCALSTATEDIR="${DBDIR}/spamassassin" \ BUILD_SPAMC=yes -OPTIONS_DEFINE= AS_ROOT SSL UPDATE_AND_COMPILE +OPTIONS_DEFINE= AS_ROOT SSL OPTIONS_GROUP= DATABASE GPG PLUGINS OPTIONS_GROUP_DATABASE= MYSQL PGSQL OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY @@ -56,7 +56,6 @@ OPTIONS_DEFAULT= AS_ROOT GNUPG SSL UPDAT AS_ROOT_DESC= Run spamd as root (recommended) SSL_DESC= Build spamd/spamc with SSL support -UPDATE_AND_COMPILE_DESC=Download and compile rulesets (recommended) DATABASE_DESC= Optional user-config/bayes database backends @@ -105,7 +104,6 @@ PYZOR_INITVAR= Pyzor RAZOR_INITVAR= Razor2 RELAY_COUNTRY_INITVAR= RelayCountry SPF_QUERY_INITVAR= SPF -UPDATE_AND_COMPILE_INITVAR= Rule2XSBody DOCS= CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql @@ -130,12 +128,6 @@ SUB_LIST+= SQL_FLAG="-Q" SUB_LIST+= SQL_FLAG="" .endif -.if ${PORT_OPTIONS:MUPDATE_AND_COMPILE} && empty(PACKAGE_BUILDING) && empty(BATCH) -PLIST_SUB+= UPDATE_ON_INSTALL="yes" -.else -PLIST_SUB+= UPDATE_ON_INSTALL="no" -.endif - post-patch:: ${REINPLACE_CMD} -e 's,B_CONFDIR)/local.cf,B_CONFDIR)/local.cf.sample,g' \ -e 's,B_CONFDIR)/init.pre,B_CONFDIR)/init.pre.sample,g' \ @@ -150,7 +142,7 @@ post-patch:: ${REINPLACE_CMD} -e '/^CC =/d; \ s|@SSLCFLAGS@|& $${CFLAGS}|g' ${WRKSRC}/spamc/Makefile.in -.for var in ${OPTIONS_GROUP_PLUGINS} UPDATE_AND_COMPILE +.for var in ${OPTIONS_GROUP_PLUGINS} . if ${PORT_OPTIONS:M${var}} ${REINPLACE_CMD} -e '/${${var}_INITVAR}/s/^\#.*loadplugin/loadplugin/' ${WRKSRC}/rules/*.pre . else Modified: head/mail/spamassassin/files/pkg-message.in ============================================================================== --- head/mail/spamassassin/files/pkg-message.in Mon Nov 7 00:27:54 2016 (r425589) +++ head/mail/spamassassin/files/pkg-message.in Mon Nov 7 00:59:19 2016 (r425590) @@ -14,7 +14,12 @@ You should complete the following post-i 3) To run spamd, add the following to /etc/rc.conf: spamd_enable="YES" - 4) Install mail/spamass-rules if you want some third-party + 4) If this is a new installation, you should run sa-update + and sa-compile. If this isn't a new installation, you + should probably run those commands on a regular basis + anyway. + + 5) Install mail/spamass-rules if you want some third-party spam-catching rulesets SECURITY NOTE: Modified: head/mail/spamassassin/pkg-plist ============================================================================== --- head/mail/spamassassin/pkg-plist Mon Nov 7 00:27:54 2016 (r425589) +++ head/mail/spamassassin/pkg-plist Mon Nov 7 00:59:19 2016 (r425590) @@ -221,5 +221,3 @@ lib/libspamc.so.0 @postunexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'" @postunexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && [ -d /var/spool/spamd ] && echo " Note that this will remove /var/spool/spamd" @comment ################################################################## -@postexec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Downloading SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-update || true; fi -@postexec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Compiling SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-compile || true; fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611070059.uA70xJHF053141>