Attachment #94840 for bug #133073

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

Lines 9-15 Link Here

(-)./Makefile (-3 / +7 lines)
9	PORTNAME= amavisd-new	9	PORTNAME= amavisd-new
10	PORTVERSION= 2.6.2	10	PORTVERSION= 2.6.2
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	PORTREVISION= 2	12	PORTREVISION= 3
13	CATEGORIES= security	13	CATEGORIES= security
14	MASTER_SITES= http://www.ijs.si/software/amavisd/ \	14	MASTER_SITES= http://www.ijs.si/software/amavisd/ \
15	http://mirrors.catpipe.net/amavisd-new/ \	15	http://mirrors.catpipe.net/amavisd-new/ \
Lines 29-35 Link Here
29	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \	29	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
30	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \	30	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
31	p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \	31	p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \
32	p5-Mail-DKIM>=0.31:${PORTSDIR}/mail/p5-Mail-DKIM	32	p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM
33		33
34	USE_PERL5_RUN= 5.8.2+	34	USE_PERL5_RUN= 5.8.2+
35	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes
Lines 291-297 Link Here
291	.endfor	291	.endfor
292	@${CP} -pr ${WRKSRC}/README_FILES/images/ ${DOCSDIR}/images	292	@${CP} -pr ${WRKSRC}/README_FILES/images/ ${DOCSDIR}/images
293	.endif	293	.endif
294		294	.if defined(WITH_MYSQL)
		295	@${REINPLACE_CMD} -e "/^# REQUIRE: LOGIN/s/LOGIN/LOGIN mysql/" ${WRKDIR}/amavisd.sh
		296	.elif defined(WITH_PGSQL)
		297	@${REINPLACE_CMD} -e "/^# REQUIRE: LOGIN/s/LOGIN/LOGIN postgresql/" ${WRKDIR}/amavisd.sh
		298	.endif
295	post-install:	299	post-install:
296	${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue	300	${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue
297	@${CAT} ${PKGMESSAGE}	301	@${CAT} ${PKGMESSAGE}

Lines 83-88 Link Here

(-)./files/patch-amavisd (+6 lines)
83	my($subj) = $msginfo->get_header_field_body('subject');	83	my($subj) = $msginfo->get_header_field_body('subject');
84	my($from) = $msginfo->get_header_field_body('from'); # raw full field	84	my($from) = $msginfo->get_header_field_body('from'); # raw full field
85	my($rfc2822_from) = $msginfo->rfc2822_from; # undef, scalar or listref	85	my($rfc2822_from) = $msginfo->rfc2822_from; # undef, scalar or listref
		86	@@ -19993,4 +19993,5 @@
		87	1;
		88	} or do { $eval_stat = $@ ne '' ? $@ : "errno=$!" };
		89	+ prolong_timer('ask_daemon_internal', $deadline-time);
		90	last if $eval_stat eq ''; # mission accomplished
		91	# error handling (most interesting error codes are EPIPE and ENOTCONN)
86	@@ -21931,7 +21936,8 @@	92	@@ -21931,7 +21936,8 @@
87	$part->base_name, $err_nm[$sts], $sts);	93	$part->base_name, $err_nm[$sts], $sts);
88	my($newpart) = $newpart_obj->full_name;	94	my($newpart) = $newpart_obj->full_name;

Return to bug 133073