Attachment #78497 for bug #112916

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




## base system, building this port may fail.

PORTNAME=	dkim-milter
PORTVERSION=	1.0.0
CATEGORIES=	mail
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

.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 \
		draft-ietf-dkim-overview-04.txt \
		draft-ietf-dkim-ssp-requirements-02.txt rfc4686.txt rfc4871.txt
.if !defined(NOPORTDOCS)
LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
		${DOCSDIR_REL}/libdkim/overview.html \

		${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 \

.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
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}

	@${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"

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} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g" \
		${SITE} > ${WCONF}/site.config.m4

.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
		-e "/-I\.\.\/libdk\//s|^dnl ||" \
		-e '/-DVERIFY_DOMAINKEYS/s|^dnl ||' \
		${WRKSRC}/dkim-filter/Makefile.m4
	${LN} -s ${LIBDK_PATH} ${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/




#

.if defined(WITH_ALLMAN_SSP_02) && !defined(WITHOUT_ALLMAN_SSP_02)
SITE_SUB+=	-e '/-D_FFR_ALLMAN_SSP_02/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4 \
		${WRKSRC}/libdkim/Makefile.m4
.endif

.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4
.endif

.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
SITE_SUB+=	-e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4
.endif

.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
SITE_SUB+=	-e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4
.endif

.if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)
SITE_SUB+=	-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
.endif

.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
SITE_SUB+=	-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
.endif

.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
SITE_SUB+=	-e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4
.endif

.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
SITE_SUB+=	-e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4
.endif

.if defined(WITH_SELECT_SIGN_HEADERS) && !defined(WITHOUT_SELECT_SIGN_HEADERS)
SITE_SUB+=	-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
.endif

.if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY)
SITE_SUB+=	-e '/-D_FFR_SET_REPLY/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4
.endif

.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
SITE_SUB+=	-e '/-D_FFR_STATS/s|^dnl ||'
		${WRKSRC}/dkim-filter/Makefile.m4 \
		${WRKSRC}/libdkim/Makefile.m4
.endif

.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (dkim-milter-0.6.6.tar.gz) = 7967e57b2df7a3019a4156a24971d5a8	1	MD5 (dkim-milter-1.0.0.tar.gz) = 7213cbfc39c2420153087248fa0258b1
2	SHA256 (dkim-milter-0.6.6.tar.gz) = 25705f3fade8ba5db86272c1e937f006a645958467b47b7650b8d89451086bcb	2	SHA256 (dkim-milter-1.0.0.tar.gz) = e813d3e58ce3fe6619bbf11d7ccd165387931b360c397397a5c4735af822ad59
3	SIZE (dkim-milter-0.6.6.tar.gz) = 492420	3	SIZE (dkim-milter-1.0.0.tar.gz) = 520612




# 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

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:-}

	    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

	if [ "x${milterdkim_alg}" != "x" ];then
	    milterdkim_alg="-S ${milterdkim_alg}"
	fi
	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

	    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

	if [ "x${milterdkim_alg}" != "x" ];then
	    milterdkim_alg="-S ${milterdkim_alg}"
	fi
	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
    fi
fi


Lines 4-10 define(`confMANROOTMAN',`%%PREFIX%%/man/ Link Here

(-)files/site.config.m4 (-4 / +6 lines)
4	define(`confUBINDIR',`%%PREFIX%%/libexec')	4	define(`confUBINDIR',`%%PREFIX%%/libexec')
5	define(`confLIBDIR',`%%PREFIX%%/lib')	5	define(`confLIBDIR',`%%PREFIX%%/lib')
6	define(`confDONT_INSTALL_CATMAN',`True')	6	define(`confDONT_INSTALL_CATMAN',`True')
7	APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')	7	%%STATIC%%APPENDDEF(`confLIBS', `-static ')
8	APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')	8	%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%%')
9	APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')	9	%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%%')
10	APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')	10	%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%%')
		11	%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% -R%%OPENSSLLIB%%')
		12	%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')

Lines 1-2 Link Here

