- Update to 1.18

- Use new sa-spamd.sh to restart (Thanks to Angelo Turetta)

PR:		ports/74562
Submitted by:	maintainer
This commit is contained in:
Sergey Matveychuk 2004-12-01 16:34:53 +00:00
parent 053bd6682b
commit f29ba24def
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=122904
4 changed files with 16 additions and 16 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= rules_du_jour
PORTVERSION= 1.17a
PORTVERSION= 1.18
CATEGORIES= mail
MASTER_SITES= http://www.ranner.jawa.at/stuff/
PKGNAMEPREFIX= spamass-
@ -17,7 +17,7 @@ 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 \
@ -62,16 +62,16 @@ 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}

View file

@ -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

View file

@ -23,7 +23,7 @@
+
+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

View file

@ -1,21 +1,21 @@
--- 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";