From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 5 19:50:20 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 5A46416A416 for ; Sun, 5 Nov 2006 19:50:20 +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 4CDFF43D53 for ; Sun, 5 Nov 2006 19:50:19 +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 kA5JoJTW013919 for ; Sun, 5 Nov 2006 19:50:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kA5JoJiu013917; Sun, 5 Nov 2006 19:50:19 GMT (envelope-from gnats) Resent-Date: Sun, 5 Nov 2006 19:50:19 GMT Resent-Message-Id: <200611051950.kA5JoJiu013917@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 2A04B16A47C for ; Sun, 5 Nov 2006 19:41:29 +0000 (UTC) (envelope-from umq@ueo.co.jp) Received: from mvs9tmp.plala.or.jp (mvs9.plala.or.jp [58.93.247.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9091143D6A for ; Sun, 5 Nov 2006 19:41:22 +0000 (GMT) (envelope-from umq@ueo.co.jp) Received: from eupheme.kaumoge.org ([125.205.176.135]) by mvs9tmp.plala.or.jp with ESMTP id <20061105194120.OPKR19942.mvs9tmp.plala.or.jp@eupheme.kaumoge.org> for ; Mon, 6 Nov 2006 04:41:20 +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 kA5Jfg8A061870 for ; Mon, 6 Nov 2006 04:41:42 +0900 (JST) (envelope-from umq@ueo.co.jp) Message-Id: <867iy9bs0v.wl%umq@ueo.co.jp> Date: Mon, 06 Nov 2006 04:41:20 +0900 From: Hirohisa Yamaguchi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105185: [maintainer] mail/dkim-milter wants some fixes 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: Sun, 05 Nov 2006 19:50:20 -0000 >Number: 105185 >Category: ports >Synopsis: [maintainer] mail/dkim-milter some fixes >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: Sun Nov 05 19:50:18 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 #3: Thu Oct 5 06:52:38 JST 2006 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64 >Description: 1) change COMMENT resembling to mail/dk-milter 2) rename gentxt as mail/dk-milter installs it in the same location 3) do not install libar 4) new option to make it run as a DomainKeys verifier as well. # 1, 2, and 3 were pointed by ache. >How-To-Repeat: N/A >Fix: the patch follows diff -Nrpub ports.orig/mail/dkim-milter/Makefile ports/mail/dkim-milter/Makefile --- ports.orig/mail/dkim-milter/Makefile Mon Oct 2 00:06:48 2006 +++ ports/mail/dkim-milter/Makefile Mon Nov 6 04:26:29 2006 @@ -14,12 +14,13 @@ PORTNAME= dkim-milter PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= umq@ueo.co.jp -COMMENT= Domainkeys milter for Sendmail +COMMENT= Domainkeys Identified Mail (DKIM) milter USE_RC_SUBR= milter-dkim.sh @@ -46,7 +47,7 @@ SENDMAIL_MILTER_PORT?= sendmail SUB_FILES= milter-dkim.sh WCONF= ${WRKSRC}/devtools/Site MAN8= dkim-filter.8 -PLIST_FILES= lib/libar.a libexec/dkim-filter sbin/gentxt +PLIST_FILES= libexec/dkim-filter sbin/gentxt-dkim PORTDOCS= FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \ autorespond.csh @@ -64,13 +65,27 @@ SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/ SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}" .endif -.if defined(SENDMAIL_WITHOUT_MILTER) +.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS) +LIBDK_PORT= mail/dk-milter +BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch +DKMILTER_DISTNAME!= cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V DISTNAME +LIBDK_PATH= ${PORTSDIR}/${LIBDK_PORT}/work/${DKMILTER_DISTNAME}/libdk +.endif + pre-fetch: +.if defined(SENDMAIL_WITHOUT_MILTER) @${ECHO_MSG} @${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER, @${ECHO_MSG} and rebuild sendmail in the ports @${FALSE} .endif + @${ECHO_MSG} + @${ECHO_MSG} "dkim-milter has the following tunable option(s):" + @${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes Verify DomainKeys using dk-milter's libdk" + @${ECHO_MSG} " SENDMAIL_MILTER_IN_BASE=yes Build to run with base sendmail" + @${ECHO_MSG} " WITH_POSTFIX=yes Build to run with postfix port" + @${ECHO_MSG} + @sleep 5 post-extract: @${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC} @@ -85,10 +100,18 @@ post-patch: -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${SITE} > ${WCONF}/site.config.m4 +.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS) + @${REINPLACE_CMD} -e "/bldPUSH_SMLIB(\`dk')/s|^dnl ||" \ + -e "/-I\.\.\/libdk\//s|^dnl ||" \ + -e '/-D_FFR_VERIFY_DOMAINKEYS/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/Makefile.m4 + ${LN} -s ${LIBDK_PATH} ${WRKSRC}/ +.endif + post-install: @${STRIP_CMD} ${PREFIX}/libexec/dkim-filter ${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \ - ${PREFIX}/sbin/gentxt + ${PREFIX}/sbin/gentxt-dkim .for i in ${MAN8} @${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz ${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/ diff -Nrpub ports.orig/mail/dkim-milter/files/patch-libar-Makefile.m4 ports/mail/dkim-milter/files/patch-libar-Makefile.m4 --- ports.orig/mail/dkim-milter/files/patch-libar-Makefile.m4 Thu Jan 1 09:00:00 1970 +++ ports/mail/dkim-milter/files/patch-libar-Makefile.m4 Mon Nov 6 00:35:45 2006 @@ -0,0 +1,10 @@ +--- ./libar/Makefile.m4.orig Sun Sep 17 08:00:43 2006 ++++ ./libar/Makefile.m4 Mon Nov 6 00:28:03 2006 +@@ -12,7 +12,6 @@ + + bldPRODUCT_START(`library', `libar') + define(`bldSOURCES', `ar.c manual.c ') +-define(`bldINSTALLABLE', `true') + bldPRODUCT_END + + bldPRODUCT_START(`manpage', `ar') >Release-Note: >Audit-Trail: >Unformatted: