removed option use_ocr

We do not use FuzzyOCR any longer - its not worth these days.

diff --git a/NEWS b/NEWS
index 38b4f16314dd79ddf01a00927e0d5468e1edb12d..3252cf59299b76535ba7edce4b7056562872ca0c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,10 @@ Proxmox Mail Gateway 5.0 News
 
 - templates moved to /var/lib/pmg/templates/
 
-- use extra file to store mail/networks /etc/pmg/mynetworks 
+- use extra file to store mail/networks /etc/pmg/mynetworks
+
+- removed option spam/use_ocr
+
 
 Incompatible changes:
 ---------------------

diff --git a/PMG/Config.pm b/PMG/Config.pm
index a58a23836a3aff7d9a545617e41dc6ac436ae0cc..1a9732c32872ae2f6f2e92ac78f26d1592a66e94 100755 (executable)
--- a/PMG/Config.pm
+++ b/PMG/Config.pm
@@ -142,11 +142,6 @@ sub properties {
            type => 'boolean',
            default => 1,
        },
-       use_ocr => {
-           description => "Enable OCR to scan pictures.",
-           type => 'boolean',
-           default => 0,
-       },
        wl_bounce_relays => {
            description => "Whitelist legitimate bounce relays.",
            type => 'string',
@@ -176,7 +171,6 @@ sub options {
     return {
        use_awl => { optional => 1 },
        use_razor => { optional => 1 },
-       use_ocr => { optional => 1 },
        wl_bounce_relays => { optional => 1 },
        languages => { optional => 1 },
        use_bayes => { optional => 1 },

diff --git a/templates/init.pre.in b/templates/init.pre.in
index 2cee518b8bb0efd54a1fe401ff0f397068243395..b4a2d24955d401a40e480ae197cb6f19075ff5c3 100644 (file)
--- a/templates/init.pre.in
+++ b/templates/init.pre.in
@@ -26,9 +26,5 @@ loadplugin Mail::SpamAssassin::Plugin::Hashcash
 loadplugin Mail::SpamAssassin::Plugin::SPF
 [% END %]
 
-[% IF pmg.spam.use_ocr %]
-loadplugin FuzzyOcr /usr/share/perl5/Mail/SpamAssassin/Plugin/FuzzyOcr.pm
-[% END %]
-
 # we do not load dkim currently
 #loadplugin Mail::SpamAssassin::Plugin::DKIM 
\ No newline at end of file