Attachment 92093 Details for Bug 129670 – file.diff

[patch] file.diff

file.diff (text/plain), 2.50 KB, created by Michael Scheidell on 2008-12-16 03:20:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scheidell

Created: 2008-12-16 03:20:04 UTC

Size: 2.50 KB

patch

obsolete

>diff -bBru /var/tmp/amavisd261 ./
>diff -bBru /var/tmp/amavisd261/Makefile ./Makefile
>--- /var/tmp/amavisd261/Makefile        2008-09-22 05:30:48.000000000 -0400
>+++ ./Makefile  2008-12-15 13:18:57.000000000 -0500
>@@ -7,8 +7,7 @@
> # Based on amavisd ports makefile.
> 
> PORTNAME=      amavisd-new
>-PORTVERSION=   2.6.1
>-PORTREVISION=  1
>+PORTVERSION=   2.6.2
> PORTEPOCH=     1
> CATEGORIES=    security
> MASTER_SITES=  http://www.ijs.si/software/amavisd/ \
>diff -bBru /var/tmp/amavisd261/distinfo ./distinfo
>--- /var/tmp/amavisd261/distinfo        2008-07-12 12:34:08.000000000 -0400
>+++ ./distinfo  2008-12-15 13:20:36.000000000 -0500
>@@ -1,3 +1,3 @@
>-MD5 (amavisd-new-2.6.1.tar.gz) = 2474d4c034f96a58e5b8af91af514689
>-SHA256 (amavisd-new-2.6.1.tar.gz) = 4c98786e4b694459f6bac42413cd34b7d0165763b908b3234d5407126fb3b13d
>-SIZE (amavisd-new-2.6.1.tar.gz) = 911740
>+MD5 (amavisd-new-2.6.2.tar.gz) = 0b3b0ef8771af8e4a950e7381d42adbd
>+SHA256 (amavisd-new-2.6.2.tar.gz) = bf5a04617081a210917809f7eb640f3112f030e772adcba66952174b37423517
>+SIZE (amavisd-new-2.6.2.tar.gz) = 903818
>diff -bBru /var/tmp/amavisd261/files/patch-amavisd ./files/patch-amavisd
>--- /var/tmp/amavisd261/files/patch-amavisd     2008-09-22 05:30:48.000000000 -0400
>+++ ./files/patch-amavisd       2008-12-15 13:27:56.000000000 -0500
>@@ -1,22 +1 @@
>---- 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
>+

Actions: View | Diff

Attachments on bug 129670: 92093