(-)files/site.config.m4.milter (-2 / +2 lines)
1	APPENDDEF(`confENVDEF',`-I%%LOCALBASE%%/include')	1	APPENDDEF(`bld_dkim_filter_INCDIRS',`-I%%LOCALBASE%%/include')
2	APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')	2	APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L%%LOCALBASE%%/lib')

Lines 1-11 Link Here

(-)ports/mail/dkim-milter/files/patch-dkim-filter-Makefile.m4 (-11 lines)
1	--- dkim-filter/Makefile.m4.bak Fri Apr 8 21:50:08 2005
2	+++ dkim-filter/Makefile.m4 Sun May 22 13:07:23 2005
3	@@ -10,7 +10,7 @@
4	dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
5
6	dnl To use the asynchronous resolver library provided, enable this line:
7	-dnl bldPUSH_SMLIB(`ar')
8	+bldPUSH_SMLIB(`ar')
9
10	bldPUSH_SMLIB(`dkim')
11	APPENDDEF(`confINCDIRS', `-I../libdkim/ ')




--- 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 ')

Return to bug 112916

Lines 13-19 Link Here

(-)Makefile (-17 / +77 lines)
13	## base system, building this port may fail.	13	## base system, building this port may fail.
14		14
15	PORTNAME= dkim-milter	15	PORTNAME= dkim-milter
16	PORTVERSION= 0.6.6	16	PORTVERSION= 1.0.0
17	CATEGORIES= mail	17	CATEGORIES= mail
18	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	18	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
19	MASTER_SITE_SUBDIR= ${PORTNAME}	19	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 43-59 BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilt Link Here
43	.endif	43	.endif
44	.endif	44	.endif
45		45
		46	.if defined(WITH_SENDMAIL_STATIC_MILTER) \|\| !defined(SENDMAIL_WITH_SHARED_MILTER)
		47	SITE+= -e '\\|-static\|s\|%%STATIC%%\|\|g'
		48	.else
		49	SITE+= -e '\\|-static\|s\|%%STATIC%%\|dnl \|g'
		50	.endif
		51
46	SENDMAIL_MILTER_PORT?= sendmail	52	SENDMAIL_MILTER_PORT?= sendmail
47	SUB_FILES= milter-dkim.sh	53	SUB_FILES= milter-dkim.sh
48	WCONF= ${WRKSRC}/devtools/Site	54	WCONF= ${WRKSRC}/devtools/Site
		55	MAN5= dkim-filter.conf.5
49	MAN8= dkim-filter.8	56	MAN8= dkim-filter.8
50	PLIST_FILES= libexec/dkim-filter sbin/gentxt-dkim \	57	PLIST_FILES= libexec/dkim-filter sbin/gentxt-dkim \
		58	etc/mail/dkim-filter.conf.sample \
51	%%STATS%%libexec/dkim-stats	59	%%STATS%%libexec/dkim-stats
		60	PLIST_DIRS= etc/mail
52	PORTDOCS= FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \	61	PORTDOCS= FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
53	autorespond.csh \	62	autorespond.csh \
54	draft-allman-dkim-ssp-02.txt draft-hoffman-dac-vbr-00.txt \	63	draft-allman-dkim-ssp-02.txt draft-hoffman-dac-vbr-00.txt \
55	draft-ietf-dkim-base-10.txt draft-ietf-dkim-overview-04.txt \	64	draft-ietf-dkim-overview-04.txt \
56	draft-ietf-dkim-ssp-requirements-02.txt rfc4686.txt	65	draft-ietf-dkim-ssp-requirements-02.txt rfc4686.txt rfc4871.txt
57	.if !defined(NOPORTDOCS)	66	.if !defined(NOPORTDOCS)
58	LIBDOCS= ${DOCSDIR_REL}/libdkim/index.html \	67	LIBDOCS= ${DOCSDIR_REL}/libdkim/index.html \
59	${DOCSDIR_REL}/libdkim/overview.html \	68	${DOCSDIR_REL}/libdkim/overview.html \
Lines 61-84 LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht Link Here
61	${DOCSDIR_REL}/libdkim/dkim_alg_t.html \	70	${DOCSDIR_REL}/libdkim/dkim_alg_t.html \
62	${DOCSDIR_REL}/libdkim/dkim_body.html \	71	${DOCSDIR_REL}/libdkim/dkim_body.html \
63	${DOCSDIR_REL}/libdkim/dkim_canon_t.html \	72	${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
		73	${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
64	${DOCSDIR_REL}/libdkim/dkim_close.html \	74	${DOCSDIR_REL}/libdkim/dkim_close.html \
65	${DOCSDIR_REL}/libdkim/dkim_eoh.html \	75	${DOCSDIR_REL}/libdkim/dkim_eoh.html \
66	${DOCSDIR_REL}/libdkim/dkim_eom.html \	76	${DOCSDIR_REL}/libdkim/dkim_eom.html \
67	${DOCSDIR_REL}/libdkim/dkim_free.html \	77	${DOCSDIR_REL}/libdkim/dkim_free.html \
68	${DOCSDIR_REL}/libdkim/dkim_getcanonlen.html \	78	${DOCSDIR_REL}/libdkim/dkim_getcanonlen.html \
69	${DOCSDIR_REL}/libdkim/dkim_getidentity.html \
70	${DOCSDIR_REL}/libdkim/dkim_getkeysize.html \	79	${DOCSDIR_REL}/libdkim/dkim_getkeysize.html \
		80	${DOCSDIR_REL}/libdkim/dkim_getselector.html \
		81	${DOCSDIR_REL}/libdkim/dkim_getsigdomain.html \
71	${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \	82	${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
72	${DOCSDIR_REL}/libdkim/dkim_getsignalg.html \	83	${DOCSDIR_REL}/libdkim/dkim_getsignalg.html \
73	${DOCSDIR_REL}/libdkim/dkim_getsigntime.html \	84	${DOCSDIR_REL}/libdkim/dkim_getsigntime.html \
74	${DOCSDIR_REL}/libdkim/dkim_header.html \	85	${DOCSDIR_REL}/libdkim/dkim_header.html \
75	${DOCSDIR_REL}/libdkim/dkim_init.html \	86	${DOCSDIR_REL}/libdkim/dkim_init.html \
76	${DOCSDIR_REL}/libdkim/dkim_lib.html \	87	${DOCSDIR_REL}/libdkim/dkim_lib.html \
		88	${DOCSDIR_REL}/libdkim/dkim_ohdrs.html \
77	${DOCSDIR_REL}/libdkim/dkim_options.html \	89	${DOCSDIR_REL}/libdkim/dkim_options.html \
		90	${DOCSDIR_REL}/libdkim/dkim_param_t.html \
78	${DOCSDIR_REL}/libdkim/dkim_policy.html \	91	${DOCSDIR_REL}/libdkim/dkim_policy.html \
79	${DOCSDIR_REL}/libdkim/dkim_policy_t.html \	92	${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
80	${DOCSDIR_REL}/libdkim/dkim_query_t.html \	93	${DOCSDIR_REL}/libdkim/dkim_query_t.html \
81	${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \	94	${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \
		95	${DOCSDIR_REL}/libdkim/dkim_set_dns_callback.html \
		96	${DOCSDIR_REL}/libdkim/dkim_set_key_lookup.html \
		97	${DOCSDIR_REL}/libdkim/dkim_set_policy_lookup.html \
		98	${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \
		99	${DOCSDIR_REL}/libdkim/dkim_set_signature_handle.html \
		100	${DOCSDIR_REL}/libdkim/dkim_set_signature_handle_free.html \
		101	${DOCSDIR_REL}/libdkim/dkim_set_signature_tagvalues.html \
		102	${DOCSDIR_REL}/libdkim/dkim_set_signer.html \
		103	${DOCSDIR_REL}/libdkim/dkim_set_user_context.html \
		104	${DOCSDIR_REL}/libdkim/dkim_sig_getcontext.html \
		105	${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
		106	${DOCSDIR_REL}/libdkim/dkim_siginfo.html \
82	${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \	107	${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
83	${DOCSDIR_REL}/libdkim/dkim_sign.html \	108	${DOCSDIR_REL}/libdkim/dkim_sign.html \
84	${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \	109	${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \
Lines 94-117 SITE+= ${FILESDIR}/site.config.m4 Link Here
94	.if !defined(SENDMAIL_MILTER_IN_BASE)	119	.if !defined(SENDMAIL_MILTER_IN_BASE)
95	SITE+= ${FILESDIR}/site.config.m4.milter	120	SITE+= ${FILESDIR}/site.config.m4.milter
96	.endif	121	.endif
		122	SITE+= ${WRKSRC}/site.config.m4.dist
		123	SITE_SUB+= -e "s\|%%PREFIX%%\|${PREFIX}\|g" \
		124	-e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g"
97		125
98	.include <bsd.port.pre.mk>	126	.include <bsd.port.pre.mk>
99		127
100	SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"	128	SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
101		129
		130	.if defined(WITH_DEBUG)
		131	SITE_SUB+= -e '\\|confOPTIMIZE.*-g\|s/^dnl //g'
		132	.endif
		133	.if !defined(WITHOUT_ARLIB)
		134	SITE_SUB+= -e '\\|bld_USE_ARLIB\|s/^dnl //g'
		135	.endif
		136	.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
		137	SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g'
		138	.endif
		139
102	.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)	140	.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
103	LIBDK_PORT= mail/dk-milter	141	LIBDK_PORT= mail/dk-milter
104	BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch	142	BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
105	DKMILTER_DISTNAME!= cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V DISTNAME	143	LIBDK_PATH!= cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
106	LIBDK_PATH= ${PORTSDIR}/${LIBDK_PORT}/work/${DKMILTER_DISTNAME}/libdk	144	SITE_SUB+= -e '\\|bld_VERIFY_DOMAINKEYS\|s/^dnl //'
107	.endif	145	.endif
108		146
109	.if defined(WITH_STATS) && !defined(WITHOUT_STATS)	147	.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
		148	MAN8+= dkim-stats.8
110	PLIST_SUB+= STATS=""	149	PLIST_SUB+= STATS=""
111	.else	150	.else
112	PLIST_SUB+= STATS="@comment "	151	PLIST_SUB+= STATS="@comment "
113	.endif	152	.endif
114		153
		154	.if defined(WITH_POPAUTH) \
		155	\|\| defined(WITH_QUERY_CACHE) \
		156	\|\| defined(WITH_STATS)
		157	USE_BDB= 41+
		158	INVALID_BDB_VER= 2 3 40
		159	SITE_SUB+= -e 's\|%%BDB%%\|\|g' \
		160	-e "s\|%%BDB_LIB_DIR%%\|${BDB_LIB_DIR}\|g" \
		161	-e "s\|%%BDB_INCLUDE_DIR%%\|${BDB_INCLUDE_DIR}\|g" \
		162	-e "s\|%%BDB_LIB_NAME%%\|${BDB_LIB_NAME}\|g"
		163	.else
		164	SITE_SUB+= -e 's\|%%BDB%%\|dnl \|g'
		165	.endif
		166	.if defined(WITH_OPENSSL_BASE) \|\| defined(OPENSSL_OVERWRITE_BASE)
		167	SITE_SUB+= -e 's\|%%OPENSSL%%\|dnl \|g'
		168	.else
		169	SITE_SUB+= -e 's\|%%OPENSSL%%\|\|g' \
		170	-e "s\|%%OPENSSLINC%%\|${OPENSSLINC}\|g" \
		171	-e "s\|%%OPENSSLLIB%%\|${OPENSSLLIB}\|g"
		172	.endif
		173
115	pre-fetch:	174	pre-fetch:
116	.if defined(SENDMAIL_WITHOUT_MILTER)	175	.if defined(SENDMAIL_WITHOUT_MILTER)
117	@${ECHO_MSG}	176	@${ECHO_MSG}
Lines 125-130 pre-fetch: Link Here
125	@${ECHO_MSG} "which is requied in the latest specification."	184	@${ECHO_MSG} "which is requied in the latest specification."
126	@${ECHO_MSG}	185	@${ECHO_MSG}
127	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"	186	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
		187	@${ECHO_MSG} " WITH_POPAUTH=yes Query POP-before-SMTP authentication database"
128	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes Verify DomainKeys using dk-milter's libdk"	188	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes Verify DomainKeys using dk-milter's libdk"
129	@${ECHO_MSG} " SENDMAIL_MILTER_IN_BASE=yes Build to run with base sendmail"	189	@${ECHO_MSG} " SENDMAIL_MILTER_IN_BASE=yes Build to run with base sendmail"
130	@${ECHO_MSG} " WITH_POSTFIX=yes Build to run with postfix port"	190	@${ECHO_MSG} " WITH_POSTFIX=yes Build to run with postfix port"
Lines 134-165 pre-fetch: Link Here
134	post-extract:	194	post-extract:
135	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}	195	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
136		196
		197	.include "${.CURDIR}/Makefile.features"
137	post-patch:	198	post-patch:
138	@${REINPLACE_CMD} -e 's\|-pthread\|${PTHREAD_LIBS}\|' \	199	@${REINPLACE_CMD} -e 's\|-pthread\|${PTHREAD_LIBS}\|' \
139	-e 's\|-D_THREAD_SAFE\|${PTHREAD_CFLAGS}\|' \	200	-e 's\|-D_THREAD_SAFE\|${PTHREAD_CFLAGS}\|' \
140	-e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	201	-e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
141	-e "s\|\`-O'\|\`${CFLAGS}'\|g" \	202	-e "s\|\`-O'\|\`${CFLAGS}'\|g" \
142	${WRKSRC}/devtools/OS/FreeBSD	203	${WRKSRC}/devtools/OS/FreeBSD
143	@${SED} -e "s\|%%PREFIX%%\|${PREFIX}\|g" \	204	@${SED} ${SITE_SUB} -e '\\|^dnl \|d' -e '/^dnl$$/d' \
144	-e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \
145	-e "s\|%%OPENSSLINC%%\|${OPENSSLINC}\|g" \
146	-e "s\|%%OPENSSLLIB%%\|${OPENSSLLIB}\|g" \
147	${SITE} > ${WCONF}/site.config.m4	205	${SITE} > ${WCONF}/site.config.m4
148		206
149	.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)	207	.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
150	@${REINPLACE_CMD} -e "/bldPUSH_SMLIB(\`dk')/s\|^dnl \|\|" \	208	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
151	-e "/-I\.\.\/libdk\//s\|^dnl \|\|" \
152	-e '/-DVERIFY_DOMAINKEYS/s\|^dnl \|\|' \
153	${WRKSRC}/dkim-filter/Makefile.m4
154	${LN} -s ${LIBDK_PATH} ${WRKSRC}/
155	.endif	209	.endif
156		210
157	.include "${.CURDIR}/Makefile.features"
158
159	post-install:	211	post-install:
		212	.if !defined(WITH_DEBUG)
160	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter	213	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
		214	.endif
161	${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \	215	${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \
162	${PREFIX}/sbin/gentxt-dkim	216	${PREFIX}/sbin/gentxt-dkim
		217	@${MKDIR} ${PREFIX}/etc/mail
		218	${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${PREFIX}/etc/mail/
		219	.for i in ${MAN5}
		220	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
		221	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5/
		222	.endfor
163	.for i in ${MAN8}	223	.for i in ${MAN8}
164	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz	224	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
165	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/	225	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/

Lines 8-108 Link Here

(-)Makefile.features (-64 / +16 lines)
8	#	8	#
9		9
10	.if defined(WITH_ALLMAN_SSP_02) && !defined(WITHOUT_ALLMAN_SSP_02)	10	.if defined(WITH_ALLMAN_SSP_02) && !defined(WITHOUT_ALLMAN_SSP_02)
11	@${REINPLACE_CMD} -e '/-D_FFR_ALLMAN_SSP_02/s\|^dnl \|\|' \	11	SITE_SUB+= -e '/-D_FFR_ALLMAN_SSP_02/s\|^dnl \|\|'
12	${WRKSRC}/dkim-filter/Makefile.m4 \
13	${WRKSRC}/libdkim/Makefile.m4
14	.endif	12	.endif
15		13
16	.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)	14	.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
17	@${REINPLACE_CMD} -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s\|^dnl \|\|' \	15	SITE_SUB+= -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s\|^dnl \|\|'
18	${WRKSRC}/dkim-filter/Makefile.m4
19	.endif	16	.endif
20		17
21	.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)	18	.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
22	@${REINPLACE_CMD} -e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s\|^dnl \|\|' \	19	SITE_SUB+= -e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s\|^dnl \|\|'
23	${WRKSRC}/dkim-filter/Makefile.m4
24	.endif	20	.endif
25		21
26	.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)	22	.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
27	@${REINPLACE_CMD} -e '/-D_FFR_FLUSH_HEADERS/s\|^dnl \|\|' \	23	SITE_SUB+= -e '/-D_FFR_FLUSH_HEADERS/s\|^dnl \|\|'
28	${WRKSRC}/dkim-filter/Makefile.m4
29	.endif	24	.endif
30		25
31	.if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)	26	.if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)
32	@${REINPLACE_CMD} -e '/-D_FFR_HASH_BUFFERING/s\|^dnl \|\|' \	27	SITE_SUB+= -e '/-D_FFR_HASH_BUFFERING/s\|^dnl \|\|'
33	${WRKSRC}/libdkim/Makefile.m4
34	.endif
35
36	.if defined(WITH_LOG_SSL_ERRORS) && !defined(WITHOUT_LOG_SSL_ERRORS)
37	@${REINPLACE_CMD} -e '/-D_FFR_LOG_SSL_ERRORS/s\|^dnl \|\|' \
38	${WRKSRC}/dkim-filter/Makefile.m4
39	.endif
40
41	.if defined(WITH_MULTIPLE_KEYS) && !defined(WITHOUT_MULTIPLE_KEYS)
42	@${REINPLACE_CMD} -e '/-D_FFR_MULTIPLE_KEYS/s\|^dnl \|\|' \
43	${WRKSRC}/dkim-filter/Makefile.m4
44	.endif
45
46	.if defined(WITH_OMIT_HEADERS) && !defined(WITHOUT_OMIT_HEADERS)
47	@${REINPLACE_CMD} -e '/-D_FFR_OMIT_HEADERS/s\|^dnl \|\|' \
48	${WRKSRC}/dkim-filter/Makefile.m4
49	.endif	28	.endif
50		29
51	.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)	30	.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
52	@${REINPLACE_CMD} -e '/-D_FFR_QUERY_CACHE/s\|^dnl \|\|' \	31	SITE_SUB+= -e '/-D_FFR_QUERY_CACHE/s\|^dnl \|\|'
53	${WRKSRC}/dkim-filter/Makefile.m4 \
54	${WRKSRC}/libdkim/Makefile.m4
55	.endif
56
57	.if defined(WITH_QUERY_FILE) && !defined(WITHOUT_QUERY_FILE)
58	@${REINPLACE_CMD} -e '/-D_FFR_QUERY_FILE/s\|^dnl \|\|' \
59	${WRKSRC}/libdkim/Makefile.m4
60	.endif
61
62	.if defined(WITH_QUARANTINE) && !defined(WITHOUT_QUARANTINE)
63	@${REINPLACE_CMD} -e '/-D_FFR_QUARANTINE/s\|^dnl \|\|' \
64	${WRKSRC}/dkim-filter/Makefile.m4
65	.endif
66
67	.if defined(WITH_REPORTINFO) && !defined(WITHOUT_REPORTINFO)
68	@${REINPLACE_CMD} -e '/-D_FFR_REPORTINFO/s\|^dnl \|\|' \
69	${WRKSRC}/dkim-filter/Makefile.m4
70	.endif	32	.endif
71		33
72	.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)	34	.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
73	@${REINPLACE_CMD} -e '/-D_FFR_REQUIRED_HEADERS/s\|^dnl \|\|' \	35	SITE_SUB+= -e '/-D_FFR_REQUIRED_HEADERS/s\|^dnl \|\|'
74	${WRKSRC}/dkim-filter/Makefile.m4
75	.endif	36	.endif
76		37
77	.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)	38	.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
78	@${REINPLACE_CMD} -e '/-D_FFR_SELECT_CANONICALIZATION/s\|^dnl \|\|' \	39	SITE_SUB+= -e '/-D_FFR_SELECT_CANONICALIZATION/s\|^dnl \|\|'
79	${WRKSRC}/dkim-filter/Makefile.m4
80	.endif	40	.endif
81		41
82	.if defined(WITH_SELECT_SIGN_HEADERS) && !defined(WITHOUT_SELECT_SIGN_HEADERS)	42	.if defined(WITH_SELECT_SIGN_HEADERS) && !defined(WITHOUT_SELECT_SIGN_HEADERS)
83	@${REINPLACE_CMD} -e '/-D_FFR_SELECT_SIGN_HEADERS/s\|^dnl \|\|' \	43	SITE_SUB+= -e '/-D_FFR_SELECT_SIGN_HEADERS/s\|^dnl \|\|'
84	${WRKSRC}/dkim-filter/Makefile.m4
85	.endif
86
87	.if defined(WITH_SET_DNS_CALLBACK) && !defined(WITHOUT_SET_DNS_CALLBACK)
88	@${REINPLACE_CMD} -e '/-D_FFR_SET_DNS_CALLBACK/s\|^dnl \|\|' \
89	${WRKSRC}/dkim-filter/Makefile.m4 \
90	${WRKSRC}/libdkim/Makefile.m4
91	.endif	44	.endif
92		45
93	.if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY)	46	.if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY)
94	@${REINPLACE_CMD} -e '/-D_FFR_SET_REPLY/s\|^dnl \|\|' \	47	SITE_SUB+= -e '/-D_FFR_SET_REPLY/s\|^dnl \|\|'
95	${WRKSRC}/dkim-filter/Makefile.m4
96	.endif	48	.endif
97		49
98	.if defined(WITH_STATS) && !defined(WITHOUT_STATS)	50	.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
99	@${REINPLACE_CMD} -e '/-D_FFR_STATS/s\|^dnl \|\|' \	51	SITE_SUB+= -e '/-D_FFR_STATS/s\|^dnl \|\|'
100	${WRKSRC}/dkim-filter/Makefile.m4 \
101	${WRKSRC}/libdkim/Makefile.m4
102	.endif	52	.endif
103		53
104	.if defined(WITH_VBR) && !defined(WITHOUT_VBR)	54	.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
105	@${REINPLACE_CMD} -e '/-D_FFR_VBR/s\|^dnl \|\|' \	55	SITE_SUB+= -e '/-D_FFR_VBR/s\|^dnl \|\|'
106	${WRKSRC}/dkim-filter/Makefile.m4 \	56	.endif
107	${WRKSRC}/libdkim/Makefile.m4	57
		58	.if defined(WITH_ZTAGS) && !defined(WITHOUT_ZTAGS)
		59	SITE_SUB+= -e '/-D_FFR_ZTAGS/s\|^dnl \|\|'
108	.endif	60	.endif

Lines 19-24 Link Here

(-)files/milter-dkim.sh.in (-2 / +15 lines)
19	# milterdkim_profiles (list): Set to "" by default.	19	# milterdkim_profiles (list): Set to "" by default.
20	# Define your profiles here.	20	# Define your profiles here.
21	# milterdkim_socket (str): Path to the milter socket.	21	# milterdkim_socket (str): Path to the milter socket.
		22	# milterdkim_cfgfile (str): Configuration file. Also see dkim-filter.conf(5)
22	# milterdkim_domain (str): Domainpart of From: in mails to sign.	23	# milterdkim_domain (str): Domainpart of From: in mails to sign.
23	# milterdkim_key (str): Path to the private key file to sign with.	24	# milterdkim_key (str): Path to the private key file to sign with.
24	# milterdkim_selector (str): Selector to use when signing	25	# milterdkim_selector (str): Selector to use when signing
Lines 34-39 milterdkim_enable=${milterdkim_enable:-" Link Here
34	milterdkim_uid=${milterdkim_uid:-"mailnull"}	35	milterdkim_uid=${milterdkim_uid:-"mailnull"}
35	milterdkim_profiles=${milterdkim_profiles:-}	36	milterdkim_profiles=${milterdkim_profiles:-}
36	milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"}	37	milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"}
		38	milterdkim_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"}
37	milterdkim_domain=${milterdkim_domain:-"example.com"}	39	milterdkim_domain=${milterdkim_domain:-"example.com"}
38	milterdkim_key=${milterdkim_key:-}	40	milterdkim_key=${milterdkim_key:-}
39	milterdkim_selector=${milterdkim_selector:-}	41	milterdkim_selector=${milterdkim_selector:-}
Lines 65-75 if [ -n "$2" ]; then Link Here
65	echo "You must define a socket (milterdkim_${profile}_socket)"	67	echo "You must define a socket (milterdkim_${profile}_socket)"
66	exit 1	68	exit 1
67	fi	69	fi
		70	eval milterdkim_cfgfile="\${milterdkim_${profile}_cfgfile:-${milterdkim_cfgfile}}"
68	eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}"	71	eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}"
69	eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}"	72	eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}"
70	eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}"	73	eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}"
71	eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}"	74	eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}"
72	eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}"	75	eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}"
		76	if [ -f "${milterdkim_cfgfile}" ];then
		77	milterdkim_cfgfile="-x ${milterdkim_cfgfile}"
		78	else
		79	milterdkim_cfgfile=""
		80	fi
73	if [ "x${milterdkim_domain}" != "x" ];then	81	if [ "x${milterdkim_domain}" != "x" ];then
74	milterdkim_domain="-d ${milterdkim_domain}"	82	milterdkim_domain="-d ${milterdkim_domain}"
75	fi	83	fi
Lines 82-88 if [ -n "$2" ]; then Link Here
82	if [ "x${milterdkim_alg}" != "x" ];then	90	if [ "x${milterdkim_alg}" != "x" ];then
83	milterdkim_alg="-S ${milterdkim_alg}"	91	milterdkim_alg="-S ${milterdkim_alg}"
84	fi	92	fi
85	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"	93	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
86	else	94	else
87	echo "$0: extra argument ignored"	95	echo "$0: extra argument ignored"
88	fi	96	fi
Lines 104-109 else Link Here
104	restart_precmd=""	112	restart_precmd=""
105	fi	113	fi
106	else	114	else
		115	if [ -f "${milterdkim_cfgfile}" ];then
		116	milterdkim_cfgfile="-x ${milterdkim_cfgfile}"
		117	else
		118	milterdkim_cfgfile=""
		119	fi
107	if [ "x${milterdkim_domain}" != "x" ];then	120	if [ "x${milterdkim_domain}" != "x" ];then
108	milterdkim_domain="-d ${milterdkim_domain}"	121	milterdkim_domain="-d ${milterdkim_domain}"
109	fi	122	fi
Lines 116-122 else Link Here
116	if [ "x${milterdkim_alg}" != "x" ];then	129	if [ "x${milterdkim_alg}" != "x" ];then
117	milterdkim_alg="-S ${milterdkim_alg}"	130	milterdkim_alg="-S ${milterdkim_alg}"
118	fi	131	fi
119	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"	132	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
120	fi	133	fi
121	fi	134	fi
122		135

Lines 1-15 Link Here

(-)ports/mail/dkim-milter/files/patch-libdkim-Makefile.m4 (-15 lines)
1	--- libdkim/Makefile.m4.bak Sat Sep 4 00:39:01 2004
2	+++ libdkim/Makefile.m4 Sun May 22 13:10:14 2005
3	@@ -4,9 +4,9 @@
4	define(`confREQUIRE_LIBSM', `true')
5
6	dnl Enable these lines to make use of the provided asynchronous resolver:
7	-dnl bldPUSH_SMLIB(`ar')
8	-dnl APPENDDEF(`confENVDEF', `-DUSE_ARLIB ')
9	-dnl APPENDDEF(`confINCDIRS', `-I../libar/ ')
10	+bldPUSH_SMLIB(`ar')
11	+APPENDDEF(`confENVDEF', `-DUSE_ARLIB ')
12	+APPENDDEF(`confINCDIRS', `-I../libar/ ')
13
14	dnl Enable and edit this as appropriate for your system:
15	dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')