Attachment #68830 for bug #101071

View | Details | Raw Unified | Return to bug 101071
Collapse All | Expand All





PORTNAME=	amavisd-new
PORTVERSION=	2.4.2
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	security
MASTER_SITES=	http://www.ijs.si/software/amavisd/ \

		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
		${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
		${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
		${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze \
		${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha \
		${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop \
		${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj \
		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
		${LOCALBASE}/bin/unzoo:${PORTSDIR}/archivers/unzoo \
		${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract \
		${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio


OPTIONS=	MYSQL	"MySQL support"		off \
		PGSQL	"PgSQL support"		off \
		LDAP	"LDAP support"		off \
		MILTER	"sendmail milter support" on \
		RAR	"rar support"	on \
		ARJ	"arj support"	on \
		LHA	"lha support"	on \
		ARC	"arc support"	on \
		ZOO	"zoo support with zoo archiver"	on \
		UNZOO	"zoo support with unzoo archiver"	off \
		LZOP	"lzop support"	on \
		FREEZE	"freeze support"	on

SUB_FILES=	pkg-install pkg-deinstall pkg-message


RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
.endif

.if defined(WITH_RAR)
RUN_DEPENDS+=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
.endif

.if defined(WITH_ARJ)
RUN_DEPENDS+=	${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj
.endif

.if defined(WITH_LHA)
RUN_DEPENDS+=	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
.endif

.if defined(WITH_ARC)
RUN_DEPENDS+=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc
.endif

.if defined(WITH_ZOO)
RUN_DEPENDS+=	${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
.endif

.if defined(WITH_ZOO)
RUN_DEPENDS+=	${LOCALBASE}/bin/unzoo:${PORTSDIR}/archivers/unzoo
.endif

.if defined(WITH_LZOP)
RUN_DEPENDS+=	${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop
.endif

.if defined(WITH_FREEZE)
RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
.endif

post-patch:
.for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release
	@${REINPLACE_CMD} ${SED_SCRIPT} -e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}




--- 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

 # Read/execute the config file, which may override default settings
 Amavis::Conf::read_config(@config_files);
 
@@ -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);
             }
           }

Return to bug 101071

Lines 8-13 Link Here

(-)Makefile (-8 / +42 lines)
8		8
9	PORTNAME= amavisd-new	9	PORTNAME= amavisd-new
10	PORTVERSION= 2.4.2	10	PORTVERSION= 2.4.2
		11	PORTREVISION= 1
11	PORTEPOCH= 1	12	PORTEPOCH= 1
12	CATEGORIES= security	13	CATEGORIES= security
13	MASTER_SITES= http://www.ijs.si/software/amavisd/ \	14	MASTER_SITES= http://www.ijs.si/software/amavisd/ \
Lines 31-43 Link Here
31	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \	32	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
32	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin \	33	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
33	${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \	34	${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
34	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
35	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze \
36	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha \
37	${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop \
38	${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj \
39	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
40	${LOCALBASE}/bin/unzoo:${PORTSDIR}/archivers/unzoo \
41	${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract \	35	${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract \
42	${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio	36	${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
43		37
Lines 53-59 Link Here
53	OPTIONS= MYSQL "MySQL support" off \	47	OPTIONS= MYSQL "MySQL support" off \
54	PGSQL "PgSQL support" off \	48	PGSQL "PgSQL support" off \
55	LDAP "LDAP support" off \	49	LDAP "LDAP support" off \
56	MILTER "sendmail milter support" on	50	MILTER "sendmail milter support" on \
		51	RAR "rar support" on \
		52	ARJ "arj support" on \
		53	LHA "lha support" on \
		54	ARC "arc support" on \
		55	ZOO "zoo support with zoo archiver" on \
		56	UNZOO "zoo support with unzoo archiver" off \
		57	LZOP "lzop support" on \
		58	FREEZE "freeze support" on
57		59
58	SUB_FILES= pkg-install pkg-deinstall pkg-message	60	SUB_FILES= pkg-install pkg-deinstall pkg-message
59		61
Lines 106-111 Link Here
106	RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap	108	RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
107	.endif	109	.endif
108		110
		111	.if defined(WITH_RAR)
		112	RUN_DEPENDS+= ${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
		113	.endif
		114
		115	.if defined(WITH_ARJ)
		116	RUN_DEPENDS+= ${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj
		117	.endif
		118
		119	.if defined(WITH_LHA)
		120	RUN_DEPENDS+= ${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
		121	.endif
		122
		123	.if defined(WITH_ARC)
		124	RUN_DEPENDS+= ${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc
		125	.endif
		126
		127	.if defined(WITH_ZOO)
		128	RUN_DEPENDS+= ${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
		129	.endif
		130
		131	.if defined(WITH_ZOO)
		132	RUN_DEPENDS+= ${LOCALBASE}/bin/unzoo:${PORTSDIR}/archivers/unzoo
		133	.endif
		134
		135	.if defined(WITH_LZOP)
		136	RUN_DEPENDS+= ${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop
		137	.endif
		138
		139	.if defined(WITH_FREEZE)
		140	RUN_DEPENDS+= ${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
		141	.endif
		142
109	post-patch:	143	post-patch:
110	.for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release	144	.for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release
111	@${REINPLACE_CMD} ${SED_SCRIPT} -e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}	145	@${REINPLACE_CMD} ${SED_SCRIPT} -e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}

Lines 1-6 Link Here

(-)files/patch-amavisd (-3 / +32 lines)
1	--- amavisd.orig Mon Apr 25 01:23:32 2005	1	--- amavisd.orig Tue Jun 27 13:31:56 2006
2	+++ amavisd Mon Apr 25 09:53:59 2005	2	+++ amavisd Mon Jul 31 00:44:09 2006
3	@@ -8495,7 +8495,7 @@	3	@@ -9335,7 +9335,7 @@
4	Amavis::Conf::build_default_maps();	4	Amavis::Conf::build_default_maps();
5		5
6	# default location of the config file if none specified	6	# default location of the config file if none specified
Lines 9-11 Link Here
9	# Read/execute the config file, which may override default settings	9	# Read/execute the config file, which may override default settings
10	Amavis::Conf::read_config(@config_files);	10	Amavis::Conf::read_config(@config_files);
11		11
		12	@@ -12049,15 +12049,20 @@
		13	my($bounced) = $msginfo->dsn_sent;
		14	for my $r (@{$msginfo->per_recip_data}) {
		15	my($resp) = $r->recip_smtp_response;
		16	- if ($bounced && $smtp_resp=~/^2/ && $resp!~/^2/) {
		17	- # as the message was already bounced by us,
		18	- # MTA must not bounce it again; failure status
		19	- # needs to be converted into success!
		20	- $resp = sprintf("250 2.5.0 Ok %s, DSN %s (%s)",
		21	- $r->recip_addr, $bounced==1 ? 'sent' : 'muted', $resp);
		22	+ my($recip_quoted) = qquote_rfc2821_local($r->recip_addr);
		23	+ if ($resp=~/^2/) {
		24	+ # success, no need to change status
		25	+ } elsif ($bounced) {
		26	+ # a non-delivery notifications was already sent by us, so
		27	+ # MTA must not bounce it again; turn status into a success
		28	+ $resp = sprintf("250 2.5.0 Ok %s, DSN was sent (%s)",
		29	+ $recip_quoted, $resp);
		30	+ } elsif ($resp=~/^5/ && $r->recip_destiny != D_REJECT) {
		31	+ $resp = sprintf("250 2.5.0 Ok %s, DSN suppressed (%s)",
		32	+ $recip_quoted, $resp);
		33	}
		34	- do_log(4, 'sending LMTP response for <%s>: "%s"',
		35	- $r->recip_addr, $resp);
		36	+ do_log(4, 'sending LMTP response for %s: "%s"',
		37	+ $recip_quoted, $resp);
		38	$self->smtp_resp(0, $resp);
		39	}
		40	}