SpamAssassin

Update of /cvsroot/spamassassin/pop3/lib/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv22913/lib/UI

Modified Files:
	Win32.pm 
Log Message:
add =cut so die() handler will work


Index: Win32.pm
===================================================================
RCS file: /cvsroot/spamassassin/pop3/lib/UI/Win32.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -w -u -d -r1.5 -r1.6
--- Win32.pm	1 Feb 2003 09:03:20 -0000	1.5
+++ Win32.pm	2 Feb 2003 21:14:45 -0000	1.6
@@ -122,6 +122,8 @@
 
 Add a die hook so some die() errors will display as a Win32::GUI::MessageBox
 
+=cut
+
 sub dieHandler {
   my ($error) = @_;

Update of /cvsroot/spamassassin/spamassassin/masses/corpora
In directory sc8-pr-cvs1:/tmp/cvs-serv23178/masses/corpora

Modified Files:
	mass-find-nonspam 
Log Message:
bug 1432: mass-find-nonspam was broken. fixed

Index: mass-find-nonspam
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/masses/corpora/mass-find-nonspam,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -w -u -d -r1.8 -r1.9
--- mass-find-nonspam	21 Jan 2003 17:33:56 -0000	1.8
+++ mass-find-nonspam	2 Feb 2003 19:29:14 -0000	1.9
@@ -101,17 +101,27 @@
 use lib "lib";
 use lib "../lib";
 use lib "../../lib";
-use Mail::ArchiveIterator;
+use Mail::SpamAssassin::ArchiveIterator;
 use Mail::SpamAssassin::NoMailAudit;
 
 # flush buffer immediately so if mass-check fails or stops we don't get a corrupt line
 $|++;
 
-my $iter = new Mail::ArchiveIterator ({
+my $format = "dir";		# for now. TODO
+
+my $iter = new Mail::SpamAssassin::ArchiveIterator ({
+        'opt_j' => 1,
+        'opt_n' => 1,
+        'opt_all' => 1,
   });
 
-$iter->set_function (\&wanted);
-$iter->run (@ARGV);
+my @targets = ();
+foreach (@ARGV) {
+  push (@targets, "ham:$format:$_");
+}
+
+$iter->set_functions (\&wanted, sub { });
+$iter->run (@targets);
 
 #foreach my $from (sort {$count{$b} <=> $count{$a}} keys %count) {
 #print "$count{$from}   $from $lastsubject{$from}  $lastid{$from}\n";
@@ -126,7 +136,7 @@
 }
 
 sub wanted {
-  my ($id, $dataref) = @_;
+  my ($id, $time, $dataref) = @_;
 
   my $ma = Mail::SpamAssassin::NoMailAudit->new ('data' => $dataref);
   my $from = $ma->get_header ("From");

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin
In directory sc8-pr-cvs1:/tmp/cvs-serv17477/lib/Mail/SpamAssassin

Modified Files:
	CmdLearn.pm 
Log Message:
bug 1433: added --local switch to learner UIs, for future use

Index: CmdLearn.pm
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/CmdLearn.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -w -u -d -r1.21 -r1.22
--- CmdLearn.pm	29 Jan 2003 17:56:46 -0000	1.21
+++ CmdLearn.pm	2 Feb 2003 19:21:28 -0000	1.22
@@ -38,6 +38,7 @@
 	     'folders|f=s'			=> \$opt{'folders'},
              'showdots'                         => \$opt{'showdots'},
 	     'no-rebuild|norebuild'		=> \$opt{'norebuild'},
+	     'local|L'				=> \$opt{'local'},
 	     'force-expire'			=> \$opt{'force-expire'},
 
              'stopafter'                        => \$opt{'stopafter'},

Update of /cvsroot/spamassassin/spamassassin
In directory sc8-pr-cvs1:/tmp/cvs-serv17477

Modified Files:
	sa-forget.raw sa-learn-nonspam.raw sa-learn-spam.raw 
Log Message:
bug 1433: added --local switch to learner UIs, for future use

Index: sa-forget.raw
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/sa-forget.raw,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -w -u -d -r1.14 -r1.15
--- sa-forget.raw	9 Jan 2003 23:51:51 -0000	1.14
+++ sa-forget.raw	2 Feb 2003 19:21:26 -0000	1.15
@@ -63,6 +63,7 @@
  --mbox                            Check a file in mbox format
  --showdots                        Show progress using dots
  --no-rebuild                      Skip building databases after scan
+ -L, --local                       Operate locally, no network accesses
  -C file, --config-file=file       Path to standard configuration dir
  -p prefs, --prefs-file=file       Set user preferences file
  -a, --auto-whitelist              Use auto-whitelists
@@ -114,6 +115,15 @@
 database entries.  If you plan to scan many folders in a batch, it is faster to
 use this switch and run B<sa-learn-rebuild> once all the folders have been
 scanned.
+
+=item B<-L>, B<--local>
+
+Do not perform any network accesses while learning details about the mail
+messages.  This will speed up the learning process, but may result in a
+slightly lower accuracy.
+
+Note that this is currently ignored, as current versions of SpamAssassin will
+not perform network access while learning; but future versions may.
 
 =back
 

Index: sa-learn-nonspam.raw
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/sa-learn-nonspam.raw,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -w -u -d -r1.20 -r1.21
--- sa-learn-nonspam.raw	1 Feb 2003 17:06:33 -0000	1.20
+++ sa-learn-nonspam.raw	2 Feb 2003 19:21:27 -0000	1.21
@@ -63,6 +63,7 @@
  --mbox                            Learn a file in mbox format
  --showdots                        Show progress using dots
  --no-rebuild                      Skip building databases after scan
+ -L, --local			   Operate locally, no network accesses
  -C file, --config-file=file       Path to standard configuration dir
  -p prefs, --prefs-file=file       Set user preferences file
  -a, --auto-whitelist              Use auto-whitelists
@@ -318,6 +319,15 @@
 database entries.  If you plan to scan many folders in a batch, it is faster to
 use this switch and run B<sa-learn-rebuild> once all the folders have been
 scanned.
+
+=item B<-L>, B<--local>
+
+Do not perform any network accesses while learning details about the mail
+messages.  This will speed up the learning process, but may result in a
+slightly lower accuracy.
+
+Note that this is currently ignored, as current versions of SpamAssassin will
+not perform network access while learning; but future versions may.
 
 =back
 

Index: sa-learn-spam.raw
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/sa-learn-spam.raw,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -w -u -d -r1.14 -r1.15
--- sa-learn-spam.raw	9 Jan 2003 23:51:51 -0000	1.14
+++ sa-learn-spam.raw	2 Feb 2003 19:21:27 -0000	1.15
@@ -63,6 +63,7 @@
  --mbox                            Learn a file in mbox format
  --showdots                        Show progress using dots
  --no-rebuild                      Skip building databases after scan
+ -L, --local                       Operate locally, no network accesses
  -C file, --config-file=file       Path to standard configuration dir
  -p prefs, --prefs-file=file       Set user preferences file
  -a, --auto-whitelist              Use auto-whitelists
@@ -120,6 +121,15 @@
 database entries.  If you plan to scan many folders in a batch, it is faster to
 use this switch and run B<sa-learn-rebuild> once all the folders have been
 scanned.
+
+=item B<-L>, B<--local>
+
+Do not perform any network accesses while learning details about the mail
+messages.  This will speed up the learning process, but may result in a
+slightly lower accuracy.
+
+Note that this is currently ignored, as current versions of SpamAssassin will
+not perform network access while learning; but future versions may.
 
 =back

Update of /cvsroot/spamassassin/spamassassin/masses
In directory sc8-pr-cvs1:/tmp/cvs-serv7837/masses

Modified Files:
	score-ranges-from-freqs 
Log Message:
Set 0 scores from GA run
My version of score-ranges for said scores


Index: score-ranges-from-freqs
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/masses/score-ranges-from-freqs,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -w -u -d -r1.19 -r1.20
--- score-ranges-from-freqs	20 Jan 2003 16:50:30 -0000	1.19
+++ score-ranges-from-freqs	2 Feb 2003 19:07:11 -0000	1.20
@@ -6,18 +6,22 @@
 # 0.5  = -limit ....[... 0 ...].... limit
 # 0.75 = -limit ......[. 0 .....].. limit
 # 1.0  = -limit ........ 0 [......] limit
-my $sliding_window_limits = 4.0; # limits = [-$range, +$range]
-my $sliding_window_size =   5.0; # scores have this range within limits
+my $sliding_window_limits = 4.8; # limits = [-$range, +$range]
+my $sliding_window_size =   5.5; # scores have this range within limits
 
 # 0.0  = -limit [......] 0 ........ limit
 # 0.25 = -limit ....[... 0 ]....... limit
 # 0.5  = -limit ......[. 0 .]...... limit (note: tighter)
 # 0.75 = -limit .......[ 0 ...].... limit
 # 1.0  = -limit ........ 0 [......] limit
-my $shrinking_window_lower_base =  -0.50; 
-my $shrinking_window_lower_range =  1.50; # *ratio, added to above
+my $shrinking_window_lower_base =   0.00; 
+my $shrinking_window_lower_range =  1.00; # *ratio, added to above
 my $shrinking_window_size_base =    1.00;
-my $shrinking_window_size_range =   2.00; # *ratio, added to above
+my $shrinking_window_size_range =   1.00; # *ratio, added to above
+#my $shrinking_window_lower_base =  -0.50; 
+#my $shrinking_window_lower_range =  1.30; # *ratio, added to above
+#my $shrinking_window_size_base =    1.00;
+#my $shrinking_window_size_range =   3.00; # *ratio, added to above
 
 my $use_sliding_window = 0;
 
@@ -47,6 +51,7 @@
 my %mutable_tests = ();
 my %ranking = ();
 my %soratio = ();
+my %is_nice = ();
 
 if (!defined $argcffile) { $argcffile = "../rules"; }
 system ("./parse-rules-for-masses -d \"$argcffile\" -s $scoreset") and die;
@@ -80,16 +85,23 @@
   $freq_nonspam{$test} = $nonspam;
 
   my $tflags = $rules{$test}->{tflags}; $tflags ||= '';
-  if ($tflags =~ /\buserconf\b/ || ( ($scoreset % 2) == 0 && $tflags =~ /\bnet\b/ )) {
+  if ($tflags =~ /\buserconf\b/ ||
+      ( ($scoreset % 2) == 0 && $tflags =~ /\bnet\b/ )) {
     $mutable_tests{$test} = 0;
   } else {
     $mutable_tests{$test} = 1;
   }
+  if ($tflags =~ m/\bnice\b/i) {
+    $is_nice{$test} = 1;
+  } else {
+    $is_nice{$test} = 0;
+  }
 
   if ($overall < 0.01) {        # less than 0.01% of messages were hit
     $mutable_tests{$test} = 0;
     $soratio{$test} = 0.5;
     $ranking{$test} = 0.0;
+    $rules{$test}->{score} = 0; # tvd - disable these rules automagically
 
   } else {
     $soratio{$test} = $soratio;
@@ -111,10 +123,9 @@
   my $nonspam = $freq_nonspam{$test};
   my $soratio = $soratio{$test};
   my $ranking = $ranking{$test};
-  my $mutatable = $mutable_tests{$test};
-  my $tflags = $rules{$test}->{tflags}; $tflags ||= '';
+  my $mutable = $mutable_tests{$test};
 
-  if (!$mutatable) {
+  if (!$mutable || $rules{$test}->{score} == 0) { # didn't look for score 0 - tvd
     printf OUT ("%3.3f %3.3f 0 $test\n",
                          $rules{$test}->{score},
                          $rules{$test}->{score});
@@ -122,7 +133,7 @@
   }
 
   # 0.0 = best nice, 1.0 = best nonnice
-  if ($tflags =~ /nice/) {
+  if ($is_nice{$test}) {
     $ranking = .5 - ($ranking / 2);
   } else {
     $ranking = .5 + ($ranking / 2);
@@ -134,7 +145,39 @@
   } else {
     ($lo, $hi) = shrinking_window_ratio_to_range($ranking);
   }
-  printf OUT ("%3.1f %3.1f 1 $test\n", $lo, $hi);
+
+  # tvd
+  my $tflags = $rules{$test}->{tflags}; $tflags ||= '';
+  if ( $is_nice{$test} && ( $ranking < .5 ) ) { # proper nice rule
+    $lo *= 2.2 if ( $soratio <= 0.05 && $nonspam > 0.4 ); # let good rules be larger if they want to
+    $hi =	($soratio == 0) ? $lo :
+    		($soratio <= 0.005 ) ? $lo/1.1 :
+    		($soratio <= 0.010 && $nonspam > 0.2) ? $lo/2.0 :
+		($soratio <= 0.025 && $nonspam > 1.5) ? $lo/10.0 :
+		0;
+
+    if ( $soratio >= 0.35 ) { # auto-disable bad rules
+      ($lo,$hi) = (0,0);
+    }
+  }
+  elsif ( !$is_nice{$test} && ( $ranking >= .5 ) ) { # proper spam rule
+    $hi *= 1.5 if ( $soratio >= 0.99 && $spam > 1.0 ); # let good rules be larger if they want to
+    $lo =	($soratio == 1) ? $hi:
+    		($soratio >= 0.995 ) ? $hi/4.0 :
+    		($soratio >= 0.990 && $spam > 1.0) ? $hi/8.0 :
+		($soratio >= 0.900 && $spam > 10.0) ? $hi/24.0 :
+		0;
+
+    if ( $soratio <= 0.65 ) { # auto-disable bad rules
+      ($lo,$hi) = (0,0);
+    }
+  }
+  else { # rule that has bad nice setting
+    ($lo,$hi) = (0,0);
+  }
+  $mutable = 0 if ( $hi == $lo );
+
+  printf OUT ("%3.1f %3.1f $mutable $test\n", $lo, $hi);
 }
 close OUT;
 exit;
@@ -143,6 +186,9 @@
   my $ratio = shift;
   my $lo = -$sliding_window_limits + ($sliding_window_size * $ratio);
   my $hi = +$sliding_window_limits - ($sliding_window_size * (1-$ratio));
+  if ($lo > $hi) { # ???
+    ($lo,$hi) = ($hi,$lo);
+  }
   ($lo, $hi);
 }
 
@@ -152,13 +198,21 @@
   my $adjusted = ($ratio -.5) * 2;      # adj [0,1] to [-1,1]
   if ($adjusted < 0) { $is_nice = 1; $adjusted = -$adjusted; }
 
+#$adjusted /= 1.5 if ( $ratio < 0.95 && $ratio > 0.15 ); # tvd
+
   my $lower = $shrinking_window_lower_base 
                         + ($shrinking_window_lower_range * $adjusted);
   my $range = $shrinking_window_size_base 
                         + ($shrinking_window_size_range * $adjusted);
   my $lo = $lower;
   my $hi = $lower + $range;
-  if ($is_nice) { my $tmp = $hi; $hi = -$lo; $lo = -$tmp; }
+  if ($is_nice) {
+    my $tmp = $hi; $hi = -$lo; $lo = -$tmp;
+  }
+  if ($lo > $hi) { # ???
+    ($lo,$hi) = ($hi,$lo);
+  }
+
   ($lo, $hi);
 }

Update of /cvsroot/spamassassin/spamassassin/rules
In directory sc8-pr-cvs1:/tmp/cvs-serv7837/rules

Modified Files:
	50_scores.cf 
Log Message:
Set 0 scores from GA run
My version of score-ranges for said scores


Index: 50_scores.cf
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/rules/50_scores.cf,v
retrieving revision 1.271
retrieving revision 1.272
diff -b -w -u -d -r1.271 -r1.272
--- 50_scores.cf	30 Jan 2003 15:41:07 -0000	1.271
+++ 50_scores.cf	2 Feb 2003 19:07:17 -0000	1.272
@@ -13,721 +13,811 @@
 # resulted in minimum false positives or negatives.  The default evolution
 # parameters are very strongly weighted against false positives.
 
-# SUMMARY:               140 /   3537
-#
-# Correctly non-spam: 210220  99.93%  (81.74% overall)
-# Correctly spam:      43288  92.45%  (16.83% overall)
-# False positives:       140  0.07%  (0.05% overall,   3280 adjusted)
-# False negatives:      3537  7.55%  (1.38% overall,   9092 adjusted)
-# Average score for spam:  14.3    nonspam: -2.2
-# Average for false-pos:   7.0  false-neg: 2.6
[...1642 lines suppressed...]
-score USER_IN_WHITELIST              -100
+score USER_IN_BLACKLIST 100.000
+score USER_IN_WHITELIST -100.000
 
 # Not really false positives but the user wants spam!
 
-score USER_IN_WHITELIST_TO           -6
-score USER_IN_MORE_SPAM_TO           -20
-score USER_IN_ALL_SPAM_TO            -100
+score USER_IN_WHITELIST_TO -6.000
+score USER_IN_MORE_SPAM_TO -20.000
+score USER_IN_ALL_SPAM_TO -100.000
 
 ###########################################################################
 
@@ -883,3 +1000,4 @@
 score BAYES_80         		     0 0 0.5 0.5
 score BAYES_90         		     0 0 2.0 2.0
 score BAYES_99          	     0 0 4.0 4.0
+

Duncan Findlay said:

> What happened to the whole "we're trying to freeze" thing?

Well, that's rule freeze -- this is non-rules-related stuff, and very
small changes.

(well, it's big changes in terms of addition of functionality, but in
terms of *code* changed, it's very small).

Plus it has to go in sometime. ;)  It's great functionality...

There's no rule modifications going in though.

--j.

Update of /cvsroot/spamassassin/spamassassin/spamd
In directory sc8-pr-cvs1:/tmp/cvs-serv22014/spamd

Modified Files:
	libspamc.c 
Log Message:
removed connect() debugging from libspamc, bug seems fixed now

Index: libspamc.c
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/spamd/libspamc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -w -u -d -r1.25 -r1.26
--- libspamc.c	1 Feb 2003 16:21:47 -0000	1.25
+++ libspamc.c	2 Feb 2003 15:30:24 -0000	1.26
@@ -75,7 +75,8 @@
 #define EX__MAX 200 
 #endif
 
-static const int DO_CONNECT_DEBUG_SYSLOGS = 1;
+#undef DO_CONNECT_DEBUG_SYSLOGS
+/* or #define DO_CONNECT_DEBUG_SYSLOGS 1 */
 
 static const int ESC_PASSTHROUGHRAW = EX__MAX+666;
 
@@ -109,7 +110,9 @@
   struct sockaddr_in addrbuf, *addr;
   struct in_addr inaddrlist[256];
 
-  int i; char dbgbuf[2048]; int dbgbuflen = 0;		// DBG
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
+  int dbgiter; char dbgbuf[2048]; int dbgbuflen = 0;
+#endif
 
   /* NOTE: do not call syslog() (unless you are about to return) before
    * we take a copy of the h_addr_list.
@@ -129,6 +132,8 @@
     memset (inaddrlist, 0, sizeof(inaddrlist));
 
     for (hostnum=0; hent->h_addr_list[hostnum] != 0; hostnum++) {
+
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
       dbgbuflen += snprintf (dbgbuf+dbgbuflen, 2047-dbgbuflen,
 	          "[%d %lx: %d.%d.%d.%d]",
 		  hostnum, hent->h_addr_list[hostnum],
@@ -136,6 +141,7 @@
 		  hent->h_addr_list[hostnum][1],
 		  hent->h_addr_list[hostnum][2],
 		  hent->h_addr_list[hostnum][3]);
+#endif
 
       if (hostnum > 255) {
 	syslog (LOG_ERR, "too many address in hostent (%d), ignoring others",
@@ -149,34 +155,38 @@
 	return EX_SOFTWARE;
       }
 
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
       dbgbuflen += snprintf (dbgbuf+dbgbuflen, 2047-dbgbuflen,
 		  "[%d: %d.%d.%d.%d] ", sizeof (struct in_addr),
 		  hent->h_addr_list[hostnum][0],
 		  hent->h_addr_list[hostnum][1],
 		  hent->h_addr_list[hostnum][2],
 		  hent->h_addr_list[hostnum][3]);
+#endif
 
       memcpy ((void *) &(inaddrlist[hostnum]),
 		(void *) hent->h_addr_list[hostnum],
 		sizeof (struct in_addr));
     }
 
-    if (DO_CONNECT_DEBUG_SYSLOGS) {
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
       syslog (LOG_DEBUG, "dbg: %d %s", hostnum, dbgbuf); dbgbuflen = 0;
-    }
+#endif
   }
 
 
-  if (DO_CONNECT_DEBUG_SYSLOGS) {
-    for (i = 0; i < hostnum; i++) {
-      syslog (LOG_DEBUG, "dbg: host addr %d/%d = %lx at %lx",
-		  i, hostnum, inaddrlist[i].s_addr, &(inaddrlist[i]));
-    }
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
+    for (dbgiter = 0; dbgiter < hostnum; dbgiter++) {
+      syslog (LOG_DEBUG, "dbg: host addr %d/%d = %lx at %lx", dbgiter, hostnum,
+		  inaddrlist[dbgiter].s_addr, &(inaddrlist[dbgiter]));
   }
+#endif
 
   hent = NULL; /* cannot use hent after this point, syslog() may overwrite it */
 
-  if (DO_CONNECT_DEBUG_SYSLOGS) { syslog (LOG_DEBUG, "dbg: socket"); }
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
+  syslog (LOG_DEBUG, "dbg: socket");
+#endif
 
   if(-1 == (mysock = socket(PF_INET,SOCK_STREAM,0)))
   {
@@ -199,8 +209,6 @@
     }
   }
   
-  if (DO_CONNECT_DEBUG_SYSLOGS) { syslog (LOG_DEBUG, "dbg: setsockopt"); }
-
 #ifdef USE_TCP_NODELAY
   /* TODO: should this be up above the connect()? */
   value = 1;		/* make this explicit! */
@@ -223,14 +231,17 @@
 #endif
 
   for (numloops=0; numloops < MAX_CONNECT_RETRIES; numloops++) {
-    if (DO_CONNECT_DEBUG_SYSLOGS) {
+  
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
       syslog (LOG_DEBUG, "dbg: connect() to spamd %d", numloops);
-    }
+#endif
+
     if (argaddr != NULL) {
       addr = (struct sockaddr_in *) argaddr;     /* use the one provided */
-      if (DO_CONNECT_DEBUG_SYSLOGS) {
+  
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
 	syslog (LOG_DEBUG, "dbg: using argaddr");
-      }
+#endif
 
     } else {
       /* cycle through the addrs in hent */
@@ -244,29 +255,30 @@
 	return EX_SOFTWARE;
       }
 
-      if (DO_CONNECT_DEBUG_SYSLOGS) {
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
 	syslog (LOG_DEBUG, "dbg: cpy addr %d/%d at %lx",
 		numloops%hostnum, hostnum, &(inaddrlist[numloops % hostnum]));
-      }
+#endif
 
       memcpy (&addrbuf.sin_addr, &(inaddrlist[numloops % hostnum]),
                         sizeof(addrbuf.sin_addr));
       addr = &addrbuf;
 
-      if (DO_CONNECT_DEBUG_SYSLOGS) {
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
 	syslog (LOG_DEBUG, "dbg: conn addr %d/%d = %lx",
 	    numloops%hostnum, hostnum, addrbuf.sin_addr.s_addr);
-      }
+#endif
 
     }
 
     syslog (LOG_DEBUG, "dbg: connect() to spamd at %s",
 		inet_ntoa(((struct sockaddr_in *)addr)->sin_addr));
     status = connect(mysock,(const struct sockaddr *) addr, sizeof(*addr));
-    if (DO_CONNECT_DEBUG_SYSLOGS) {
+
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
       syslog (LOG_DEBUG, "dbg: connect() to spamd at %s done",
 	  inet_ntoa(((struct sockaddr_in *)addr)->sin_addr));
-    }
+#endif
 
     if (status < 0)
     {

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin
In directory sc8-pr-cvs1:/tmp/cvs-serv14024

Modified Files:
	Conf.pm 
Log Message:
A more sophisticated language handling

Index: Conf.pm
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/Conf.pm,v
retrieving revision 1.165
retrieving revision 1.166
diff -b -w -u -d -r1.165 -r1.166
--- Conf.pm	1 Feb 2003 15:45:34 -0000	1.165
+++ Conf.pm	2 Feb 2003 00:09:11 -0000	1.166
@@ -243,14 +243,23 @@
   my ($self, undef, $scoresonly) = @_; # leave $rules in $_[1]
   local ($_);
 
-  my $lang = $ENV{'LC_ALL'};
-  $lang ||= $ENV{'LANGUAGE'};
+  # Language selection:
+  # See http://www.gnu.org/manual/glibc-2.2.5/html_node/Locale-Categories.html
+  # and http://www.gnu.org/manual/glibc-2.2.5/html_node/Using-gettextized-software.html
+  my $lang = $ENV{'LANGUAGE'}; # LANGUAGE has the highest precedence but has a 
+  if ($lang) {                 # special format: The user may specify more than
+    $lang =~ s/:.*$//;         # one language here, colon separated. We use the 
+  }                            # first one only (lazy bums we are :o)
+  $lang ||= $ENV{'LC_ALL'};
   $lang ||= $ENV{'LC_MESSAGES'};
   $lang ||= $ENV{'LANG'};
-  $lang ||= 'C';
+  $lang ||= 'C';               # Nothing set means C/POSIX
 
-  if ($lang eq 'C') { $lang = 'en_US'; }
-  $lang =~ s/[\.\@].*$//;	# .utf8 or @euro
+  if ($lang =~ /^(C|POSIX)$/) {
+    $lang = 'en_US';           # Our default language
+  } else {
+    $lang =~ s/[@.+,].*$//;    # Strip codeset, modifier/audience, etc. 
+  }                            # (eg. .utf8 or @euro)
 
   my $currentfile = '(no file)';
   my $skipfile = 0;