--- /usr/local/src/amavisd-new-2.6.1/amavisd	2008-06-29 02:37:58.000000000 +0200
+++ /usr/sbin/amavisd-new-2.6.1_crm114	2008-07-28 20:48:18.000000000 +0200
@@ -963,6 +963,7 @@
     X-Amavis-PenPals X-Amavis-OS-Fingerprint X-Amavis-PolicyBank
     X-Spam-Status X-Spam-Level X-Spam-Flag X-Spam-Score
     X-Spam-Report X-Spam-Checker-Version X-Spam-Tests
+    X-Spam-CRM114-Status X-Spam-CRM114-CacheID
     X-DSPAM-Signature X-DSPAM-Result
     X-DSPAM-Confidence X-DSPAM-Probability X-DSPAM-User X-DSPAM-Factors
   );
@@ -9796,12 +9797,15 @@
         $virus_dejavu = 1;
       }
       if ($spam_presence_checked) {
-        my($spam_level,$spam_status,$spam_report,$spam_summary) =
-          @$cache_entry{'SL','SS','SR','SY'};
+	my($spam_level,$spam_status,$spam_report,$spam_summary,$crm114_score,$crm114_status,$crm114_cacheid) =
+	  @$cache_entry{'SL','SS','SR','SY','SCS','SCT','SCI'};
         $msginfo->spam_level($spam_level);
         $msginfo->spam_status($spam_status);
         $msginfo->spam_report($spam_report);
         $msginfo->spam_summary($spam_summary);
+	$msginfo->supplementary_info('CRM114SCORE', $crm114_score),
+	$msginfo->supplementary_info('CRM114STATUS', $crm114_status),
+	$msginfo->supplementary_info('CRM114CACHEID', $crm114_cacheid)
       }
       do_log(1,"cached %s from <%s> (%s,%s)", $body_digest, $sender,
                $virus_presence_checked, $spam_presence_checked);
@@ -10052,9 +10056,13 @@
         prolong_timer($which_section);
         $elapsed{'TimeElapsedSpamCheck'} = Time::HiRes::time - $t0_sect;
         snmp_count('OpsSpamCheck');
-        @$cache_entry{'St','SL','SS','SR','SY'} =
+	@$cache_entry{'St','SL','SS','SR','SY','SCS','SCT','SCI'} =
           (int($now), $msginfo->spam_level, $msginfo->spam_status,
-           $msginfo->spam_report, $msginfo->spam_summary);
+           $msginfo->spam_report, $msginfo->spam_summary,
+	   $msginfo->supplementary_info('CRM114SCORE'),
+	   $msginfo->supplementary_info('CRM114STATUS'),
+	   $msginfo->supplementary_info('CRM114CACHEID')
+           );
         $spam_presence_checked = 1;
       }
     }
@@ -11080,7 +11088,8 @@
     if (c('remove_existing_spam_headers')) {
       my(@which_headers) = qw(
           X-Spam-Status X-Spam-Level X-Spam-Flag X-Spam-Score
-          X-Spam-Report X-Spam-Checker-Version X-Spam-Tests);
+          X-Spam-Report X-Spam-Checker-Version X-Spam-Tests
+	  X-Spam-CRM114-Status X-Spam-CRM114-CacheID);
       push(@which_headers, qw(
           X-DSPAM-Result X-DSPAM-Confidence X-DSPAM-Probability
           X-DSPAM-Signature X-DSPAM-User X-DSPAM-Factors))  if defined $dspam;
@@ -11285,6 +11294,13 @@
              $allowed_hdrs && $allowed_hdrs->{lc('X-Spam-Level')};
         $hdr_edits->add_header('X-Spam-Status', $full_spam_status, 1)
           if $allowed_hdrs && $allowed_hdrs->{lc('X-Spam-Status')};
+	$hdr_edits->add_header('X-Spam-CRM114-Status', sprintf("%s ( %s )",
+		$msginfo->supplementary_info('CRM114STATUS'),
+		$msginfo->supplementary_info('CRM114SCORE')), 1)
+          if $allowed_hdrs && $allowed_hdrs->{lc('X-Spam-CRM114-Status')};
+	$hdr_edits->add_header('X-Spam-CRM114-CacheID',
+		$msginfo->supplementary_info('CRM114CACHEID'), 1)
+	  if $allowed_hdrs && $allowed_hdrs->{lc('X-Spam-CRM114-CacheID')};
       }
       if ($do_tag2 && $is_local) {
         # SA reports may contain any octet, i.e. 8-bit data from a mail
@@ -12975,9 +12991,9 @@
 
 if ($daemonize) {  # log warnings and uncaught errors
   $SIG{'__DIE__' } =
-    sub { if (!$^S) { my($m) = $@; chomp($m); do_log(-1,"_DIE: %s", $m) } };
+    sub { if (!$^S) { my($m) = @_; chomp($m); do_log(-1,"_DIE: %s", $m) } };
   $SIG{'__WARN__'} =
-    sub { my($m) = $@; chomp($m); do_log( 2,"_WARN: %s",$m) };
+    sub { my($m) = @_; chomp($m); do_log( 2,"_WARN: %s",$m) };
 }
 
 # set up Net::Server configuration
@@ -20359,6 +20375,7 @@
         $sa_tests   = $per_msg_status->get_tag('TESTSSCORES',',');
         for my $t (qw(TESTS AUTOLEARN AUTOLEARNSCORE SC SCRULE SCTYPE
                       LANGUAGES RELAYCOUNTRY ASN ASNCIDR DCCB DCCR DCCREP
+		      CRM114STATUS CRM114SCORE CRM114CACHEID
                       DKIMDOMAIN DKIMIDENTITY AWLSIGNERMEAN)) {
           $supplementary_info{$t} = $per_msg_status->get_tag($t);
         }