ports/74562: [MAINTAINER] mail/rules_du_jour: update to 1.18

[Michael Ranner]

>Number:         74562
>Category:       ports
>Synopsis:       [MAINTAINER] mail/rules_du_jour: update to 1.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 30 20:40:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Ranner
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD dwarf.jawa.at 4.10-RELEASE FreeBSD 4.10-RELEASE #5: Sun Oct 10 14:39:51 CEST 2004
>Description:
- Update to 1.18
- Use new sa-spamd.sh to restart (Thanks to Angelo Turetta)

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- spamass-rules_du_jour-1.18.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/spamass-rules_du_jour/Makefile /usr/ports/mail/spamass-rules_du_jour.update/Makefile
--- /usr/ports/mail/spamass-rules_du_jour/Makefile	Tue Oct 12 17:39:39 2004
+++ /usr/ports/mail/spamass-rules_du_jour.update/Makefile	Tue Nov 30 21:26:13 2004
@@ -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 @@
 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 \
diff -ruN --exclude=CVS /usr/ports/mail/spamass-rules_du_jour/distinfo /usr/ports/mail/spamass-rules_du_jour.update/distinfo
--- /usr/ports/mail/spamass-rules_du_jour/distinfo	Tue Oct 12 17:39:39 2004
+++ /usr/ports/mail/spamass-rules_du_jour.update/distinfo	Tue Nov 30 21:13:39 2004
@@ -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
diff -ruN --exclude=CVS /usr/ports/mail/spamass-rules_du_jour/files/patch-config /usr/ports/mail/spamass-rules_du_jour.update/files/patch-config
--- /usr/ports/mail/spamass-rules_du_jour/files/patch-config	Tue Oct 12 17:39:39 2004
+++ /usr/ports/mail/spamass-rules_du_jour.update/files/patch-config	Tue Nov 30 21:18:10 2004
@@ -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
diff -ruN --exclude=CVS /usr/ports/mail/spamass-rules_du_jour/files/patch-rules_du_jour /usr/ports/mail/spamass-rules_du_jour.update/files/patch-rules_du_jour
--- /usr/ports/mail/spamass-rules_du_jour/files/patch-rules_du_jour	Tue Oct 12 17:39:39 2004
+++ /usr/ports/mail/spamass-rules_du_jour.update/files/patch-rules_du_jour	Tue Nov 30 21:17:26 2004
@@ -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";
--- spamass-rules_du_jour-1.18.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: