[gentoo-commits] gentoo-x86 commit in mail-filter/spamassassin-fuzzyocr/files: spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch

["Bernard Cafarelli (voyageur)" <voyageur@gentoo.org>]

voyageur    09/11/13 15:28:28

  Added:               
                        spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch
                        spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch
  Log:
  Version bump (bug #285327) and add myself to maintainers, patches from bugs #174993, #273183 (both merged in #251687), default to ocrad ocr engine if none are specified (bugs #171376, #254751), RDEPEND on netpbm with jpeg,png,tiff (bug #244828). Also fixes bug #249668
  (Portage version: 2.2_rc49/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch?rev=1.1&content-type=text/plain

Index: spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch
===================================================================
diff -u -r FuzzyOcr-3.5.1-orig/FuzzyOcr.pm FuzzyOcr-3.5.1/FuzzyOcr.pm
--- FuzzyOcr-3.5.1-orig/FuzzyOcr.pm	2007-01-07 04:05:08.000000000 -0800
+++ FuzzyOcr-3.5.1/FuzzyOcr.pm	2007-04-17 14:21:25.000000000 -0700
@@ -146,7 +146,7 @@
             ){
             $fname = join('',@{$p->{'headers'}->{'content-id'}});
             $fname =~ s/[<>]//g;
-            $fname =~ tr/\@\$\%\&/_/s;
+            $fname =~ tr/\@\$\%\&\./_/s;
         }
 
         my $filename = $fname; $filename =~ tr{a-zA-Z0-9\-.}{_}cs;



1.1                  mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch?rev=1.1&content-type=text/plain

Index: spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch
===================================================================
diff -ur FuzzyOcr.orig/Deanimate.pm FuzzyOcr/Deanimate.pm
--- FuzzyOcr.orig/Deanimate.pm	Sun Jan  7 19:05:18 2007
+++ FuzzyOcr/Deanimate.pm	Thu Nov 15 13:19:00 2007
@@ -8,13 +8,14 @@
 use FuzzyOcr::Config qw(get_config set_config get_tmpdir);
 use FuzzyOcr::Misc qw(save_execute);
 use FuzzyOcr::Logging qw(errorlog warnlog infolog);
+use File::Basename qw(dirname);
 
 # Provide functions to deanimate gifs
 
 sub deanimate {
     my $conf = get_config();
-    my $imgdir = get_tmpdir();
     my $tfile = shift;
+    my $imgdir = dirname($tfile);
     my $efile = $tfile . ".err";
     my $tfile2 = $tfile;
     my $tfile3 = $tfile;
@@ -58,8 +59,8 @@
 
 sub gif_info {
     my $conf = get_config();
-    my $imgdir = get_tmpdir();
     my $giffile = $_[0];
+    my $imgdir = dirname($giffile);
     
     my $fd = new IO::Handle;
     
diff -ur FuzzyOcr.orig/Preprocessor.pm FuzzyOcr/Preprocessor.pm
--- FuzzyOcr.orig/Preprocessor.pm	Sun Jan  7 19:05:18 2007
+++ FuzzyOcr/Preprocessor.pm	Thu Nov 15 12:31:05 2007
@@ -1,5 +1,7 @@
 package FuzzyOcr::Preprocessor;
 
+use File::Basename qw(dirname);
+
 sub new {
     my ($class, $label, $command, $args) = @_;
 
@@ -12,7 +14,7 @@
 
 sub run {
     my ($self, $input) = @_;
-    my $tmpdir = FuzzyOcr::Config::get_tmpdir();
+    my $tmpdir = dirname($input);
     my $label = $self->{label};
     my $output = "$tmpdir/prep.$label.out";
     my $stderr = ">$tmpdir/prep.$label.err";
diff -ur FuzzyOcr.orig/Scanset.pm FuzzyOcr/Scanset.pm
--- FuzzyOcr.orig/Scanset.pm	Sun Jan  7 19:05:18 2007
+++ FuzzyOcr/Scanset.pm	Thu Nov 15 13:20:39 2007
@@ -2,6 +2,7 @@
 
 use lib qw(..);
 use FuzzyOcr::Logging qw(errorlog);
+use File::Basename qw(dirname);
 
 sub new {
     my ($class, $label, $preprocessors, $command, $args, $output_in) = @_;
@@ -19,7 +20,7 @@
 sub run {
     my ($self, $input) = @_;
     my $conf = FuzzyOcr::Config::get_config();
-    my $tmpdir = FuzzyOcr::Config::get_tmpdir();
+    my $tmpdir = dirname($input);
     my $label = $self->{label};
     my $output = "$tmpdir/scanset.$label.out";
     my $stderr = ">$tmpdir/scanset.$label.err";