From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 29 07:40:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A39916A416 for ; Fri, 29 Sep 2006 07:40:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07C9143D46 for ; Fri, 29 Sep 2006 07:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8T7eEYR054183 for ; Fri, 29 Sep 2006 07:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8T7eETN054182; Fri, 29 Sep 2006 07:40:14 GMT (envelope-from gnats) Resent-Date: Fri, 29 Sep 2006 07:40:14 GMT Resent-Message-Id: <200609290740.k8T7eETN054182@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hirohisa Yamaguchi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9351316A53C for ; Fri, 29 Sep 2006 07:37:48 +0000 (UTC) (envelope-from umq@ueo.co.jp) Received: from mvs1.plala.or.jp (mvs1.plala.or.jp [58.93.247.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A89243D62 for ; Fri, 29 Sep 2006 07:37:43 +0000 (GMT) (envelope-from umq@ueo.co.jp) Received: from eupheme.kaumoge.org ([125.205.176.135]) by mvs1.plala.or.jp with ESMTP id <20060929073742.QCTM21584.mvs1.plala.or.jp@eupheme.kaumoge.org> for ; Fri, 29 Sep 2006 16:37:42 +0900 Received: from calliope.kaumoge.org (calliope.kaumoge.org [192.168.24.120]) by eupheme.kaumoge.org (8.12.11/8.12.11/20030713) with ESMTP id k8T7c4PQ018012 for ; Fri, 29 Sep 2006 16:38:04 +0900 (JST) (envelope-from umq@ueo.co.jp) Message-Id: <867iznazsp.wl%umq@ueo.co.jp> Date: Fri, 29 Sep 2006 16:37:42 +0900 From: Hirohisa Yamaguchi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103802: [maintainer][patch] mail/dkim-milter multiple instantiation does not work when run from /etc/rc X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Sep 2006 07:40:16 -0000 >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: >Environment: System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Fri Sep 1 13:15:27 JST 2006 root@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 + +# .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: