diff options
| author | gabor <gabor@FreeBSD.org> | 2008-12-26 10:29:00 +0800 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2008-12-26 10:29:00 +0800 |
| commit | bfad40463918fcc6330336382ea98bf6bf29fafd (patch) | |
| tree | aa28b81ab6dc520fe35013f611ab23735be06f3c | |
| parent | b29cc595731b125059498f67b54de435d7490d18 (diff) | |
| download | freebsd-ports-gnome-bfad40463918fcc6330336382ea98bf6bf29fafd.tar.gz freebsd-ports-gnome-bfad40463918fcc6330336382ea98bf6bf29fafd.tar.zst freebsd-ports-gnome-bfad40463918fcc6330336382ea98bf6bf29fafd.zip | |
- 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]
| -rw-r--r-- | security/amavisd-new/Makefile | 6 | ||||
| -rw-r--r-- | security/amavisd-new/distinfo | 6 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 22 |
3 files changed, 6 insertions, 28 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 06fdd3739f19..3008a6185cd2 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -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/ \ @@ -245,7 +244,8 @@ post-patch: ${WRKSRC}/amavisd-release @${REINPLACE_CMD} "s|#define HAVE_MKTEMP|#undef HAVE_MKTEMP|" \ ${WRKSRC}/helper-progs/config.h.in - @${REINPLACE_CMD} "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \ + @${REINPLACE_CMD} -e "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \ + -e "s|/usr/bin/perl|${PERL}|" \ ${WRKSRC}/amavisd .if defined(AMAVIS_NOAMAVIS) diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index 1cd21207b651..36e4cd685185 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -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 --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd deleted file mode 100644 index ebfb0f575764..000000000000 --- a/security/amavisd-new/files/patch-amavisd +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 |