Mailing List Archive

Author: jm
Date: Wed Dec 6 09:35:08 2006
New Revision: 483158

URL: http://svn.apache.org/viewvc?view=rev&rev=483158
Log:
bug 5221: merge back sa-compile ruleset-compiler from jm_re2c_hacks branch to trunk; second patch, full back-merge of remaining diffs

Added:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/P595Body.pm
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/lib/Mail/SpamAssassin/Plugin/P595Body.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
spamassassin/trunk/sa-compile.raw
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/sa-compile.raw
spamassassin/trunk/t/re_base_extraction.t
- copied unchanged from r483156, spamassassin/branches/jm_re2c_hacks/t/re_base_extraction.t
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/MANIFEST.SKIP
spamassassin/trunk/Makefile.PL
spamassassin/trunk/rules/v320.pre

Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?view=diff&rev=483158&r1=483157&r2=483158
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Wed Dec 6 09:35:08 2006
@@ -113,6 +113,7 @@
procmailrc.example
sa-learn.raw
sa-update.raw
+sa-compile.raw
sample-nonspam.txt
sample-spam.txt
spamassassin.raw
@@ -455,8 +456,14 @@
t/uribl.t
t/shortcircuit.t
t/spamc_y.t
+lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
+lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
+lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
+lib/Mail/SpamAssassin/Plugin/P595Body.pm
t/spamd_kill_restart.t
t/spamd_kill_restart_rr.t
+t/re_base_extraction.t
t/spamd_unix_and_tcp.t
lib/Mail/SpamAssassin/Plugin/VBounce.pm
rules/20_vbounce.cf

Modified: spamassassin/trunk/MANIFEST.SKIP
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST.SKIP?view=diff&rev=483158&r1=483157&r2=483158
==============================================================================
--- spamassassin/trunk/MANIFEST.SKIP (original)
+++ spamassassin/trunk/MANIFEST.SKIP Wed Dec 6 09:35:08 2006
@@ -75,6 +75,7 @@
^tools/
^pod2ref
^sa-update$
+^sa-compile$
^build/describe-to-po-file$
^rules/70_sandbox.cf$
^build/automc/

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?view=diff&rev=483158&r1=483157&r2=483158
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Wed Dec 6 09:35:08 2006
@@ -167,6 +167,7 @@
'spamassassin.raw' => 'spamassassin',
'sa-learn.raw' => 'sa-learn',
'sa-update.raw' => 'sa-update',
+ 'sa-compile.raw' => 'sa-compile',
'spamc/spamc.c' => 'spamc/spamc$(EXE_EXT)',
'spamd/spamd.raw' => 'spamd/spamd',
},
@@ -180,6 +181,7 @@
'lib/spamassassin-run.pod' => '$(INST_MAN1DIR)/spamassassin-run.$(MAN1EXT)',
'sa-learn' => '$(INST_MAN1DIR)/sa-learn.$(MAN1EXT)',
'sa-update' => '$(INST_MAN1DIR)/sa-update.$(MAN1EXT)',
+ 'sa-compile' => '$(INST_MAN1DIR)/sa-compile.$(MAN1EXT)',
'spamc/spamc.pod' => '$(INST_MAN1DIR)/spamc.$(MAN1EXT)',
'spamd/spamd' => '$(INST_MAN1DIR)/spamd.$(MAN1EXT)',
},
@@ -224,7 +226,7 @@
},

'clean' => { FILES => join(' ' =>
- 'sa-learn', 'sa-update', 'spamassassin',
+ 'sa-learn', 'sa-update', 'spamassassin', 'sa-compile',

'spamd/spamd',

@@ -1127,6 +1129,9 @@

sa-update: sa-update.raw build_rules
$(PREPROCESS) $(FIXBYTES) $(FIXVARS) $(FIXBANG) -m$(PERM_RWX) -isa-update.raw -osa-update
+
+sa-compile: sa-compile.raw
+ $(PREPROCESS) $(FIXBYTES) $(FIXVARS) $(FIXBANG) -m$(PERM_RWX) -isa-compile.raw -osa-compile

spamd/spamd: spamd/spamd.raw
$(PREPROCESS) $(FIXBYTES) $(FIXVARS) $(FIXBANG) -m$(PERM_RWX) -i$? -o$@

Modified: spamassassin/trunk/rules/v320.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/v320.pre?view=diff&rev=483158&r1=483157&r2=483158
==============================================================================
--- spamassassin/trunk/rules/v320.pre (original)
+++ spamassassin/trunk/rules/v320.pre Wed Dec 6 09:35:08 2006
@@ -42,3 +42,12 @@
#
loadplugin Mail::SpamAssassin::Plugin::VBounce

+# Rule2XSBody - speedup by compilation of ruleset to native code
+loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+
+# RabinKarpBody - EXPERIMENTAL speedup plugin, requires RabinKarpAccel module
+# loadplugin Mail::SpamAssassin::Plugin::RabinKarpBody
+
+# P595Body - EXPERIMENTAL speedup plugin, using bleadperl RE optimizations
+# loadplugin Mail::SpamAssassin::Plugin::P595Body
+