| 1 |
voyageur 10/07/29 21:15:43 |
| 2 |
|
| 3 |
Modified: |
| 4 |
spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch |
| 5 |
Log: |
| 6 |
Update untaint patch, hope this finally fixes bug #313633 |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch 19 May 2010 15:22:39 -0000 1.1 |
| 23 |
+++ spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch 29 Jul 2010 21:15:43 -0000 1.2 |
| 24 |
@@ -4,7 +4,8 @@ |
| 25 |
Forwarded: Christian Holler <decoder@××××××××.net> |
| 26 |
Author: Arjan Opmeer <arjan.opmeer@×××××.com> |
| 27 |
Bug-Debian: http://bugs.debian.org/568560 |
| 28 |
-Last-Update: 2010-02-18 |
| 29 |
+Bug-Debian: http://bugs.debian.org/568233 |
| 30 |
+Last-Update: 2010-05-18 |
| 31 |
|
| 32 |
--- a/FuzzyOcr/Config.pm |
| 33 |
+++ b/FuzzyOcr/Config.pm |
| 34 |
@@ -25,3 +26,17 @@ |
| 35 |
debuglog("Using $a => $conf->{$b}"); |
| 36 |
} else { |
| 37 |
foreach my $p (@paths) { |
| 38 |
+diff --git a/FuzzyOcr/Logging.pm b/FuzzyOcr/Logging.pm |
| 39 |
+index bed9ff5..ef02b32 100644 |
| 40 |
+--- a/FuzzyOcr/Logging.pm |
| 41 |
++++ b/FuzzyOcr/Logging.pm |
| 42 |
+@@ -31,7 +31,8 @@ sub logfile { |
| 43 |
+ my $time = strftime("%Y-%m-%d %H:%M:%S",localtime(time)); |
| 44 |
+ $logtext =~ s/\n/\n /g; |
| 45 |
+ |
| 46 |
+- unless ( open LOGFILE, ">>", $conf->{focr_logfile} ) { |
| 47 |
++ my $fname = Mail::SpamAssassin::Util::untaint_file_path($conf->{focr_logfile}); |
| 48 |
++ unless ( open LOGFILE, ">>", $fname ) { |
| 49 |
+ warn "Can't open $conf->{focr_logfile} for writing, check permissions"; |
| 50 |
+ return; |
| 51 |
+ } |
Archives