ports/103802: [maintainer][patch] mail/dkim-milter multiple instantiation does not work when run from /etc/rc

Hirohisa Yamaguchi umq at ueo.co.jp
Fri Sep 29 07:40:16 UTC 2006


>Number:         103802
>Category:       ports
>Synopsis:       [maintainer][patch] mail/dkim-milter multiple instantiation does not work when run from /etc/rc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 29 07:40:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Fri Sep 1 13:15:27 JST 2006 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64


>Description:
	When setting up mail/dkim-milter to run multiple instance
	then do not start up after reboot.

>How-To-Repeat:
	1. setup mail/dkim-milter to run multiple instance.
	2. reboot.
>Fix:

	the patch follows:
	+ fix starting up multiple instance.
	+ fix RUN_DEPENDS does not work correctly by mistake.
	+ support mail/postfix-current like security/amavisd-milter port does.

diff -Npru ports.orig/mail/dkim-milter/Makefile ports/mail/dkim-milter/Makefile
--- ports.orig/mail/dkim-milter/Makefile	Mon Sep 25 02:01:15 2006
+++ ports/mail/dkim-milter/Makefile	Fri Sep 29 15:12:13 2006
@@ -23,10 +23,15 @@ COMMENT=	Domainkeys milter for Sendmail
 
 USE_RC_SUBR=	milter-dkim.sh
 
-.if defined(WITH_POSTFIX_MILTER)
+.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)
@@ -51,6 +56,13 @@ SITE+=		${FILESDIR}/site.config.m4.milte
 .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:
diff -Npru ports.orig/mail/dkim-milter/files/milter-dkim.sh.in ports/mail/dkim-milter/files/milter-dkim.sh.in
--- ports.orig/mail/dkim-milter/files/milter-dkim.sh.in	Mon Sep 25 02:01:15 2006
+++ ports/mail/dkim-milter/files/milter-dkim.sh.in	Fri Sep 29 13:55:13 2006
@@ -76,7 +76,7 @@ else
 	if [ "x$1" != "xrestart" ]; then
 	    for profile in ${milterdkim_profiles}; do
 		echo "===> milterdkim profile: ${profile}"
-		$0 $1 ${profile}
+		%%RC_SCRIPT%% $1 ${profile}
 		retcode="$?"
 		if [ "0${retcode}" -ne 0 ]; then
 		    failed="${profile} (${retcode}) ${failed:-}"
diff -Npru ports.orig/mail/dkim-milter/pkg-message.postfix ports/mail/dkim-milter/pkg-message.postfix
--- ports.orig/mail/dkim-milter/pkg-message.postfix	Mon Sep 25 02:01:15 2006
+++ ports/mail/dkim-milter/pkg-message.postfix	Fri Sep 29 15:18:53 2006
@@ -10,7 +10,6 @@ your /etc/rc.conf.
 Extra options can be found in startup script.
 
 Note: milter sockets must be accessible from postfix/smtpd;
-  setting milterdkim_user appropriate or using inet sockets might be
-  required.
+  using inet sockets might be preferred.
 
 ************************************************************************
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list