diff options
| -rw-r--r-- | mail-filter/spamassassin-fuzzyocr/ChangeLog | 10 | ||||
| -rw-r--r-- | mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch | 17 | ||||
| -rw-r--r-- | mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild (renamed from mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r1.ebuild) | 2 |
3 files changed, 26 insertions, 3 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/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 |