Package: spampd
Version: 2.30-1
Followup-For: Bug #344372

The patch below updates spampd to work with the current Net::Server.

In each case it was just a matter of removing the "%s" arg and allowing
what had been the next arg to take its place.


--- spampd-orig 2005-12-04 23:14:19.000000000 +0000
+++ spampd      2005-12-30 05:39:08.000000000 +0000
@@ -490,7 +490,7 @@
                
            $msgid ||= "(unknown)";
            
-           $self->log(2, "%s", "processing message $msgid for ". $recips);
+           $self->log(2, "processing message $msgid for ". $recips);
            
                eval {
                        
@@ -574,12 +574,12 @@
                    my $msg_threshold = 
sprintf("%.2f",$status->get_required_hits);
                    my $proc_time = sprintf("%.2f", time - $start);
                    
-                       $self->log(2, "%s", "$was_it_spam $msgid 
($msg_score/$msg_threshold) from $sender for ".
+                       $self->log(2, "$was_it_spam $msgid 
($msg_score/$msg_threshold) from $sender for ".
                                                        "$recips in ". 
$proc_time . "s, $size bytes.");
                        
                        # thanks to Kurt Andersen for this idea
                        if ( $self->{spampd}->{rh} ) {                  
-                               $self->log(2, "%s", "rules hit for $msgid: " . 
$status->get_names_of_tests_hit); }
+                               $self->log(2, "rules hit for $msgid: " . 
$status->get_names_of_tests_hit); }
        
                    $status->finish();
      
@@ -589,7 +589,7 @@
                };
        
                if ( $@ ne '' ) {
-                 $self->log(1, "%s", "WARNING!! SpamAssassin error on message 
$msgid: $@");
+                 $self->log(1, "WARNING!! SpamAssassin error on message 
$msgid: $@");
              return 0;
            }
        
@@ -679,7 +679,7 @@
                
                #close the temp file
                $smtp_server->{data}->close
-                       or $self->log(1, "%s", "WARNING!! Couldn't close 
smtp_server->{data} temp file: $!");
+                       or $self->log(1, "WARNING!! Couldn't close 
smtp_server->{data} temp file: $!");
 
            if ( $self->{spampd}->{debug} ) {
              $self->log(2, "Finished sending DATA"); }
@@ -692,7 +692,7 @@
                or die "Error in server->ok(client->hear): $!";
                
          if ( $self->{spampd}->{debug} ) {
-           $self->log(2, "%s", "Destination response: '" . $destresp . "'"); }
+           $self->log(2, "Destination response: '" . $destresp . "'"); }
          
          # if we're in data state but the response is an error, exit data 
state.
          # Shold not normally occur, but can happen. Thanks to Rodrigo Ventura 
for bug reports.
@@ -723,7 +723,7 @@
   if ($@ ne '') {
          chomp($@);
          $msg = "WARNING!! Error in process_request eval block: $@";
-         $self->log(0, "%s", $msg);
+         $self->log(0, $msg);
          die ($msg . "\n");
   }
   
@@ -911,7 +911,7 @@
    }, 'SpamPD';
 
 # Redirect all warnings to Server::log 
-$SIG{__WARN__} = sub { $server->log (2, "%s", $_[0]); };
+$SIG{__WARN__} = sub { $server->log (2, $_[0]); };
           
 # call Net::Server to start up the daemon inside
 $server->run;


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11.12-xenU-rimu1
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages spampd depends on:
ii  adduser                      3.80        Add and remove users and groups
ii  dpkg                         1.13.11.0.1 package maintenance system for Deb
ii  libnet-server-perl           0.89-1      An extensible, general perl server
ii  perl                         5.8.7-10    Larry Wall's Practical Extraction 
ii  spamassassin                 3.1.0a-2    Perl-based spam filter using text 

spampd recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to