File qmail-vacation-no-sa.patch of Package qmail-vacation

Overview Repositories Revisions Requests Users Attributes Meta

File qmail-vacation-no-sa.patch of Package qmail-vacation

Nur in qmail-vacation-v1.4m: LICENSE.
diff -rU3 qmail-vacation-v1.4m.orig/vacation qmail-vacation-v1.4m/vacation
--- qmail-vacation-v1.4m.orig/vacation	2011-04-27 15:09:30.000000000 +0200
+++ qmail-vacation-v1.4m/vacation	2011-04-27 15:12:22.000000000 +0200
@@ -478,7 +478,7 @@
     $vacation = "xVACATIONx";
 
     $dot_qmail_commands = << "EOF";	# Must use double quotes
-|preline $vacation $user
+|$vacation $user
 $mailbox
 EOF
 }
@@ -539,34 +539,14 @@
     $/ = '';			# Read in paragraph mode
 
     $header = <STDIN>;
-
-   #tmpmsg is used to check if the message is spam later...    
-    $tmpmsg = $header;
-    while (<STDIN>){$tmpmsg .= $_;};
-
-
     $header =~ s/\n\s+/ /g;	# Join continuation lines
 
-   #This is used to check for spam ... a copy of the message is placed int /tmp
-   #and it is deleted before this script finishes.
-    
-    $spamassassin="/usr/bin/spamassassin";
-    $spamTmpFile="/tmp/vacation-$user";
-    if ( -e $spamassassin){
-      open (OUT, ">$spamTmpFile");
-        print OUT $tmpmsg;
-      close(OUT);
-      $spam = `cat $spamTmpFile | $spamassassin -P | grep -c X-Spam-Flag`;
-      chomp($spam);
-      unlink $spamTmpFile;
-      exit(0) if ($spam > 0);
-    }#fi
-
    #it appears that if you add header checks (exit if exist) they
    #go here :) -- @
     exit(0) if ($header =~ /^Precedence:\s+(bulk|junk)/mi);
     exit(0) if ($header =~ /^From.*-REQUEST\@/mi);
     exit(0) if ($header =~ /^Mailing-List:/mi);
+    exit(0) if ($header =~ /^X-Spam-Flag:\s+YES/mi);
 
     if ($check_to_and_cc)
     {

Places

File qmail-vacation-no-sa.patch of Package qmail-vacation

Places