Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 May 2007 18:41:21 +0900
From:      Hirohisa Yamaguchi <umq@ueo.co.jp>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/112854: [maintainer] mail/dkim-milter update to 0.8.1
Message-ID:  <86sl9pry9q.wl%umq@ueo.co.jp>
Resent-Message-ID: <200705220950.l4M9o4Gi099026@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         112854
>Category:       ports
>Synopsis:       [maintainer] mail/dkim-milter update to 0.8.1
>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:   Tue May 22 09:50:03 GMT 2007
>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 #5: Sun Apr 8 16:30:19 JST 2007 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64


	<machine, os, target, libraries (multiple lines)>
>Description:
	The new version of dkim-milter 0.8.1 has been released.
	Release notes: https://sourceforge.net/project/shownotes.php?release_id=509268

	** this patch supersedes ports/112763
>How-To-Repeat:
	N/A
>Fix:

	The patch follows

	deleted:
	 files/patch-dkim-filter-Makefile.m4
	 files/patch-libdkim-Makefile.m4

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile	27 Apr 2007 07:38:41 -0000	1.22
+++ Makefile	22 May 2007 09:31:33 -0000
@@ -13,7 +13,7 @@
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	0.6.6
+PORTVERSION=	0.8.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -43,12 +43,21 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilt
 .endif
 .endif
 
+.if defined(WITH_SENDMAIL_STATIC_MILTER) || !defined(SENDMAIL_WITH_SHARED_MILTER)
+SITE+=		-e '\|-static|s|%%STATIC%%||g'
+.else
+SITE+=		-e '\|-static|s|%%STATIC%%|dnl |g'
+.endif
+
 SENDMAIL_MILTER_PORT?=	sendmail
 SUB_FILES=	milter-dkim.sh
 WCONF=		${WRKSRC}/devtools/Site
+MAN5=		dkim-filter.conf.5
 MAN8=		dkim-filter.8
 PLIST_FILES=	libexec/dkim-filter sbin/gentxt-dkim \
+		etc/mail/dkim-filter.conf.sample \
 		%%STATS%%libexec/dkim-stats
+PLIST_DIRS=	etc/mail
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh \
 		draft-allman-dkim-ssp-02.txt draft-hoffman-dac-vbr-00.txt \
@@ -61,24 +70,40 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.ht
 		${DOCSDIR_REL}/libdkim/dkim_alg_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_body.html \
 		${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
+		${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
 		${DOCSDIR_REL}/libdkim/dkim_close.html \
 		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
 		${DOCSDIR_REL}/libdkim/dkim_eom.html \
 		${DOCSDIR_REL}/libdkim/dkim_free.html \
 		${DOCSDIR_REL}/libdkim/dkim_getcanonlen.html \
-		${DOCSDIR_REL}/libdkim/dkim_getidentity.html \
 		${DOCSDIR_REL}/libdkim/dkim_getkeysize.html \
+		${DOCSDIR_REL}/libdkim/dkim_getselector.html \
+		${DOCSDIR_REL}/libdkim/dkim_getsigdomain.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsignalg.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsigntime.html \
 		${DOCSDIR_REL}/libdkim/dkim_header.html \
 		${DOCSDIR_REL}/libdkim/dkim_init.html \
 		${DOCSDIR_REL}/libdkim/dkim_lib.html \
+		${DOCSDIR_REL}/libdkim/dkim_ohdrs.html \
 		${DOCSDIR_REL}/libdkim/dkim_options.html \
+		${DOCSDIR_REL}/libdkim/dkim_param_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_query_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_dns_callback.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_key_lookup.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_policy_lookup.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle_free.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_signature_tagvalues.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_signer.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_user_context.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_getcontext.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
+		${DOCSDIR_REL}/libdkim/dkim_siginfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_sign.html \
 		${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \
@@ -94,24 +119,58 @@ SITE+=		${FILESDIR}/site.config.m4
 .if !defined(SENDMAIL_MILTER_IN_BASE)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
+SITE+=		${WRKSRC}/site.config.m4.dist
+SITE_SUB+=	-e "s|%%PREFIX%%|${PREFIX}|g" \
+		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 
 .include <bsd.port.pre.mk>
 
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
 
+.if defined(WITH_DEBUG)
+SITE_SUB+=	-e '\|confOPTIMIZE.*-g|s/^dnl //g'
+.endif
+.if !defined(WITHOUT_ARLIB)
+SITE_SUB+=	-e '\|bld_USE_ARLIB|s/^dnl //g'
+.endif
+.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
+SITE_SUB+=	-e '/-DPOPAUTH/s/^dnl //g'
+.endif
+
 .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
+LIBDK_PATH!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
+SITE_SUB+=	-e '\|bld_VERIFY_DOMAINKEYS|s/^dnl //'
 .endif
 
 .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
+MAN8+=		dkim-stats.8
 PLIST_SUB+=	STATS=""
 .else
 PLIST_SUB+=	STATS="@comment "
 .endif
 
+.if defined(WITH_POPAUTH) \
+	|| defined(WITH_QUERY_CACHE) \
+	|| defined(WITH_STATS)
+USE_BDB=	41+
+INVALID_BDB_VER=	2 3 40
+SITE_SUB+=	-e 's|%%BDB%%||g' \
+		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
+		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
+		-e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g"
+.else
+SITE_SUB+=	-e 's|%%BDB%%|dnl |g'
+.endif
+.if defined(WITH_OPENSSL_BASE) || defined(OPENSSL_OVERWRITE_BASE)
+SITE_SUB+=	-e 's|%%OPENSSL%%|dnl |g'
+.else
+SITE_SUB+=	-e 's|%%OPENSSL%%||g' \
+		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
+		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g"
+.endif
+
 pre-fetch:
 .if defined(SENDMAIL_WITHOUT_MILTER)
 	@${ECHO_MSG}
@@ -125,6 +184,7 @@ pre-fetch:
 	@${ECHO_MSG} "which is requied in the latest specification."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
+	@${ECHO_MSG} " WITH_POPAUTH=yes		Query POP-before-SMTP authentication database"
 	@${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"
@@ -134,32 +194,32 @@ pre-fetch:
 post-extract:
 	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
 
+.include	"${.CURDIR}/Makefile.features"
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		${WRKSRC}/devtools/OS/FreeBSD
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
-		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
-		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g" \
+	@${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
 		${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 '/-DVERIFY_DOMAINKEYS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
-	${LN} -s ${LIBDK_PATH} ${WRKSRC}/
+	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
 .endif
 
-.include "${.CURDIR}/Makefile.features"
-
 post-install:
+.if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
+.endif
 	${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \
 		${PREFIX}/sbin/gentxt-dkim
+	@${MKDIR} ${PREFIX}/etc/mail
+	${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${PREFIX}/etc/mail/
+.for i in ${MAN5}
+	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
+	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5/
+.endfor
 .for i in ${MAN8}
 	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/
Index: Makefile.features
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile.features,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.features
--- Makefile.features	27 Apr 2007 07:38:41 -0000	1.3
+++ Makefile.features	22 May 2007 09:31:33 -0000
@@ -8,101 +8,53 @@
 #
 
 .if defined(WITH_ALLMAN_SSP_02) && !defined(WITHOUT_ALLMAN_SSP_02)
-	@${REINPLACE_CMD} -e '/-D_FFR_ALLMAN_SSP_02/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4 \
-		${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_ALLMAN_SSP_02/s|^dnl ||'
 .endif
 
 .if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
-	@${REINPLACE_CMD} -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
 .endif
 
 .if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
-	@${REINPLACE_CMD} -e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
 .endif
 
 .if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
-	@${REINPLACE_CMD} -e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||'
 .endif
 
 .if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)
-	@${REINPLACE_CMD} -e '/-D_FFR_HASH_BUFFERING/s|^dnl ||' \
-		${WRKSRC}/libdkim/Makefile.m4
-.endif
-
-.if defined(WITH_LOG_SSL_ERRORS) && !defined(WITHOUT_LOG_SSL_ERRORS)
-	@${REINPLACE_CMD} -e '/-D_FFR_LOG_SSL_ERRORS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_MULTIPLE_KEYS) && !defined(WITHOUT_MULTIPLE_KEYS)
-	@${REINPLACE_CMD} -e '/-D_FFR_MULTIPLE_KEYS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_OMIT_HEADERS) && !defined(WITHOUT_OMIT_HEADERS)
-	@${REINPLACE_CMD} -e '/-D_FFR_OMIT_HEADERS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_HASH_BUFFERING/s|^dnl ||'
 .endif
 
 .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
-	@${REINPLACE_CMD} -e '/-D_FFR_QUERY_CACHE/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4 \
-		${WRKSRC}/libdkim/Makefile.m4
-.endif
-
-.if defined(WITH_QUERY_FILE) && !defined(WITHOUT_QUERY_FILE)
-	@${REINPLACE_CMD} -e '/-D_FFR_QUERY_FILE/s|^dnl ||' \
-		${WRKSRC}/libdkim/Makefile.m4
-.endif
-
-.if defined(WITH_QUARANTINE) && !defined(WITHOUT_QUARANTINE)
-	@${REINPLACE_CMD} -e '/-D_FFR_QUARANTINE/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_REPORTINFO) && !defined(WITHOUT_REPORTINFO)
-	@${REINPLACE_CMD} -e '/-D_FFR_REPORTINFO/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_QUERY_CACHE/s|^dnl ||'
 .endif
 
 .if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
-	@${REINPLACE_CMD} -e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||'
 .endif
 
 .if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
-	@${REINPLACE_CMD} -e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||'
 .endif
 
 .if defined(WITH_SELECT_SIGN_HEADERS) && !defined(WITHOUT_SELECT_SIGN_HEADERS)
-	@${REINPLACE_CMD} -e '/-D_FFR_SELECT_SIGN_HEADERS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_SET_DNS_CALLBACK) && !defined(WITHOUT_SET_DNS_CALLBACK)
-	@${REINPLACE_CMD} -e '/-D_FFR_SET_DNS_CALLBACK/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4 \
-		${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_SELECT_SIGN_HEADERS/s|^dnl ||'
 .endif
 
 .if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY)
-	@${REINPLACE_CMD} -e '/-D_FFR_SET_REPLY/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_SET_REPLY/s|^dnl ||'
 .endif
 
 .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
-	@${REINPLACE_CMD} -e '/-D_FFR_STATS/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4 \
-		${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_STATS/s|^dnl ||'
 .endif
 
 .if defined(WITH_VBR) && !defined(WITHOUT_VBR)
-	@${REINPLACE_CMD} -e '/-D_FFR_VBR/s|^dnl ||' \
-		${WRKSRC}/dkim-filter/Makefile.m4 \
-		${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+=	-e '/-D_FFR_VBR/s|^dnl ||'
+.endif
+
+.if defined(WITH_ZTAGS) && !defined(WITHOUT_ZTAGS)
+SITE_SUB+=	-e '/-D_FFR_ZTAGS/s|^dnl ||'
 .endif
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo	27 Apr 2007 07:38:41 -0000	1.13
+++ distinfo	22 May 2007 09:31:33 -0000
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-0.6.6.tar.gz) = 7967e57b2df7a3019a4156a24971d5a8
-SHA256 (dkim-milter-0.6.6.tar.gz) = 25705f3fade8ba5db86272c1e937f006a645958467b47b7650b8d89451086bcb
-SIZE (dkim-milter-0.6.6.tar.gz) = 492420
+MD5 (dkim-milter-0.8.1.tar.gz) = 4725830363a695a4366f11710f8554f3
+SHA256 (dkim-milter-0.8.1.tar.gz) = e9baaf2c4b86d348c8e9ec453c468e0143427e874714384e326bfd04e70d12ec
+SIZE (dkim-milter-0.8.1.tar.gz) = 527354
cvs diff: Diffing files
Index: files/milter-dkim.sh.in
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/milter-dkim.sh.in,v
retrieving revision 1.9
diff -u -p -r1.9 milter-dkim.sh.in
--- files/milter-dkim.sh.in	18 Apr 2007 06:27:20 -0000	1.9
+++ files/milter-dkim.sh.in	22 May 2007 09:31:33 -0000
@@ -19,6 +19,7 @@
 # milterdkim_profiles (list): Set to "" by default.
 #                             Define your profiles here.
 # milterdkim_socket (str):    Path to the milter socket.
+# milterdkim_cfgfile (str):   Configuration file. Also see dkim-filter.conf(5)
 # milterdkim_domain (str):    Domainpart of From: in mails to sign.
 # milterdkim_key (str):       Path to the private key file to sign with.
 # milterdkim_selector (str):  Selector to use when signing
@@ -34,6 +35,7 @@ milterdkim_enable=${milterdkim_enable:-"
 milterdkim_uid=${milterdkim_uid:-"mailnull"}
 milterdkim_profiles=${milterdkim_profiles:-}
 milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"}
+milterdkim_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"}
 milterdkim_domain=${milterdkim_domain:-"example.com"}
 milterdkim_key=${milterdkim_key:-}
 milterdkim_selector=${milterdkim_selector:-}
@@ -65,11 +67,17 @@ if [ -n "$2" ]; then
 	    echo "You must define a socket (milterdkim_${profile}_socket)"
 	    exit 1
 	fi
+	eval milterdkim_cfgfile="\${milterdkim_${profile}_cfgfile:-${milterdkim_cfgfile}}"
 	eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}"
 	eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}"
 	eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}"
 	eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}"
 	eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}"
+	if [ -f "${milterdkim_cfgfile}" ];then
+	    milterdkim_cfgfile="-x ${milterdkim_cfgfile}"
+	else
+	    milterdkim_cfgfile=""
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -82,7 +90,7 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     else
 	echo "$0: extra argument ignored"
     fi
@@ -104,6 +112,11 @@ else
 	    restart_precmd=""
 	fi
     else
+	if [ -f "${milterdkim_cfgfile}" ];then
+	    milterdkim_cfgfile="-x ${milterdkim_cfgfile}"
+	else
+	    milterdkim_cfgfile=""
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -116,7 +129,7 @@ else
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     fi
 fi
 
Index: files/site.config.m4
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4,v
retrieving revision 1.2
diff -u -p -r1.2 site.config.m4
--- files/site.config.m4	18 Apr 2007 06:27:20 -0000	1.2
+++ files/site.config.m4	22 May 2007 09:31:33 -0000
@@ -4,7 +4,9 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/
 define(`confUBINDIR',`%%PREFIX%%/libexec')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
-APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
-APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')
-APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
-APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')
+%%STATIC%%APPENDDEF(`confLIBS', `-static ')
+%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%%')
+%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%%')
+%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%%')
+%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% -R%%OPENSSLLIB%%')
+%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
Index: files/site.config.m4.milter
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4.milter,v
retrieving revision 1.1
diff -u -p -r1.1 site.config.m4.milter
--- files/site.config.m4.milter	11 Jan 2006 13:50:22 -0000	1.1
+++ files/site.config.m4.milter	22 May 2007 09:31:33 -0000
@@ -1,2 +1,2 @@
-APPENDDEF(`confENVDEF',`-I%%LOCALBASE%%/include')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`bld_dkim_filter_INCDIRS',`-I%%LOCALBASE%%/include')
+APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L%%LOCALBASE%%/lib')
diff --exclude work --exclude CVS -Npru ports.orig/mail/dkim-milter/files/patch-dkim-filter-Makefile.m4 ports/mail/dkim-milter/files/patch-dkim-filter-Makefile.m4
--- ports.orig/mail/dkim-milter/files/patch-dkim-filter-Makefile.m4	Fri May 18 20:53:16 2007
+++ ports/mail/dkim-milter/files/patch-dkim-filter-Makefile.m4	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- dkim-filter/Makefile.m4.bak	Fri Apr  8 21:50:08 2005
-+++ dkim-filter/Makefile.m4	Sun May 22 13:07:23 2005
-@@ -10,7 +10,7 @@
- dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
- 
- dnl To use the asynchronous resolver library provided, enable this line:
--dnl bldPUSH_SMLIB(`ar')
-+bldPUSH_SMLIB(`ar')
- 
- bldPUSH_SMLIB(`dkim')
- APPENDDEF(`confINCDIRS', `-I../libdkim/ ')
diff --exclude work --exclude CVS -Npru ports.orig/mail/dkim-milter/files/patch-libdkim-Makefile.m4 ports/mail/dkim-milter/files/patch-libdkim-Makefile.m4
--- ports.orig/mail/dkim-milter/files/patch-libdkim-Makefile.m4	Fri May 18 20:53:16 2007
+++ ports/mail/dkim-milter/files/patch-libdkim-Makefile.m4	Thu Jan  1 09:00:00 1970
@@ -1,15 +0,0 @@
---- libdkim/Makefile.m4.bak	Sat Sep  4 00:39:01 2004
-+++ libdkim/Makefile.m4	Sun May 22 13:10:14 2005
-@@ -4,9 +4,9 @@
- define(`confREQUIRE_LIBSM', `true')
- 
- dnl Enable these lines to make use of the provided asynchronous resolver:
--dnl bldPUSH_SMLIB(`ar')
--dnl APPENDDEF(`confENVDEF', `-DUSE_ARLIB ')
--dnl APPENDDEF(`confINCDIRS', `-I../libar/ ')
-+bldPUSH_SMLIB(`ar')
-+APPENDDEF(`confENVDEF', `-DUSE_ARLIB ')
-+APPENDDEF(`confINCDIRS', `-I../libar/ ')
- 
- dnl Enable and edit this as appropriate for your system:
- dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86sl9pry9q.wl%umq>