Index: head/mail/spamass-rules_du_jour/Makefile =================================================================== --- head/mail/spamass-rules_du_jour/Makefile (revision 122903) +++ head/mail/spamass-rules_du_jour/Makefile (revision 122904) @@ -1,79 +1,79 @@ # New ports collection makefile for: spamass-rules # Date created: 20040802 # Whom: mranner@inode.at # # $FreeBSD$ # PORTNAME= rules_du_jour -PORTVERSION= 1.17a +PORTVERSION= 1.18 CATEGORIES= mail MASTER_SITES= http://www.ranner.jawa.at/stuff/ PKGNAMEPREFIX= spamass- MAINTAINER= mranner@inode.at COMMENT= Automatic updates of custom rulesets for SpamAssassin RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin -OPTIONS= ANTIDRUG "Catch those pesky 'pill spams'" on \ +OPTIONS= ANTIDRUG "Already included in SA 3.0" off \ BOGUS_VIRUS "Catch 'collateral spam' caused by viruses" on \ EVILNUMBERS "Phone numbers, PO boxes, ... from spam " on \ RANDOM "Detects spamware mistakes like: %RANDOM_WORD" on \ SARE "Installs safe SARE rules" on \ TRIPWIRE "Matches 3 chars that shouldn't be together" off PLIST_FILES= bin/rules_du_jour etc/mail/rulesdujour.sample PKGMESSAGE= ${WRKDIR}/pkg-message NO_BUILD= yes SPAMASS_CONF= etc/mail/spamassassin SPAMASS_DIR= ${PREFIX}/${SPAMASS_CONF} .include .if defined(WITH_ANTIDRUG) SPAMASS_FILES+= ANTIDRUG .endif .if defined(WITH_BOGUS_VIRUS) SPAMASS_FILES+= BOGUSVIRUS .endif .if defined(WITH_EVILNUMBERS) SPAMASS_FILES+= EVILNUMBERS .endif .if defined(WITH_RANDOM) SPAMASS_FILES+= RANDOMVAL .endif .if defined(WITH_SARE) .for i in SARE_ADULT SARE_FRAUD SARE_BML SARE_RATWARE SARE_SPOOF \ SARE_BAYES_POISON_NXM SARE_OEM SARE_RANDOM SARE_SPECIFIC SPAMASS_FILES+= $i .endfor .endif .if defined(WITH_TRIPWIRE) SPAMASS_FILES+= TRIPWIRE .endif do-build: @${DO_NADA} pre-install: - @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + @${SED} -e 's|%%LOCALBASE%%|${PREFIX}|g' \ -e 's|%%DOCSDIR%%|${DOCSDIR}|g' <${.CURDIR}/pkg-message >${PKGMESSAGE} @${SED} -e 's|TRIPWIRE EVILNUMBERS SARE_RANDOM|${SPAMASS_FILES}|' \ - -e 's|PREFIX="/usr/local"|PREFIX="${LOCALBASE}"|' \ + -e 's|PREFIX="/usr/local"|PREFIX="${PREFIX}"|' \ <${WRKSRC}/config >${WRKSRC}/config.sample do-install: @${INSTALL} -d -o root -g wheel -m 0755 ${SPAMASS_DIR}/RulesDuJour - @${INSTALL} ${WRKSRC}/rules_du_jour ${LOCALBASE}/bin - @${INSTALL_DATA} ${WRKSRC}/config.sample ${LOCALBASE}/etc/mail/rulesdujour.sample + @${INSTALL} ${WRKSRC}/rules_du_jour ${PREFIX}/bin + @${INSTALL_DATA} ${WRKSRC}/config.sample ${PREFIX}/etc/mail/rulesdujour.sample post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/spamass-rules_du_jour/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/spamass-rules_du_jour/distinfo =================================================================== --- head/mail/spamass-rules_du_jour/distinfo (revision 122903) +++ head/mail/spamass-rules_du_jour/distinfo (revision 122904) @@ -1,2 +1,2 @@ -MD5 (rules_du_jour-1.17a.tar.gz) = ed54abc68d8fe15abc2936481ea43653 -SIZE (rules_du_jour-1.17a.tar.gz) = 14276 +MD5 (rules_du_jour-1.18.tar.gz) = 4e7d8cfa60b867142eeb24aa1c91884b +SIZE (rules_du_jour-1.18.tar.gz) = 14427 Property changes on: head/mail/spamass-rules_du_jour/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/spamass-rules_du_jour/files/patch-config =================================================================== --- head/mail/spamass-rules_du_jour/files/patch-config (revision 122903) +++ head/mail/spamass-rules_du_jour/files/patch-config (revision 122904) @@ -1,58 +1,58 @@ --- config.orig Sun Aug 8 14:56:31 2004 +++ config Sun Aug 8 14:58:41 2004 @@ -0,0 +1,55 @@ +TRUSTED_RULESETS="TRIPWIRE EVILNUMBERS SARE_RANDOM"; +PREFIX="/usr/local" + +#### Local SpamAssassin/system Settings #### +#### Modify these to match your system. #### +SA_DIR="/usr/local/etc/mail/spamassassin"; # Change this to your SA local config + # directory, probably /etc/mail/spamassassin. + +MAIL_ADDRESS="root"; # Where do Email notifications go + +SINGLE_EMAIL_ONLY="true"; # Set this to "true" to send only one notification + # email per RDJ run with "interesting" + # activity. Set to "" to send a separate + # for each interesting activity. + +EMAIL_RDJ_UPDATE_ONLY="true"; # Set this to "true" to send notifications only + # when an update for RDJ has been retrieved. Set + # to "" (default) to send notifications whenever a ruleset + # has changed. (Has no effect unless SINGLE_EMAIL_ONLY is set) + +SA_LINT="$PREFIX/bin/spamassassin --lint"; # Command used to lint the rules + -+SA_RESTART="$PREFIX/etc/rc.d/spamd.sh restart"; # Command used to restart spamd ++SA_RESTART="$PREFIX/etc/rc.d/sa-spamd.sh restart"; # Command used to restart spamd + # May be /etc/rc.d/init.d/spamassassin restart + # For amavisd, may be /etc/init.d/amavisd restart + # For minedefang, may be /etc/init.d/mimedefang restart + +CURL_PROG="$PREFIX/bin/curl"; # Location of the curl program +CURL_OPTS="-w %{http_code} --compressed -O -R -s -S -z"; # Parameters of the curl program + +WGET_PROG="fetch"; # Use FreeBSD's fetch instead of wget +WGET_OPTS="-m"; # Parameter of the fetch program + +#WGET_PROG="$PREFIX/bin/wget"; # Location of the wget program +#WGET_OPTS="-N"; # Parameters of the wget program + +#PERL="perl"; # Location of the perl program +#GREP="grep"; # Location of the grep program +#TAIL="tail -1"; # Location (and parameters) for 'tail -n1' +#HEAD="head -1"; # Location (and parameters) for 'head -n1' +#MAILCMD="mail"; # Location of the mail program + # that takes and understand the -s flag +#DEBUG="true"; # Uncomment this to force debug mode on (or use -D) +#### End Local SpamAssassin Settings #### + +#TMPDIR="${SA_DIR}/RulesDuJour"; # Where we store old rulesets. If you delete + # this directory, RuleSets may be detected as + # out of date the next time you run rules_du_jour. + + +#### Do not change next lines #### +#### or script will break on FreeBSD #### + +DONT_CHECK_FOR_RDJ_UPDATES="true"; # Do not change, or periodic run will break on FreeBSD +RDJ_URL="http://sandgnat.com/rdj/rules_du_jour"; # URL to update this script Property changes on: head/mail/spamass-rules_du_jour/files/patch-config ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/spamass-rules_du_jour/files/patch-rules_du_jour =================================================================== --- head/mail/spamass-rules_du_jour/files/patch-rules_du_jour (revision 122903) +++ head/mail/spamass-rules_du_jour/files/patch-rules_du_jour (revision 122904) @@ -1,26 +1,26 @@ ---- rules_du_jour.orig Mon Aug 2 20:38:44 2004 -+++ rules_du_jour Mon Aug 2 22:29:32 2004 +--- rules_du_jour.orig Sat Aug 28 23:45:23 2004 ++++ rules_du_jour Tue Nov 30 21:16:05 2004 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash - # Version 1.17a Added support for curl by default (instead of wget). Requires curl 7.10 or higher. Integrated "email me only when RDJ has been updated" patch (thanks, Daniel Cohen!) rev 17a: fixed extraneous debug print + # Version 1.18 Added kluge to specify configfile location: RDJ_CONFIGFILE. Fixed SARE_HEADER version extraction. ########################## @@ -52,7 +52,7 @@ # (my_rules_du_jour wrapper script is no longer recommended) # Reads persistent configuration files from /etc, if one exists. # /etc/rulesdujour/config is the recommended configuration file location. --for i in /etc/rulesdujour/config /etc/rulesdujour /etc/mail/rulesdujour /etc/sysconfig/RulesDuJour /etc/sysconfig/rulesdujour ; do -+for i in /usr/local/etc/rulesdujour/config /usr/local/etc/rulesdujour /usr/local/etc/mail/rulesdujour ; do - [ -f $i ] && source $i ; +-for i in ${RDJ_CONFIGFILE} /etc/rulesdujour/config /etc/rulesdujour /etc/mail/rulesdujour /etc/sysconfig/RulesDuJour /etc/sysconfig/rulesdujour ; do ++for i in ${RDJ_CONFIGFILE} /usr/local/etc/rulesdujour/config /usr/local/etc/rulesdujour /usr/local/etc/mail/rulesdujour ; do + [ -f "$i" ] && source $i ; done; -@@ -133,7 +133,7 @@ +@@ -138,7 +138,7 @@ #### Here are settings for Tripwire. #### TRIPWIRE=0; # Index of Tripwire data into the arrays is 0 CF_URLS[0]="http://www.rulesemporium.com/rules/99_FVGT_Tripwire.cf"; - CF_FILES[0]="tripwire.cf"; + CF_FILES[0]="99_FVGT_Tripwire.cf"; CF_NAMES[0]="TripWire"; PARSE_NEW_VER_SCRIPTS[0]="${PERL} -ne 'print if /^\s*#.*(vers?|version|rev|revision)[:\.\s]*[0-9]/i;' | sort | ${TAIL}"; # CF_MUNGE_SCRIPTS[0]="nothing necessary for this ruleset."; Property changes on: head/mail/spamass-rules_du_jour/files/patch-rules_du_jour ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property