Attachment #71236 for bug #103802

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





USE_RC_SUBR=	milter-dkim.sh

.if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
SENDMAIL_MILTER_IN_BASE=	yes
RUN_DEPENDS+=	postfix>=2[3-9]*:${PORTSDIR}/mail/postfix
PKGMESSAGE=	pkg-message.postfix

.if defined(WITH_POSTFIX_CURRENT)
RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
.else
RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
.endif
.endif

.if !defined(SENDMAIL_MILTER_IN_BASE)

.endif

.include <bsd.port.pre.mk>

# .sh suffix is stripped in recent releases.
.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}"
.else
SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}"
.endif

.if defined(SENDMAIL_WITHOUT_MILTER)
pre-fetch:

Lines 76-82 else Link Here

(-)ports/mail/dkim-milter/files/milter-dkim.sh.in (-1 / +1 lines)
76	if [ "x$1" != "xrestart" ]; then	76	if [ "x$1" != "xrestart" ]; then
77	for profile in ${milterdkim_profiles}; do	77	for profile in ${milterdkim_profiles}; do
78	echo "===> milterdkim profile: ${profile}"	78	echo "===> milterdkim profile: ${profile}"
79	$0 $1 ${profile}	79	%%RC_SCRIPT%% $1 ${profile}
80	retcode="$?"	80	retcode="$?"
81	if [ "0${retcode}" -ne 0 ]; then	81	if [ "0${retcode}" -ne 0 ]; then
82	failed="${profile} (${retcode}) ${failed:-}"	82	failed="${profile} (${retcode}) ${failed:-}"

Lines 10-16 your /etc/rc.conf. Link Here

(-)ports/mail/dkim-milter/pkg-message.postfix (-2 / +1 lines)
10	Extra options can be found in startup script.	10	Extra options can be found in startup script.
11		11
12	Note: milter sockets must be accessible from postfix/smtpd;	12	Note: milter sockets must be accessible from postfix/smtpd;
13	setting milterdkim_user appropriate or using inet sockets might be	13	using inet sockets might be preferred.
14	required.
15		14
16	************************************************************************	15	************************************************************************

Return to bug 103802

Lines 23-32 COMMENT= Domainkeys milter for Sendmail Link Here

(-)ports/mail/dkim-milter/Makefile (-2 / +14 lines)
23		23
24	USE_RC_SUBR= milter-dkim.sh	24	USE_RC_SUBR= milter-dkim.sh
25		25
26	.if defined(WITH_POSTFIX_MILTER)	26	.if defined(WITH_POSTFIX_MILTER) \|\| defined(WITH_POSTFIX) \|\| defined(WITH_POSTFIX_CURRENT)
27	SENDMAIL_MILTER_IN_BASE= yes	27	SENDMAIL_MILTER_IN_BASE= yes
28	RUN_DEPENDS+= postfix>=2[3-9]*:${PORTSDIR}/mail/postfix
29	PKGMESSAGE= pkg-message.postfix	28	PKGMESSAGE= pkg-message.postfix
		29
		30	.if defined(WITH_POSTFIX_CURRENT)
		31	RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
		32	.else
		33	RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
		34	.endif
30	.endif	35	.endif
31		36
32	.if !defined(SENDMAIL_MILTER_IN_BASE)	37	.if !defined(SENDMAIL_MILTER_IN_BASE)
Lines 51-56 SITE+= ${FILESDIR}/site.config.m4.milte Link Here
51	.endif	56	.endif
52		57
53	.include <bsd.port.pre.mk>	58	.include <bsd.port.pre.mk>
		59
		60	# .sh suffix is stripped in recent releases.
		61	.if (${OSVERSION} >= 700007 \|\| ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
		62	SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}"
		63	.else
		64	SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}"
		65	.endif
54		66
55	.if defined(SENDMAIL_WITHOUT_MILTER)	67	.if defined(SENDMAIL_WITHOUT_MILTER)
56	pre-fetch:	68	pre-fetch: