/[smeserver]/rpms/smeserver-spamassassin/sme8/smeserver-spamassassin-2.2.0-SA330.patch
ViewVC logotype

Annotation of /rpms/smeserver-spamassassin/sme8/smeserver-spamassassin-2.2.0-SA330.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Wed Feb 17 11:53:41 2010 UTC (14 years, 9 months ago) by filippocarletti
Branch: MAIN
CVS Tags: smeserver-spamassassin-2_2_0-3_el5_sme 
* Tue Feb 16 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-3sme
- Requires SpamAssassin 3.3.0 [SME: 5741]
- Remove FuzzyOcr [SME: 5771]
- Run sa-update every two hours and check restart every hour
- Redirect cron job output to logfile to avoid mail noise
1 filippocarletti 1.1 diff -Naur smeserver-spamassassin-2.2.0-old/createlinks smeserver-spamassassin-2.2.0/createlinks
2     --- smeserver-spamassassin-2.2.0-old/createlinks 2010-02-12 16:47:35.478703134 +0100
3     +++ smeserver-spamassassin-2.2.0/createlinks 2010-02-16 17:11:46.898238383 +0100
4     @@ -13,6 +13,7 @@
5    
6     templates2events( "/etc/mail/spamassassin/local.cf",
7     qw( bootstrap-console-save email-update ) );
8     +templates2events( "/etc/cron.d/sa-update", "bootstrap-console-save" );
9    
10     foreach $event ( qw( bootstrap-console-save email-update ) )
11     {
12     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/cron.d/sa-update.sme smeserver-spamassassin-2.2.0/root/etc/cron.d/sa-update.sme
13     --- smeserver-spamassassin-2.2.0-old/root/etc/cron.d/sa-update.sme 1970-01-01 01:00:00.000000000 +0100
14     +++ smeserver-spamassassin-2.2.0/root/etc/cron.d/sa-update.sme 2010-02-16 16:50:08.403480252 +0100
15     @@ -0,0 +1 @@
16     +3 */2 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 >>/var/log/sa-update.log
17     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/cron.daily/00-sa_keys smeserver-spamassassin-2.2.0/root/etc/cron.daily/00-sa_keys
18     --- smeserver-spamassassin-2.2.0-old/root/etc/cron.daily/00-sa_keys 2008-10-07 16:55:26.000000000 +0200
19     +++ smeserver-spamassassin-2.2.0/root/etc/cron.daily/00-sa_keys 1970-01-01 01:00:00.000000000 +0100
20     @@ -1,17 +0,0 @@
21     -#!/bin/sh
22     -
23     -if [ -f /etc/cron.daily/sa_update ]
24     -then
25     - install -d -o root -g root -m 600 /etc/mail/spamassassin/sa-update-keys
26     - for key in release-spamassassin.org-key.txt \
27     - sa-update-openprotect-sare.txt \
28     - sa-update-pubkey.txt \
29     - saupdates.openprotect.com-key.txt \
30     - updates.spamassassin.org-key.txt
31     - do
32     - if [ -f /usr/share/spamassassin/$key ]
33     - then
34     - /usr/bin/sa-update --import /usr/share/spamassassin/$key
35     - fi
36     - done
37     -fi
38     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/cron.daily/zz-sa_restart smeserver-spamassassin-2.2.0/root/etc/cron.daily/zz-sa_restart
39     --- smeserver-spamassassin-2.2.0-old/root/etc/cron.daily/zz-sa_restart 2008-10-07 16:55:26.000000000 +0200
40     +++ smeserver-spamassassin-2.2.0/root/etc/cron.daily/zz-sa_restart 1970-01-01 01:00:00.000000000 +0100
41     @@ -1,10 +0,0 @@
42     -#!/bin/sh
43     -
44     -if [ -f /etc/cron.daily/sa_update ]
45     -then
46     - N=$(find /var/lib/spamassassin/3.* -type f -newer /service/spamd/supervise/pid)
47     - if test -n "$N"
48     - then
49     - sv t /service/spamd
50     - fi
51     -fi
52     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/cron.hourly/sa-restart smeserver-spamassassin-2.2.0/root/etc/cron.hourly/sa-restart
53     --- smeserver-spamassassin-2.2.0-old/root/etc/cron.hourly/sa-restart 1970-01-01 01:00:00.000000000 +0100
54     +++ smeserver-spamassassin-2.2.0/root/etc/cron.hourly/sa-restart 2010-02-16 16:58:32.653570831 +0100
55     @@ -0,0 +1,8 @@
56     +if [ -f /etc/cron.d/sa-update.sme ]
57     +then
58     + N=$(find /var/lib/spamassassin/3.* -type f -newer /service/spamd/supervise/pid)
59     + if test -n "$N"
60     + then
61     + sv t /service/spamd
62     + fi
63     +fi
64     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/e-smith/templates/etc/cron.d/sa-update smeserver-spamassassin-2.2.0/root/etc/e-smith/templates/etc/cron.d/sa-update
65     --- smeserver-spamassassin-2.2.0-old/root/etc/e-smith/templates/etc/cron.d/sa-update 1970-01-01 01:00:00.000000000 +0100
66     +++ smeserver-spamassassin-2.2.0/root/etc/e-smith/templates/etc/cron.d/sa-update 2010-02-16 17:09:58.659818065 +0100
67     @@ -0,0 +1,12 @@
68     +# *** DO NOT MODIFY THIS FILE ***
69     +### Spamassassin Rules Updates ###
70     +#
71     +# http://wiki.apache.org/spamassassin/RuleUpdates
72     +#
73     +# sa-update automatically updates your rules once per day if a spam daemon like
74     +# spamd or amavisd are running. You can force sa-update to run in
75     +# /etc/sysconfig/sa-update
76     +#
77     +# /var/log/sa-update.log contains a history log of sa-update runs
78     +
79     +10 4 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 >> /var/log/sa-update.log
80     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths smeserver-spamassassin-2.2.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths
81     --- smeserver-spamassassin-2.2.0-old/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths 2008-10-07 16:55:26.000000000 +0200
82     +++ smeserver-spamassassin-2.2.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths 2010-02-16 11:58:32.150953763 +0100
83     @@ -1,4 +1,2 @@
84     bayes_path /var/spool/spamd/.spamassassin/bayes
85     bayes_file_mode 750
86     -auto_whitelist_path /var/spool/spamd/.spamassassin/auto-whitelist
87     -auto_whitelist_file_mode 750
88     diff -Naur smeserver-spamassassin-2.2.0-old/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_auto_whitelist smeserver-spamassassin-2.2.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_auto_whitelist
89     --- smeserver-spamassassin-2.2.0-old/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_auto_whitelist 2008-10-07 16:55:26.000000000 +0200
90     +++ smeserver-spamassassin-2.2.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_auto_whitelist 2010-02-16 11:58:32.151939426 +0100
91     @@ -1,3 +1,8 @@
92     {
93     - return "use_auto_whitelist " . ($spamassassin{UseAutoWhitelist} || 0);
94     + if (($spamassassin{UseAutoWhitelist} || "0") eq "1")
95     + {
96     + $OUT = "use_auto_whitelist 1\n";
97     + $OUT .= "auto_whitelist_path /var/spool/spamd/.spamassassin/auto-whitelist\n";
98     + $OUT .= "auto_whitelist_file_mode 750\n";
99     + }
100     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed