head	1.24;
access;
symbols
	RELEASE_7_4_0:1.23
	RELEASE_8_2_0:1.23
	RELEASE_6_EOL:1.23
	RELEASE_8_1_0:1.23
	RELEASE_7_3_0:1.23
	RELEASE_8_0_0:1.23
	RELEASE_7_2_0:1.19
	RELEASE_7_1_0:1.15
	RELEASE_6_4_0:1.15
	RELEASE_6_2_0:1.13
	RELEASE_6_1_0:1.10
	RELEASE_5_5_0:1.10
	RELEASE_6_0_0:1.10
	RELEASE_5_4_0:1.9
	RELEASE_4_11_0:1.9
	RELEASE_5_3_0:1.7
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.2
	RELEASE_5_1_0:1.1;
locks; strict;
comment	@# @;


1.24
date	2011.06.11.19.28.36;	author gabor;	state dead;
branches;
next	1.23;

1.23
date	2009.09.12.18.51.59;	author gabor;	state Exp;
branches;
next	1.22;

1.22
date	2009.06.28.08.53.47;	author gabor;	state dead;
branches;
next	1.21;

1.21
date	2009.06.01.21.24.16;	author gabor;	state Exp;
branches;
next	1.20;

1.20
date	2009.05.06.08.54.36;	author gabor;	state dead;
branches;
next	1.19;

1.19
date	2009.04.05.17.49.19;	author gabor;	state Exp;
branches;
next	1.18;

1.18
date	2009.02.24.15.36.43;	author gabor;	state Exp;
branches;
next	1.17;

1.17
date	2009.02.23.11.53.09;	author gabor;	state Exp;
branches;
next	1.16;

1.16
date	2008.12.26.02.29.00;	author gabor;	state dead;
branches;
next	1.15;

1.15
date	2008.09.22.09.30.48;	author gabor;	state Exp;
branches;
next	1.14;

1.14
date	2006.11.27.12.54.03;	author erwin;	state dead;
branches;
next	1.13;

1.13
date	2006.10.01.17.48.40;	author erwin;	state Exp;
branches;
next	1.12;

1.12
date	2006.09.10.14.05.50;	author erwin;	state Exp;
branches;
next	1.11;

1.11
date	2006.07.31.07.41.04;	author erwin;	state Exp;
branches;
next	1.10;

1.10
date	2005.04.25.14.51.44;	author leeym;	state Exp;
branches;
next	1.9;

1.9
date	2004.12.28.03.19.42;	author pav;	state Exp;
branches;
next	1.8;

1.8
date	2004.10.14.07.02.00;	author vanilla;	state Exp;
branches;
next	1.7;

1.7
date	2004.08.26.18.52.06;	author sem;	state Exp;
branches;
next	1.6;

1.6
date	2004.07.18.10.05.50;	author vanilla;	state Exp;
branches;
next	1.5;

1.5
date	2004.04.04.06.23.11;	author leeym;	state Exp;
branches;
next	1.4;

1.4
date	2004.03.28.13.16.01;	author pav;	state Exp;
branches;
next	1.3;

1.3
date	2003.11.20.11.00.19;	author jeh;	state Exp;
branches;
next	1.2;

1.2
date	2003.08.27.08.30.05;	author leeym;	state Exp;
branches;
next	1.1;

1.1
date	2003.04.07.01.18.06;	author edwin;	state Exp;
branches;
next	;


desc
@@


1.24
log
@- Update to 2.6.6

PR:		ports/157352
Submitted by:	Niclas Zeising <niclas.zeising@@gmail.com>
@
text
@--- amavisd.orig	2009-06-25 14:39:01.000000000 +0200
+++ amavisd	2009-08-01 13:51:53.000000000 +0200
@@@@ -1492,6 +1492,7 @@@@
     CC_BANNED,      sub { c('final_banned_destiny') },
     CC_SPAM,        sub { c('final_spam_destiny') },
     CC_BADH,        sub { c('final_bad_header_destiny') },
+    CC_MTA.',2',    D_REJECT,
     CC_OVERSIZED,   D_BOUNCE,
     CC_CATCHALL,    D_PASS,
   );
@@@@ -11316,6 +11317,32 @@@@
         $r->blocking_ccat($blocking_ccat) if !defined($r->blocking_ccat);
         $msginfo->blocking_ccat($blocking_ccat)
                                           if !defined($msginfo->blocking_ccat);
+        my($final_destiny) =
+          $r->setting_by_contents_category(cr('final_destiny_by_ccat'));
+        if ($final_destiny == D_PASS) {
+          $final_destiny = D_REJECT;  # impossible to pass, change to reject
+        }
+        local($1,$2);
+        $r->recip_destiny($final_destiny);
+        if ($final_destiny == D_DISCARD && $smtp_resp =~ /^5/) {
+          $smtp_resp =~ s{^5(\d\d) 5(\.\d\.\d)}{250 2$2};  # 5xx -> 250
+        }
+        my($smtp_reason) =  # get the custom smtp response reason text
+          $r->setting_by_contents_category(cr('smtp_reason_by_ccat'));
+        $smtp_reason = '' if !defined $smtp_reason;
+        if ($smtp_reason ne '') {
+          my(%mybuiltins) = %builtins;  # make a local copy
+          $smtp_reason = expand(\$smtp_reason, \%mybuiltins);
+          $smtp_reason = !ref($smtp_reason) ? '' : $$smtp_reason;
+          chomp($smtp_reason); $smtp_reason = sanitize_str($smtp_reason,1);
+          $smtp_reason = substr($smtp_reason,0,100) . "..."
+            if length($smtp_reason) > 100+3;
+        }
+        $smtp_resp =~ /^(\d\d\d(?: \d\.\d\.\d)?)\s*(.*)\z/;
+        my($dis) = $final_destiny == D_DISCARD ? ' Discarded' : '';
+        $r->recip_smtp_response("$1$dis $smtp_reason, $2");
+        $r->recip_done(1); # fake a delivery (confirm delivery to a bit bucket)
+        # note that 5xx status rejects may later be converted to bounces
       }
       $msginfo->header_edits($hdr_edits); # restore original edits just in case
       $elapsed{'TimeElapsedForwarding'} = Time::HiRes::time - $t0_sect;
@@@@ -17774,23 +17801,21 @@@@
 #
 sub enhance_smtp_response($$$$$) {
   my($smtp_resp,$am_id,$mta_id,$dflt_enhcode,$cmd_name) = @@_;
-  local($1,$2,$3); my($resp_shortmsg,$resp_msg);
+  local($1,$2,$3); my($resp_msg);
   my($resp_code,$resp_enhcode) = ('451', '4.5.0');
   if (!defined($smtp_resp) || $smtp_resp eq '') {
-    $resp_shortmsg = 'No resp. to '.$cmd_name;
+    $smtp_resp = sprintf('No resp. to %s', $cmd_name);
   } elsif ($smtp_resp !~ /^[245]\d{2}/) {
-    $resp_shortmsg = 'Bad resp. to '.$cmd_name;
+    $smtp_resp = sprintf('Bad resp. to %s: %s', $cmd_name,$smtp_resp);
   } elsif ($smtp_resp =~ /^ (\d{3}) [ \t]+ ([245] \. \d{1,3} \. \d{1,3})?
                           \s* (.*) \z/xs) {
     ($resp_code, $resp_enhcode, $resp_msg) = ($1, $2, $3);
     my($c) = substr($resp_code,0,1);
     if ($resp_enhcode eq '' && $resp_code =~ /^[245]/)
       { $resp_enhcode = $dflt_enhcode; $resp_enhcode =~ s/^\d*/$c/ }
-    $resp_shortmsg = $c eq '2' ? 'Ok' : $c eq '4' ? 'TempFailed' : 'Failed';
   }
-  sprintf("%s %s %s, id=%s, from MTA(%s): %s",
-          $resp_code, $resp_enhcode, $resp_shortmsg,
-          $am_id, $mta_id, $smtp_resp);
+  sprintf("%s %s from MTA(%s): %s",
+          $resp_code, $resp_enhcode, $mta_id, $smtp_resp);
 }
 
 # Send mail using SMTP - single transaction
@


1.23
log
@- Add support for SNMP subagent [1]
- Fix bug sending 2 reject notifications [2]

PR:		ports/136151 [1], ports/137333 [2]
Submitted by:	Olli Hauer <ohauer@@gmx.de>
More info:	http://www.mail-archive.com/amavis-user@@lists.sourceforge.net/msg14060.html [2]
@
text
@@


1.22
log
@- Update to 2.6.4

PR:		ports/136078
Submitted by:	Sylvio Cesar <scjamorim@@bsd.com.br>
@
text
@d1 72
a72 12
--- amavisd.orig	2009-06-01 23:08:36.000000000 +0200
+++ amavisd	2009-06-01 23:09:30.000000000 +0200
@@@@ -13649,7 +13649,9 @@@@
 my(%spam_scanners_used);
 my($bpscm) = ca('bypass_spam_checks_maps');
 if (!@@{ca('spam_scanners')}) {
+    undef $extra_code_antispam;
 } elsif (@@$bpscm && !ref($bpscm->[0]) && $bpscm->[0]) {  # simple-minded
+    undef $extra_code_antispam;
 } else {
   eval $extra_code_antispam or die "Problem in antispam code: $@@";
   $extra_code_antispam = 1;       # release memory occupied by the source code
@


1.21
log
@- Add forgotten patch for the last commit
@
text
@@


1.20
log
@- Update to 2.6.3

PR:		ports/134163
Submitted by:	Michael Scheidell <scheidell@@secnap.net>
@
text
@d1 12
a12 131
--- amavisd.orig	2008-12-15 01:50:09.000000000 +0100
+++ amavisd	2009-02-24 16:28:32.000000000 +0100
@@@@ -1,4 +1,4 @@@@
-#!/usr/bin/perl -T
+#!/usr/local/bin/perl -T
 
 #------------------------------------------------------------------------------
 # This is amavisd-new.
@@@@ -7082,7 +7082,7 @@@@
   @@EXPORT_OK = qw(&mime_decode);
   import Amavis::Conf qw(:platform c cr ca $MAXFILES);
   import Amavis::Timing qw(section_time);
-  import Amavis::Util qw(snmp_count ll do_log);
+  import Amavis::Util qw(snmp_count untaint ll do_log);
   import Amavis::Unpackers::NewFilename qw(consumed_bytes);
 }
 use subs @@EXPORT_OK;
@@@@ -7104,7 +7104,8 @@@@
       $newpart_obj->name_declared($pe_name);
       my($newpart) = $newpart_obj->full_name;
       my($outpart) = IO::File->new;
-      $outpart->open($newpart, O_CREAT|O_EXCL|O_WRONLY, 0640)
+      # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+      $outpart->open($newpart, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
         or die "Can't create $pe_name file $newpart: $!";
       binmode($outpart, ":bytes") or die "Can't cancel :utf8 mode: $!"
         if $unicode_aware;
@@@@ -18061,7 +18062,8 @@@@
     else
       { die "File $bsmtp_file_tmp exists??? Refuse to overwrite it, $!" }
     $mp = IO::File->new;
-    $mp->open($bsmtp_file_tmp, O_CREAT|O_EXCL|O_WRONLY, 0640)
+    # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+    $mp->open($bsmtp_file_tmp, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
       or die "Can't create BSMTP file $bsmtp_file_tmp: $!";
     binmode($mp, ":bytes") or die "Can't set :bytes, $!"  if $unicode_aware;
 
@@@@ -18177,7 +18179,7 @@@@
   @@ISA = qw(Exporter);
   @@EXPORT_OK = qw(&mail_to_local_mailbox);
   import Amavis::Conf qw(:platform $quarantine_subdir_levels c cr ca);
-  import Amavis::Util qw(ll do_log unique_list);
+  import Amavis::Util qw(ll do_log untaint unique_list);
   import Amavis::Timing qw(section_time);
   import Amavis::rfc2821_2822_Tools;
   import Amavis::Out::EditHeader;
@@@@ -18334,7 +18336,8 @@@@
               or die "Can't create gzip file $mbxname: $!";
           } else {
             $mp = IO::File->new;
-            $mp->open($mbxname, O_CREAT|O_EXCL|O_WRONLY, 0640)
+            # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+            $mp->open($mbxname, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
               or die "Can't create file $mbxname: $!";
             binmode($mp, ":bytes") or die "Can't cancel :utf8 mode: $!"
               if $unicode_aware;
@@@@ -18346,7 +18349,8 @@@@
             # file at the same time, one will tempfail at this point, with
             # its mail delivery to be retried later by MTA
             $mp = IO::File->new;
-            $mp->open($mbxname, O_CREAT|O_EXCL|O_WRONLY, 0640)
+            # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+            $mp->open($mbxname, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
               or die "Can't create file $mbxname: $!";
           } elsif ($errn==0 && !-f _) {
             die "Mailbox $mbxname is not a regular file, refuse to deliver";
@@@@ -18354,7 +18358,8 @@@@
             die "Mailbox file $mbxname is executable, refuse to deliver";
           } else {
             $mp = IO::File->new;
-            $mp->open($mbxname, O_APPEND|O_WRONLY, 0640)
+            # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+            $mp->open($mbxname, untaint(O_APPEND|O_WRONLY), 0640)
               or die "Can't append to $mbxname: $!";
           }
           binmode($mp, ":bytes") or die "Can't cancel :utf8 mode: $!"
@@@@ -19178,7 +19183,7 @@@@
         $q_to =~ s{^\Q$QUARANTINEDIR\E/}{};  # strip directory name
       }
       my($m_id) = $msginfo->get_header_field_body('message-id');
-      $m_id = parse_message_id($m_id) if $m_id ne ''; # strip CFWS, take #1
+      $m_id = join(' ',parse_message_id($m_id))  if $m_id ne '';  # strip CFWS
       my($subj) = $msginfo->get_header_field_body('subject');
       my($from) = $msginfo->get_header_field_body('from');  # raw full field
       my($rfc2822_from)   = $msginfo->rfc2822_from;  # undef, scalar or listref
@@@@ -19993,4 +19993,5 @@@@
       1;
     } or do { $eval_stat = $@@ ne '' ? $@@ : "errno=$!" };
+    prolong_timer('ask_daemon_internal', $deadline-time);
     last  if $eval_stat eq '';  # mission accomplished
     # error handling (most interesting error codes are EPIPE and ENOTCONN)
@@@@ -21931,7 +21936,8 @@@@
                                      $part->base_name, $err_nm[$sts], $sts);
         my($newpart) = $newpart_obj->full_name;
         my($outpart) = IO::File->new;
-        $outpart->open($newpart, O_CREAT|O_EXCL|O_WRONLY, 0640)
+        # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+        $outpart->open($newpart, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
           or die "Can't create file $newpart: $!";
         binmode($outpart) or die "Can't set file $newpart to binmode: $!";
         my($size) = 0;
@@@@ -22047,7 +22053,8 @@@@
   $newpart_obj->mime_placement($part->mime_placement."/1");
   my($newpart) = $newpart_obj->full_name;
   my($outpart) = IO::File->new;
-  $outpart->open($newpart, O_CREAT|O_EXCL|O_WRONLY, 0640)
+  # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+  $outpart->open($newpart, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
     or die "Can't create file $newpart: $!";
   binmode($outpart) or die "Can't set file $newpart to binmode: $!";
   my($nbytes,$buff); my($size) = 0;
@@@@ -22680,7 +22687,8 @@@@
         $newpart_obj->name_declared([$a->name, $a->longname]);
         my($newpart) = $newpart_obj->full_name;
         my($outpart) = IO::File->new;
-        $outpart->open($newpart, O_CREAT|O_EXCL|O_WRONLY, 0640)
+        # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+        $outpart->open($newpart, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)
           or die "Can't create file $newpart: $!";
         binmode($outpart) or die "Can't set file $newpart to binmode: $!";
         my($filepath) = $dh->path; my($size) = 0;
@@@@ -22963,7 +22971,8 @@@@
 sub run_command_copy($$$) {
   my($outfile, $ifh, $pid) = @@_;
   my($ofh) = IO::File->new;
-  $ofh->open($outfile, O_CREAT|O_EXCL|O_WRONLY, 0640)  # calls sysopen
+  # O_WRONLY etc. can become tainted in Perl5.8.9 [perlbug #62502]
+  $ofh->open($outfile, untaint(O_CREAT|O_EXCL|O_WRONLY), 0640)  # calls sysopen
     or die "Can't create file $outfile: $!";
   binmode($ofh) or die "Can't set file $outfile to binmode: $!";
   binmode($ifh) or die "Can't set binmode on pipe: $!";
@


1.19
log
@- Do not hardcode pidfile in the rc.d script [1]
- Depend on p5-Mail-DKIM >= 0.33 [2]
- Patch clamscan timeout bug [2]
- REQUIRE: mysql postgresql in rc.d script [2]
- Bump PORTREVISION
- pkg-message nits

PR:		ports/132575 [1], ports/133073 [2]
Submitted by:	Helmut Schneider <jumper99@@gmx.de> [1],
		Michael Scheidell <scheidell@@secnap.net> [2]
@
text
@@


1.18
log
@- Fix config file path
- Fix reload target in the rc script
- Bump PORTREVISION

Reported by:	Florian Smeets <flo@@kasimir.com>,
		Arjo Hooimeijer <arjo.hooimeijer@@xs4all.nl>,
		Michael Scheidell <scheidell@@secnap.net>
@
text
@d86 6
@


1.17
log
@- Fix SQL logging problem [1]
- Remove old dependency [1]
- Add a warning when memdisk is used, because it is unsafe [2]
- Fix on Perl 5.8.9 [3]
- Bump PORTREVISION

PR:		ports/130835 [1], ports/131633 [2]
Submitted by:	Michael Scheidell <scheidell@@secnap.net> [1][2]
@
text
@d2 1
a2 1
+++ amavisd	2009-02-21 20:23:55.000000000 +0100
a27 9
@@@@ -13181,7 +13182,7 @@@@
   Amavis::Lookup::RE->new(@@$Amavis::Conf::map_full_type_to_short_type_re);
 
 # default location of the config file if none specified
-push(@@config_files, '/etc/amavisd.conf')  if !@@config_files;
+push(@@config_files, '/usr/local/etc/amavisd.conf')  if !@@config_files;
 # Read and evaluate config files, which may override default settings
 Amavis::Conf::include_config_files(@@config_files);
 Amavis::Conf::supply_after_defaults();
@


1.16
log
@- Update to 2.6.2 [1]
- Inplace edit Perl path to be ${PERL} [2]

PR:		ports/129670 [1]
Submitted by:	Michael Scheidell <scheidell@@secnap.net> [1]
Requested by:	Andre Luiz dos Santos <andre@@netvision.com.br> [2]
@
text
@d1 134
a134 22
--- amavisd.orig	2008-09-22 11:21:15.000000000 +0200
+++ amavisd	2008-09-22 11:23:53.000000000 +0200
@@@@ -16878,13 +16878,18 @@@@
       $data_command_accepted = $smtp_resp=~/^3/ ? 1 : 0;
       if (!$data_command_accepted) {
         do_log(0,"Negative SMTP resp. to DATA: %s", $smtp_resp);
+	$in_datasend_mode = 0; 
+	$smtp_session->timeout($smtp_rset_timeout); 
+	$what_cmd = 'RSET';  $smtp_handle->rset;  # send a RSET 
       } elsif (!$any_valid_recips) {  # pipelining
         do_log(2,"Too late, DATA accepted but no valid recips, send dummy");
         $which_section = 'fwd-data-contents';
         $smtp_session->timeout(
-          max(60,min($smtp_data_xfer_timeout,$deadline-time)));
+	  max(60,min($smtp_data_done_timeout,$deadline-time))); 
+	$what_cmd = 'data-dot'; 
         $smtp_handle->dataend;  # as required by rfc2920: if the DATA command
                       # was accepted the SMTP client should send a single dot
+	$in_datasend_mode = 0;
       } elsif ($any_tempfail_recips && !$dsn_per_recip_capable) {  # pipelining
         # we must not proceed if mail did not came in as LMTP,
         # or we would generate mail duplicates on each delivery attempt
@


1.15
log
@- Fix modes of the temp directory [1]
- Fix a bug in SMTP handling [2]
- Bump PORTREVISION

PR:		ports/127216 [1]
Submitted by:	Juan J Lopez <jlopez@@evsis.com.ar> [1],
		Matt Emmerton <matt@@gsicomp.on.ca> [2] (via private mail)
Approved by:	portmgr (erwin)
@
text
@@


1.14
log
@Remove empty patch file.

Forgotten by:		erwin
@
text
@d1 22
@


1.13
log
@- Update to 2.4.3
- Remove NEW_MILTER from OPTIONS since it was a circular dependency
- Change description for SQLITE in OPTIONS since it is almost only
  useful for logging
- Change the order of p0f parameters in the rc.d script, because -l
  must be the last command line option [1]
- Add new option so that arguments can be passed to p0f-analyzer.pl
  as well not just for p0f

Submitted by:	Henrik Schack <henrik@@schack.dk> [1],
		gabor (maintainer)
@
text
@@


1.12
log
@Big rework:
- Register some dependencies directly that were installed by another dependencies before
- Add BerkeleyDB to OPTIONS for nanny/cache/snmp, it is not a mandatory dependency any more
- Add SQLite to OPTIONS for lookups/logging/quarantine
- Add SASL to OPTIONS for authentication
- Add SpamAssassin to OPTIONS, it is not a mandatory dependency any more
- Add p0f (passive OS fingerprinting) to OPTIONS and an rc.d script for p0fanalyzer
- Add file to OPTIONS to use ports' file(1) instead of system file(1)
- Add nomarch and cabextract to OPTIONS, they are not mandatory any more
- Provide some alternatives for archiver dependencies (rar/unrar, arj/unar, etc.)
- Cleanup deprecated PLIST_SUB and pkg-plist entries
- Use reinplace editing instead of patches where possible
- Ensure that the config file is installed with proper attributes
- Add some p0f explanation to pkg-message
- Style

PR:		102944
Submitted by:	Gabor Kovesdan <gkovesdan@@t-hosting.hu> (maintainer)
@
text
@a0 40
--- amavisd.old	Fri Aug 18 13:01:43 2006
+++ amavisd	Fri Aug 18 13:01:51 2006
@@@@ -12049,15 +12049,20 @@@@
             my($bounced) = $msginfo->dsn_sent;
             for my $r (@@{$msginfo->per_recip_data}) {
               my($resp) = $r->recip_smtp_response;
-              if ($bounced && $smtp_resp=~/^2/ && $resp!~/^2/) {
-                # as the message was already bounced by us,
-                # MTA must not bounce it again; failure status
-                # needs to be converted into success!
-                $resp = sprintf("250 2.5.0 Ok %s, DSN %s (%s)",
-                        $r->recip_addr, $bounced==1 ? 'sent' : 'muted', $resp);
+              my($recip_quoted) = qquote_rfc2821_local($r->recip_addr);
+              if ($resp=~/^2/) {
+                # success, no need to change status
+              } elsif ($bounced) {
+                # a non-delivery notifications was already sent by us, so
+                # MTA must not bounce it again; turn status into a success
+                $resp = sprintf("250 2.5.0 Ok %s, DSN was sent (%s)",
+                                $recip_quoted, $resp);
+              } elsif ($resp=~/^5/ && $r->recip_destiny != D_REJECT) {
+                $resp = sprintf("250 2.5.0 Ok %s, DSN suppressed (%s)",
+                                $recip_quoted, $resp);
               }
-              do_log(4, 'sending LMTP response for <%s>: "%s"',
-                        $r->recip_addr, $resp);
+              do_log(4, 'sending LMTP response for %s: "%s"',
+                        $recip_quoted, $resp);
               $self->smtp_resp(0, $resp);
             }
           }
@@@@ -15055,6 +15060,8 @@@@
     local_tests_only  => $sa_local_tests_only,
     home_dir_for_helpers => $helpers_home,
     stop_at_threshold => 0,
+    LOCAL_STATE_DIR   => '/var/lib',
+    PREFIX            => '/usr/local',
 #   DEF_RULES_DIR     => '/usr/local/share/spamassassin',
 #   LOCAL_RULES_DIR   => '/etc/mail/spamassassin',
 #see man Mail::SpamAssassin for other options
@


1.11
log
@- Fix a bug when using LMTP transfer
- Make some archiver support optionally

PR:		101071
Submitted by:	gabor (maintainer)
@
text
@d1 2
a2 11
--- amavisd.orig	Tue Jun 27 13:31:56 2006
+++ amavisd	Mon Jul 31 00:44:09 2006
@@@@ -9335,7 +9335,7 @@@@
 Amavis::Conf::build_default_maps();
 
 # default location of the config file if none specified
-push(@@config_files, '/etc/amavisd.conf')  if !@@config_files;
+push(@@config_files, '%%PREFIX%%/etc/amavisd.conf')  if !@@config_files;
 # Read/execute the config file, which may override default settings
 Amavis::Conf::read_config(@@config_files);
 
d32 9
@


1.10
log
@- Update security/amavisd-new to 2.3.0.

PR:		80318
Submitted by:	Blaz Zupan <blaz@@si.FreeBSD.org> (maintainer)
@
text
@d1 3
a3 3
--- amavisd.orig	Mon Apr 25 01:23:32 2005
+++ amavisd	Mon Apr 25 09:53:59 2005
@@@@ -8495,7 +8495,7 @@@@
d12 29
@


1.9
log
@- Update to 2.2.1

PR:		ports/75513
Submitted by:	Blaz Zupan <blaz@@si.FreeBSD.org> (maintainer)
@
text
@d1 4
a4 4
--- amavisd.orig	Thu Dec 23 02:38:39 2004
+++ amavisd	Sun Dec 26 14:06:38 2004
@@@@ -7805,7 +7805,7 @@@@
 umask(0027);
d9 2
a11 2
 # Read config file, which may override default settings
 Amavis::Conf::build_default_maps();
@


1.8
log
@Upgrade to 2.1.2.

PR:		ports/71907
Submitted by:	maintainer
@
text
@d1 4
a4 5
--- amavisd.orig	Mon Sep  6 20:30:58 2004
+++ amavisd	Sun Sep 19 09:43:03 2004
@@@@ -7452,7 +7452,7 @@@@
 $Amavis::Conf::log_recip_templ = $1
   if $Amavis::Conf::log_recip_templ=~/^(.*?)[\r\n]+\z/s;
d6 3
a8 2
-my($config_file) = '/etc/amavisd.conf';  # default location of config file
+my($config_file) = '%%PREFIX%%/etc/amavisd.conf';  # default location of config file
d10 2
a11 2
 # Consider droping privileges early, before reading config file.
 # This is only possible if running under chroot will not be needed.
@


1.7
log
@Update to 2.1.1

PR:		ports/70933
Submitted by:	maintainer
@
text
@d1 3
a3 12
--- amavisd.orig	Tue Aug 24 16:25:52 2004
+++ amavisd	Wed Aug 25 17:54:10 2004
@@@@ -371,7 +371,7 @@@@
   !defined($var) ? [] : !ref($var) ? [$var] : $var;
 }

-$myversion = 'amavisd-new-2.1.0';
+$myversion = 'amavisd-new-2.1.1';

 $eol = "\n";  # native record separator in files: LF or CRLF or even CR
 $unicode_aware = $]>=5.008 && length("\x{263a}")==1 && eval { require Encode };
@@@@ -7409,7 +7409,7 @@@@
@


1.6
log
@- update amavisd-new to 20040701
- add dependency on cabextract and rpm2cpio.pl
- add menu used to add required dependencies
  for MySQL, PostgreSQL and LDAP support
- add warning when running under perl version below 5.8.2
- remove taint checks when running perl 5.00503
- (hopefully) fix chroot support by running amavisd with -u
  instead of using "su"
- mention other virus scanners available in the ports collection
  in the startup message

PR:		ports/68732
Submitted by:	maintainer
@
text
@d1 12
a12 3
--- amavisd.orig	Sun Jul  4 03:19:35 2004
+++ amavisd	Sun Jul  4 11:28:36 2004
@@@@ -7367,7 +7367,7 @@@@
@


1.5
log
@update to 20030616.p9

PR:		65120
Submitted by:	Blaz Zupan <blaz.zupan@@amis.net>
@
text
@d1 5
a5 5
--- amavisd.orig	Fri Apr  2 21:33:50 2004
+++ amavisd	Sat Apr  3 12:29:41 2004
@@@@ -6461,7 +6461,7 @@@@
 my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0);
 $amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint
d9 3
a11 3
 if (@@ARGV >= 2 && $ARGV[0] eq '-c') {    # override by command line option -c
     shift @@ARGV; $config_file = shift @@ARGV;
     $config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint
@


1.4
log
@- fix dependencies for modules already included in perl 5.8 (PR 64374)
- remove dependency on Carp::Heavy module which is not available with
  stock FreeBSD 4.9 perl
- add official post -p8 buglet fixes which will be included in -p9
- add size information to distinfo
- bump portrevision

PR:		ports/64589
Submitted by:	Blaz Zupan <blaz.zupan@@amis.net> (maintainer)
@
text
@d1 4
a4 32
--- amavisd.orig	Tue Mar  9 03:21:43 2004
+++ amavisd	Mon Mar 22 20:26:59 2004
@@@@ -109,7 +109,7 @@@@
 
 BEGIN {
     fetch_modules('REQUIRED BASIC MODULES', 1, qw(
-	Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy Time::HiRes
+	Exporter POSIX Fcntl Socket Errno Carp Time::HiRes
 	IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
 	IO::Handle IO::Wrap IO::Stringy
 	Digest::MD5 Unix::Syslog File::Basename File::Copy
@@@@ -5358,7 +5358,8 @@@@
 		}
 		section_time('parts'); prolong_timer('decoding');
 	    }
-	    if ($any_undecipherable) {  # test if undecipherables are banned
+	    if ($any_undecipherable && $banned_filename_re) { 
+		# test if undecipherables are banned
 		my($rn) = 'UNDECIPHERABLE';
 		my($result,$patt) = $banned_filename_re->lookup_re($rn);
 		if ($result) {
@@@@ -5920,7 +5921,7 @@@@
 		$s = $undecipherable_subject_tag;
 		do_log(3,"adding $undecipherable_subject_tag, $any_undecipherable, $hold");
 	    }
-	    $s .= $sa_spam_subject_tag;
+	    $s .= $sa_spam_subject_tag if $do_subj;
 	    my($entity) = $msginfo->mime_entity;
 	    if (defined $entity && defined $entity->head->get('Subject',0)) {
 		$hdr_edits->edit_header('Subject',
@@@@ -6420,7 +6421,7 @@@@
 local($1);
d11 1
a11 1
     local($1);
@


1.3
log
@1) Update security/amavisd-new to amavisd-new-20030616-p6.
2) Incorporate changes from PR 57382:
   - add rc.subr support
   - cleanup sed variable replacement scripts
   - add pointer to Clam Antivirus to installation message
  PR 57382 was closed by mistake, I thought the contents
  have already been commited, while they were not.

PR:		59323
Submitted by:	milter@@free.fr (1)
Submitted by:	Martin Matuska <martin@@tradex.sk> (2)
Approved by:	MAINTAINER
@
text
@d1 32
a32 4
--- amavisd.orig	Mon Nov 10 01:22:13 2003
+++ amavisd	Tue Nov 11 22:42:47 2003
@@@@ -6279,7 +6279,7 @@@@
 my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0);
d39 1
a39 1
     $config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint
@


1.2
log
@- update amavisd-new to 20030616.p5.
- fix dependency on devel/p5-IO, which should only be used when
  perl older than 5.6.1 is installed.
- enable cpio for extraction of tar archives, which uses much less
  memory than Archive::Tar (suggested by amavisd-new author)

PR:		56013
Submitted by:	Blaz Zupan <blaz.zupan@@amis.net>
@
text
@d1 3
a3 12
--- amavisd.orig	Mon Aug 25 18:07:56 2003
+++ amavisd	Mon Aug 25 20:47:40 2003
@@@@ -3903,7 +3903,7 @@@@
 	/^\.lzo$/  && defined $lzop
 	    && return do_uncompress($part,$tempdir,"$lzop -d -c");
 	/^\.cpio$/ && defined $cpio && return do_cpio($part,$tempdir);
-#	/^\.tar$/  && defined $cpio && return do_cpio($part,$tempdir);
+	/^\.tar$/  && defined $cpio && return do_cpio($part,$tempdir);
 	/^\.tar$/  && return do_tar($part,$tempdir);  # fallback
 	/^\.zip$/  && return do_unzip($part,0,$tempdir);
 	/^\.rar$/  && return do_unrar($part,0,$tempdir);
@@@@ -6260,7 +6260,7 @@@@
@


1.1
log
@MAINTAINER UPDATE: security/amavisd-new

	Fixes for amavisd-new port:
	- add missing dependency on devel/p5-IO
	- install amavisdconf utility
	- bump portrevision

PR:		ports/48984
Submitted by:	Blaz Zupan <blaz@@si.FreeBSD.org>
@
text
@d1 14
a14 5
--- amavisd.orig	Fri Jan 10 22:03:39 2003
+++ amavisd	Thu Mar  6 21:18:38 2003
@@@@ -5070,7 +5070,7 @@@@
 my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)]);
 $amavisd_path = $1  if $amavisd_path =~ m{^([A-Za-z0-9/._=+-]+)$};    # untaint
d20 1
a20 1
     $config_file = $1  if $config_file =~ m{^([A-Za-z0-9/._=+-]+)$};  # untaint
@

