Update untaint patch, hope this finally fixes bug #313633

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 29 insertions, 6 deletions

diff --git a/mail-filter/spamassassin-fuzzyocr/ChangeLog b/mail-filter/spamassassin-fuzzyocr/ChangeLog
index 795d44d36c14..1270bf390dcf 100644
--- a/mail-filter/spamassassin-fuzzyocr/ChangeLog
+++ b/mail-filter/spamassassin-fuzzyocr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/spamassassin-fuzzyocr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.21 2010/05/19 15:22:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.22 2010/07/29 21:15:43 voyageur Exp $
+
+*spamassassin-fuzzyocr-3.6.0-r2 (29 Jul 2010)
+
+  29 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -spamassassin-fuzzyocr-3.6.0-r1.ebuild,
+  +spamassassin-fuzzyocr-3.6.0-r2.ebuild,
+  files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch:
+  Update untaint patch, hope this finally fixes bug #313633
 
 *spamassassin-fuzzyocr-3.6.0-r1 (19 May 2010)
 
diff --git a/mail-filter/spamassassin-fuzzyocr/Manifest b/mail-filter/spamassassin-fuzzyocr/Manifest
index 93ec2f2d3db8..f22081472c98 100644
--- a/mail-filter/spamassassin-fuzzyocr/Manifest
+++ b/mail-filter/spamassassin-fuzzyocr/Manifest
@@ -4,9 +4,9 @@ AUX enabletesseract.patch 656 RMD160 4b6452e84815fbe8d5b47e0cdcdc736c99cfa3dd SH
 AUX fuzzyocr.logrotate 318 RMD160 2cc40d67746b344bd318b0672aef5425fd09499f SHA1 575f3a5a922bab997fd993dfca3da86c02075dff SHA256 22a03bf34157324ef7a0df2c539c526b71b649e5184f40461e4b36091cd8bf54
 AUX spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch 509 RMD160 360234d69504b8478d6a05a3b356a9dba412e9c9 SHA1 c60f40630d6622f93821f82052c2115d876633bd SHA256 68066c3b509d55b62877c6b02a83688a0336eaa06200d8370a6064d136839cb9
 AUX spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch 2104 RMD160 68536642772122c171cb537876778f5eaad23925 SHA1 d2345babbc6eac33c8a531f31bf763eee21d03a1 SHA256 987dadbcd0e85417d363afdd9f8b78baf53b237f2ead34e54d30908cae9d0167
-AUX spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch 1152 RMD160 98d80b2a135f044db7e78a055b629b9d619417a4 SHA1 6e9b2c8e6b5dd22e325c956315a1fd931cfa087d SHA256 9fbfd1f6130f0f932867398ca4e4a34359da8ec93e2567e356bf82393510d63c
+AUX spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch 1771 RMD160 8b37674b41db445fe87c6ad336ecef9a33d22e77 SHA1 ff880deeb3019d15905ee06b17b85c75750ed673 SHA256 49a90c5be418909232055e73913eb21db3a8d5a4cb1a86c7004611c23dc510b2
 DIST fuzzyocr-3.6.0.tar.gz 127103 RMD160 3aa1ee63ffe0996dee3b1c988a2e96bc2edbbe8c SHA1 c54a797899401b9922e5d6371a607780923192de SHA256 dd345c9500c3c3cdc33503863fe234bf3c2720c54b303e6cbc94dbe8aaf3a218
-EBUILD spamassassin-fuzzyocr-3.6.0-r1.ebuild 5456 RMD160 2b5874a021f91e3d2b33c6f8abd4227dfe664f97 SHA1 938b8fcd5902379a7eb50871bfb54ecc56d77c3e SHA256 3a76903f776c12f4f6d36833df9c384f4c02ca5940831691b9e36545724fe5dc
+EBUILD spamassassin-fuzzyocr-3.6.0-r2.ebuild 5456 RMD160 57893fe7bacbf1a31a66292ce21062f8156efd40 SHA1 cc506ec01e914ad597f56f67a7811beb810377f1 SHA256 68a3c3d1df13b4a9a6da83255cd73a6d1042b7745caaa846241717b36669f494
 EBUILD spamassassin-fuzzyocr-3.6.0.ebuild 5381 RMD160 e5b88a338b351a8365fb9c6d16c0fb80d9a906cc SHA1 9e3eaa9786825408e202126037fe041384dbad5e SHA256 9267a938e874c3c43944c5b91240fb480808d4b89c40c76dbdfcc39d2d59b2b6
-MISC ChangeLog 3855 RMD160 c70958005701bcb420b740473ca1257c7dd1836d SHA1 7a7baec5a2d21aba13d401ec9bf54ebe6695f90a SHA256 0541edc8bcb7fa9971d87c9efc8367dc351f36842f0b89b9e94c604e4e0ccb01
+MISC ChangeLog 4164 RMD160 fb9e4140e49e57da5c92c910704b84349b89cdf0 SHA1 a691a9c25a7e4ffa5c862f56b5593e243d8420ca SHA256 369f5816e1e05c7219f845dd884318eb821977dbc5b6d2c112c4229c0d4e8141
 MISC metadata.xml 1217 RMD160 5a5cd5bc44f18f5488d828eda16bc0ad7ac2d56e SHA1 42204cce83337d6b9cb014dc4e6bc2a28c2d1bce SHA256 ed56cf7e438a71d082cbfd6702def7697ee0c3576152249e69a032c915ca1966
diff --git a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch b/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch
index 0aae0ec84ae7..08b70653ab1a 100644
--- a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch
+++ b/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch
@@ -4,7 +4,8 @@ Description: untaint config entries
 Forwarded: Christian Holler <decoder@own-hero.net>
 Author: Arjan Opmeer <arjan.opmeer@gmail.com>
 Bug-Debian: http://bugs.debian.org/568560
-Last-Update: 2010-02-18
+Bug-Debian: http://bugs.debian.org/568233
+Last-Update: 2010-05-18
 
 --- a/FuzzyOcr/Config.pm
 +++ b/FuzzyOcr/Config.pm
@@ -25,3 +26,17 @@ Last-Update: 2010-02-18
              debuglog("Using $a => $conf->{$b}");
          } else {
              foreach my $p (@paths) {
+diff --git a/FuzzyOcr/Logging.pm b/FuzzyOcr/Logging.pm
+index bed9ff5..ef02b32 100644
+--- a/FuzzyOcr/Logging.pm
++++ b/FuzzyOcr/Logging.pm
+@@ -31,7 +31,8 @@ sub logfile {
+     my $time = strftime("%Y-%m-%d %H:%M:%S",localtime(time));
+     $logtext =~ s/\n/\n                      /g;
+ 
+-    unless ( open LOGFILE, ">>", $conf->{focr_logfile} ) {
++    my $fname = Mail::SpamAssassin::Util::untaint_file_path($conf->{focr_logfile});
++    unless ( open LOGFILE, ">>", $fname ) {
+        warn "Can't open $conf->{focr_logfile} for writing, check permissions";
+        return;
+     }
diff --git a/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r1.ebuild b/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild
index 91634978aff2..145dbdbb1ca8 100644
--- a/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r1.ebuild
+++ b/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r1.ebuild,v 1.1 2010/05/19 15:22:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild,v 1.1 2010/07/29 21:15:43 voyageur Exp $
 
 EAPI=2
 inherit perl-module eutils