You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2018/05/07 06:37:50 UTC
svn commit: r1831073 - in /spamassassin: branches/3.4/ trunk/
Author: gbechis
Date: Mon May 7 06:37:50 2018
New Revision: 1831073
URL: http://svn.apache.org/viewvc?rev=1831073&view=rev
Log:
Enforce a C locale when logging to stder
bz #7305
Modified:
spamassassin/branches/3.4/sa-awl.raw
spamassassin/branches/3.4/sa-check_spamd.raw
spamassassin/branches/3.4/sa-compile.raw
spamassassin/branches/3.4/sa-learn.raw
spamassassin/branches/3.4/sa-update.raw
spamassassin/branches/3.4/spamassassin.raw
spamassassin/trunk/sa-awl.raw
spamassassin/trunk/sa-check_spamd.raw
spamassassin/trunk/sa-compile.raw
spamassassin/trunk/sa-learn.raw
spamassassin/trunk/sa-update.raw
spamassassin/trunk/spamassassin.raw
Modified: spamassassin/branches/3.4/sa-awl.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-awl.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-awl.raw (original)
+++ spamassassin/branches/3.4/sa-awl.raw Mon May 7 06:37:50 2018
@@ -47,6 +47,9 @@ usage: sa-awl [--clean] [--min n] [dbfil
use Fcntl;
use Getopt::Long;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
our ( $opt_clean, $opt_min, $opt_help );
Modified: spamassassin/branches/3.4/sa-check_spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-check_spamd.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-check_spamd.raw (original)
+++ spamassassin/branches/3.4/sa-check_spamd.raw Mon May 7 06:37:50 2018
@@ -37,6 +37,9 @@ use lib '@@INSTALLSITELIB@@';
use Errno qw(EBADF);
use File::Spec;
use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
Modified: spamassassin/branches/3.4/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-compile.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-compile.raw (original)
+++ spamassassin/branches/3.4/sa-compile.raw Mon May 7 06:37:50 2018
@@ -31,6 +31,9 @@ use lib '@@INSTALLSITELIB@@';
use Errno qw(EBADF);
use File::Spec;
use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
@@ -806,12 +809,13 @@ See <http://issues.apache.org/SpamAssass
The Apache SpamAssassin(tm) Project <http://spamassassin.apache.org/>
-=head1 COPYRIGHT AND LICENSE
+=head1 LICENSE AND COPYRIGHT
SpamAssassin is distributed under the Apache License, Version 2.0, as
described in the file C<LICENSE> included with the distribution.
Copyright (C) 2015 The Apache Software Foundation
+
=cut
Modified: spamassassin/branches/3.4/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-learn.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-learn.raw (original)
+++ spamassassin/branches/3.4/sa-learn.raw Mon May 7 06:37:50 2018
@@ -24,6 +24,9 @@ use Errno qw(EBADF);
use Getopt::Long;
use Pod::Usage;
use File::Spec;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
our ( $spamtest, %opt, $isspam, $forget, $messagecount, $learnedcount, $messagelimit, $progress,
$total_messages, $init_results, $start_time, $synconly, $learnprob, @targets, $bayes_override_path );
Modified: spamassassin/branches/3.4/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-update.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-update.raw (original)
+++ spamassassin/branches/3.4/sa-update.raw Mon May 7 06:37:50 2018
@@ -55,6 +55,9 @@ use File::Path;
use Getopt::Long;
use Pod::Usage;
use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
@@ -2106,12 +2109,13 @@ See <http://issues.apache.org/SpamAssass
The Apache SpamAssassin(tm) Project <http://spamassassin.apache.org/>
-=head1 COPYRIGHT AND LICENSE
+=head1 LICENSE AND COPYRIGHT
SpamAssassin is distributed under the Apache License, Version 2.0, as
described in the file C<LICENSE> included with the distribution.
Copyright (C) 2015 The Apache Software Foundation
+
=cut
Modified: spamassassin/branches/3.4/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamassassin.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamassassin.raw (original)
+++ spamassassin/branches/3.4/spamassassin.raw Mon May 7 06:37:50 2018
@@ -75,6 +75,7 @@ BEGIN {
use Getopt::Long;
use Pod::Usage;
+use POSIX qw(locale_h setsid sigprocmask _exit);
use Mail::SpamAssassin;
use Mail::SpamAssassin::ArchiveIterator;
use Mail::SpamAssassin::Util::Progress;
@@ -90,6 +91,8 @@ BEGIN {
};
};
+POSIX::setlocale(LC_TIME,'C');
+
my %resphash = (
EX_OK => 0, # no problems
EX_USAGE => 64, # command line usage error
@@ -476,7 +479,10 @@ sub wanted {
# If we're not going to retest, just remove the markup and print it out
if ( !$opt{'test-mode'} ) {
- print $spamtest->remove_spamassassin_markup ($mail);
+ my $report = $spamtest->remove_spamassassin_markup ($mail);
+ # encode Unicode characters to UTF-8 octets
+ utf8::encode($report) if utf8::is_utf8($report);
+ print $report;
$mail->finish();
$mail = undef;
return 1;
@@ -525,11 +531,17 @@ sub wanted {
# OK, do checks and put out the message.
my $status = $spamtest->check($mail);
- print $status->rewrite_mail() or die "error writing: $!";
+ { my $report = $status->rewrite_mail();
+ # encode Unicode characters to UTF-8 octets
+ utf8::encode($report) if utf8::is_utf8($report);
+ print $report or die "error writing: $!";
+ }
if ( $opt{'test-mode'} ) {
- use bytes;
- print $status->get_report() or die "error writing: $!";
+ my $report = $status->get_report();
+ # encode Unicode characters to UTF-8 octets
+ utf8::encode($report) if utf8::is_utf8($report);
+ print $report or die "error writing: $!";
}
# if this message was spam, set the exit value appropriately.
Modified: spamassassin/trunk/sa-awl.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-awl.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/trunk/sa-awl.raw (original)
+++ spamassassin/trunk/sa-awl.raw Mon May 7 06:37:50 2018
@@ -47,6 +47,9 @@ usage: sa-awl [--clean] [--min n] [dbfil
use Fcntl;
use Getopt::Long;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
our ( $opt_clean, $opt_min, $opt_help );
Modified: spamassassin/trunk/sa-check_spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-check_spamd.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/trunk/sa-check_spamd.raw (original)
+++ spamassassin/trunk/sa-check_spamd.raw Mon May 7 06:37:50 2018
@@ -37,6 +37,9 @@ use lib '@@INSTALLSITELIB@@';
use Errno qw(EBADF);
use File::Spec;
use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
Modified: spamassassin/trunk/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-compile.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/trunk/sa-compile.raw (original)
+++ spamassassin/trunk/sa-compile.raw Mon May 7 06:37:50 2018
@@ -31,6 +31,9 @@ use lib '@@INSTALLSITELIB@@';
use Errno qw(EBADF);
use File::Spec;
use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
Modified: spamassassin/trunk/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-learn.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Mon May 7 06:37:50 2018
@@ -24,6 +24,9 @@ use Errno qw(EBADF);
use Getopt::Long;
use Pod::Usage;
use File::Spec;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
our ( $spamtest, %opt, $isspam, $forget, $messagecount, $learnedcount, $messagelimit, $progress,
$total_messages, $init_results, $start_time, $synconly, $learnprob, @targets, $bayes_override_path );
Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Mon May 7 06:37:50 2018
@@ -55,6 +55,9 @@ use File::Path;
use Getopt::Long;
use Pod::Usage;
use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?rev=1831073&r1=1831072&r2=1831073&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Mon May 7 06:37:50 2018
@@ -75,6 +75,7 @@ BEGIN {
use Getopt::Long;
use Pod::Usage;
+use POSIX qw(locale_h setsid sigprocmask _exit);
use Mail::SpamAssassin;
use Mail::SpamAssassin::ArchiveIterator;
use Mail::SpamAssassin::Util::Progress;
@@ -90,6 +91,8 @@ BEGIN {
};
};
+POSIX::setlocale(LC_TIME,'C');
+
my %resphash = (
EX_OK => 0, # no problems
EX_USAGE => 64, # command line usage error