From owner-svn-ports-head@FreeBSD.ORG Fri Jul 4 12:01:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0274217; Fri, 4 Jul 2014 12:01:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA8E422CB; Fri, 4 Jul 2014 12:01:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64C10Vl018501; Fri, 4 Jul 2014 12:01:00 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64C10TW018311; Fri, 4 Jul 2014 12:01:00 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407041201.s64C10TW018311@svn.freebsd.org> From: Adam Weinberger Date: Fri, 4 Jul 2014 12:01:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360602 - in head/mail/spamass-rules: . files X-SVN-Group: ports-head 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.18 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: Fri, 04 Jul 2014 12:01:00 -0000 Author: adamw Date: Fri Jul 4 12:00:59 2014 New Revision: 360602 URL: http://svnweb.freebsd.org/changeset/ports/360602 QAT: https://qat.redports.org/buildarchive/r360602/ Log: Stage support, clean up, slightly better descriptions for some items. Most of these files are probably outdated by now... will have to fix that. Modified: head/mail/spamass-rules/Makefile head/mail/spamass-rules/files/pkg-message.in Modified: head/mail/spamass-rules/Makefile ============================================================================== --- head/mail/spamass-rules/Makefile Fri Jul 4 11:57:12 2014 (r360601) +++ head/mail/spamass-rules/Makefile Fri Jul 4 12:00:59 2014 (r360602) @@ -10,151 +10,87 @@ COMMENT= Custom rulesets for SpamAssassi RUN_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin -NO_OPTIONS_SORT= yes -OPTIONS_DEFINE= \ - AHBL \ - AIRMAX \ - BACKHAIR \ - BOGUS_VIRUS \ - CHICKENPOX \ - CHINESE \ - DBRACKETS \ - EVILNUMBERS \ - GERMAN \ - GREEK \ - MALWARE \ - MANGLED \ - MIMEVLD \ - MSPIKE \ - NIXSPAM \ - RANDOM \ - TRIPWIRE \ - WEEDS +USES= tar:bzip2 + +OPTIONS_DEFINE= AIRMAX BACKHAIR BOGUS_VIRUS CHICKENPOX DBRACKETS \ + EVILNUMBERS MANGLED MIMEVLD RANDOM TRIPWIRE OPTIONS_SINGLE= WEEDS +OPTIONS_GROUP= LANG BLACKLIST + OPTIONS_SINGLE_WEEDS= WEEDS1 WEEDS2 +WEEDS_DESC= Looks at alphanum, hex, lower-, uppercase chars + +OPTIONS_GROUP_LANG= CHINESE GERMAN GREEK +LANG_DESC= Catch spam written in... + +OPTIONS_GROUP_BLACKLIST=AHBL MALWARE MSPIKE NIXSPAM +BLACKLIST= DNS Blacklists + OPTIONS_DEFAULT= BOGUS_VIRUS DBRACKETS GERMAN GREEK MALWARE MIMEVLD MSPIKE NIXSPAM RANDOM TRIPWIRE WEEDS WEEDS2 -AHBL_DESC= Check AHBL Blacklist -AIRMAX_DESC= Some custom rulesets -BACKHAIR_DESC= Catch those ugly, unsightly HTML tags +AHBL_DESC= AHBL Blacklist +MALWARE_DESC= Malware Patrol +MSPIKE_DESC= mailspike.net blacklist +NIXSPAM_DESC= NiX Spam blacklist + +AIRMAX_DESC= Some custom rulesets +BACKHAIR_DESC= Catch those ugly, unsightly HTML tags BOGUS_VIRUS_DESC= Catch 'collateral spam' caused by viruses CHICKENPOX_DESC= Catch spam like 'l.ooks f|or th.is garb+age' -CHINESE_DESC= Catches spam written in Chinese DBRACKETS_DESC= Double-brackets around To header address EVILNUMBERS_DESC= Phone numbers, PO boxes, ... from spam -GERMAN_DESC= Catches spam written in German -GREEK_DESC= Catches spam written in Greek -MALWARE_DESC= Malware Patrol - Block List -MANGLED_DESC= Looks for obfuscated/gappy words -MIMEVLD_DESC= Some mime validation rules -MSPIKE_DESC= Check mailspike.net blacklist -NIXSPAM_DESC= Check NiX Spam blacklist -RANDOM_DESC= Detects spamware mistakes like: %RANDOM_WORD -TRIPWIRE_DESC= Matches 3 chars that shouldn't be together -WEEDS_DESC= Looks at alphanum, hex, lower-, uppercase chars -WEEDS1_DESC= Less restrictive rules -WEEDS2_DESC= More restrictive rules +MANGLED_DESC= Looks for obfuscated/gappy words +MIMEVLD_DESC= Some mime validation rules +RANDOM_DESC= Detects spamware mistakes like: %RANDOM_WORD +TRIPWIRE_DESC= Matches 3 chars that shouldn't be together + +CHINESE_DESC= Chinese +GERMAN_DESC= German +GREEK_DESC= Greek + +WEEDS1_DESC= Less restrictive rules +WEEDS2_DESC= More restrictive rules + +SUB_FILES= pkg-message +NO_BUILD= yes +NO_WRKSUBDIR= yes +DATADIR= ${PREFIX}/etc/mail/spamassassin + +AHBL_CONF= 20_dnsbl_ahbl.cf +AIRMAX_CONF= airmax.cf +BACKHAIR_CONF= backhair.cf +BOGUS_VIRUS_CONF= bogus-virus-warnings.cf +CHICKENPOX_CONF= chickenpox.cf +CHINESE_CONF= chinese_rules.cf +DBRACKETS_CONF= 99_SMF_BRACKETS_TO.cf +EVILNUMBERS_CONF= evilnumbers.cf +GERMAN_CONF= 70_zmi_german.cf +GREEK_CONF= gr_domain.cf +MALWARE_CONF= malwarepatrol.cf +MANGLED_CONF= mangled.cf +MIMEVLD_CONF= mime_validate.cf +MSPIKE_CONF= 10_dnsbl_mspike.cf +NIXSPAM_CONF= 20_dnsbl_nixspam.cf +RANDOM_CONF= random.cf +TRIPWIRE_CONF= 99_FVGT_Tripwire.cf +WEEDS1_CONF= weeds.cf +WEEDS2_CONF= weeds2.cf -SUB_FILES= pkg-message -NO_BUILD= yes -NO_WRKSUBDIR= yes -SPAMASS_CONF= etc/mail/spamassassin -SPAMASS_FILES= -USE_BZIP2= yes -INSTALL_DIR= ${PREFIX}/${SPAMASS_CONF} - -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MAHBL} -SPAMASS_FILES+= 20_dnsbl_ahbl.cf -.endif - -.if ${PORT_OPTIONS:MAIRMAX} -SPAMASS_FILES+= airmax.cf -.endif - -.if ${PORT_OPTIONS:MBACKHAIR} -SPAMASS_FILES+= backhair.cf -.endif - -.if ${PORT_OPTIONS:MBOGUS_VIRUS} -SPAMASS_FILES+= bogus-virus-warnings.cf -.endif - -.if ${PORT_OPTIONS:MCHICKENPOX} -SPAMASS_FILES+= chickenpox.cf -.endif - -.if ${PORT_OPTIONS:MCHINESE} -SPAMASS_FILES+= chinese_rules.cf -.endif - -.if ${PORT_OPTIONS:MDBRACKETS} -SPAMASS_FILES+= 99_SMF_BRACKETS_TO.cf -.endif - -.if ${PORT_OPTIONS:MEVILNUMBERS} -SPAMASS_FILES+= evilnumbers.cf -.endif - -.if ${PORT_OPTIONS:MGERMAN} -SPAMASS_FILES+= 70_zmi_german.cf -.endif - -.if ${PORT_OPTIONS:MGREEK} -SPAMASS_FILES+= gr_domain.cf -.endif - -.if ${PORT_OPTIONS:MMALWARE} -SPAMASS_FILES+= malwarepatrol.cf -.endif - -.if ${PORT_OPTIONS:MMANGLED} -SPAMASS_FILES+= mangled.cf -.endif - -.if ${PORT_OPTIONS:MMIMEVLD} -SPAMASS_FILES+= mime_validate.cf -.endif - -.if ${PORT_OPTIONS:MMSPIKE} -SPAMASS_FILES+= 10_dnsbl_mspike.cf -.endif - -.if ${PORT_OPTIONS:MNIXSPAM} -SPAMASS_FILES+= 20_dnsbl_nixspam.cf -.endif - -.if ${PORT_OPTIONS:MRANDOM} -SPAMASS_FILES+= random.cf -.endif - -.if ${PORT_OPTIONS:MTRIPWIRE} -SPAMASS_FILES+= 99_FVGT_Tripwire.cf -.endif - -.if ${PORT_OPTIONS:MWEEDS} -SPAMASS_FILES+= weeds.cf -.endif - -.if ${PORT_OPTIONS:MWEEDS2} -SPAMASS_FILES+= weeds2.cf -.endif - -PLIST_FILES= ${SPAMASS_FILES:S/^/${SPAMASS_CONF}\//} - -.include - -do-build: - @${DO_NADA} +.for opt in ${PORT_OPTIONS} +. if defined(${opt}_CONF) +PLIST_FILES+= ${DATADIR_REL}/${${opt}_CONF} +. endif +.endfor do-install: - @${MKDIR} ${INSTALL_DIR} - @${INSTALL_DATA} ${SPAMASS_FILES:S/^/${WRKSRC}\//} ${INSTALL_DIR} - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DATADIR} +.for opt in ${PORT_OPTIONS} +. if defined(${opt}_CONF) + ${INSTALL_DATA} ${WRKSRC}/${${opt}_CONF} ${STAGEDIR}${DATADIR} +. endif +.endfor -.include +.include Modified: head/mail/spamass-rules/files/pkg-message.in ============================================================================== --- head/mail/spamass-rules/files/pkg-message.in Fri Jul 4 11:57:12 2014 (r360601) +++ head/mail/spamass-rules/files/pkg-message.in Fri Jul 4 12:00:59 2014 (r360602) @@ -1,6 +1,6 @@ ************************************************************************* -The custom rulesets are installed in %%PREFIX%%/etc/mail/spamassassin +The custom rulesets are installed in %%DATADIR%% Before running these rules please do the following: