Attachment #129264 for bug #173226

Lines 1-12 Link Here

(-)Makefile (-58 / +68 lines)
1	# New ports collection makefile for: opendkim	1	# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
2	# Date created: 2009-08-26
3	# Whom: Hirohisa Yamaguchi <umq@ueo.co.jp>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= opendkim	4	PORTNAME= opendkim
9	PORTVERSION= 2.5.2	5	PORTVERSION= 2.7.1
10	CATEGORIES= mail security	6	CATEGORIES= mail security
11	MASTER_SITES= SF	7	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= ${PORTNAME} \	8	MASTER_SITE_SUBDIR= ${PORTNAME} \
Lines 17-23 Link Here
17		13
18	LICENSE= BSD SENDMAIL	14	LICENSE= BSD SENDMAIL
19	LICENSE_COMB= multi	15	LICENSE_COMB= multi
20	LICENSE_FILE= ${WRKSRC}/LICENSE
21		16
22	LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail	17	LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail
23	LICENSE_GROUPS_SENDMAIL= FSF OSI	18	LICENSE_GROUPS_SENDMAIL= FSF OSI
Lines 25-53 Link Here
25	LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	20	LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
26		21
27	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
		23	MAKE_JOBS_SAFE= yes
		24	NO_OPTIONS_SORT=yes
28	USE_OPENSSL= yes	25	USE_OPENSSL= yes
29	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
30		27
31	MAN8= opendkim-genkey.8 opendkim-genzone.8 opendkim-testadsp.8 \	28	MAN8= opendkim-genkey.8 opendkim-genzone.8 opendkim-testadsp.8 \
32	opendkim-testkey.8 opendkim-testmsg.8	29	opendkim-testkey.8 opendkim-testmsg.8
		30	PORTDOCS= *
33		31
34	OPTIONS= \	32	OPTIONS_SINGLE= RESOLV
35	ARLIB "Asynchronous thread-safe DNS library" On \	33	OPTIONS_SINGLE_RESOLV= STOCK_RESOLVER UNBOUND
36	FILTER "OpenDKIM filter, requires libmilter/Sendmail" On \	34	OPTIONS_DEFINE= FILTER GNUTLS LUA MEMCACHED BDB_BASE OPENDBX OPENLDAP \
37	GNUTLS "Use GnuTLS instead of OpenSSL" Off \	35	POPAUTH QUERY_CACHE STATS XML
38	LUA "Describe filter policy with lua" Off \	36	OPTIONS_DEFAULT= FILTER LUA UNBOUND
39	MEMCACHED "Use memcached as a data set" Off \
40	OPENDBX "Store filter policies via OpenDBX" Off \
41	OPENLDAP "Store filter policies in LDAP" Off \
42	POPAUTH "Use POP authentication DB" Off \
43	QUERY_CACHE "Cache DNS query results locally" Off \
44	UNBOUND "Use unbound DNS library" Off
45		37
		38	STOCK_RESOLVER_DESC= Use the stock resolver library
		39	UNBOUND_DESC= Use unbound DNS library
		40	FILTER_DESC= OpenDKIM filter, requires libmilter/Sendmail
		41	GNUTLS_DESC= Use GnuTLS instead of OpenSSL
		42	LUA_DESC= Describe filter policy with lua
		43	MEMCACHED_DESC= Use memcached as a data set
		44	BDB_BASE_DESC= Use Berkeley DB from base
		45	OPENDBX_DESC= Store filter policies via OpenDBX
		46	OPENLDAP_DESC= Store filter policies in LDAP
		47	POPAUTH_DESC= Use POP authentication DB
		48	QUERY_CACHE_DESC= Cache DNS query results locally
		49	STATS_DESC= Setup statistics tools
		50
46	MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"	51	MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
47		52
48	.include <bsd.port.pre.mk>	53	.include "${.CURDIR}/Makefile.options"
		54	.include <bsd.port.options.mk>
49		55
50	.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)	56	.if ${PORT_OPTIONS:MFILTER}
51	USE_RC_SUBR= milter-opendkim	57	USE_RC_SUBR= milter-opendkim
52	MAN5+= opendkim.conf.5	58	MAN5+= opendkim.conf.5
53	MAN8+= opendkim.8	59	MAN8+= opendkim.8
Lines 62-69 Link Here
62	PLIST_SUB+= FILTER="@comment "	68	PLIST_SUB+= FILTER="@comment "
63	.endif	69	.endif
64		70
65	.if defined(WITH_GNUTLS)	71	.if ${PORT_OPTIONS:MGNUTLS}
66	LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls	72	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
67	CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE}	73	CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE}
68	.else	74	.else
69	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}	75	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
Lines 71-136 Link Here
71		77
72	.include "${.CURDIR}/Makefile.features"	78	.include "${.CURDIR}/Makefile.features"
73		79
74	.if defined(WITH_DEBUG)	80	.if ${PORT_OPTIONS:MDEBUG}
75	CONFIGURE_ARGS+= --enable-debug	81	CONFIGURE_ARGS+= --enable-debug
76	.endif	82	.endif
77		83
78	.if !defined(NOPORTDOCS)	84	.if ! ${PORT_OPTIONS:MDOCS}
79	PORTDOCS= *
80	.else
81	CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc	85	CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
82	.endif	86	.endif
83		87
84	.if (defined(WITH_POPAUTH) \	88	.if ${PORT_OPTIONS:MSTATS} \|\| ${PORT_OPTIONS:MSTATSEXT}
85	\|\| defined(WITH_QUERY_CACHE) \	89	CONFIGURE_ARGS+= --enable-stats
86	\|\| defined(WITH_BODYLENGTH_DB) \	90	MAN8+= opendkim-expire.8 opendkim-gengraphs.8 \
87	\|\| defined(WITH_LDAP_CACHING) \	91	opendkim-genstats.8 opendkim-stats.8
88	\|\| defined(WITH_STATS)) \	92	. if ${PORT_OPTIONS:MOPENDBX}
89	&& !defined(WITH_BDB_BASE)	93	MAN1+= opendkim-spam.1
		94	MAN8+= opendkim-importstats.8
		95	. endif
		96	PLIST_SUB+= STATS=""
		97	.else
		98	PLIST_SUB+= STATS="@comment "
		99	.endif
		100	.if ( ${PORT_OPTIONS:MPOPAUTH} \
		101	\|\| ${PORT_OPTIONS:MQUERY_CACHE} \
		102	\|\| ${PORT_OPTIONS:MLDAP_CACHING} \
		103	\|\| ${PORT_OPTIONS:MREPUTATION} \
		104	\|\| ${PORT_OPTIONS:MSTATS} ) && ! ${PORT_OPTIONS:MBDB_BASE}
90	CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \	105	CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \
91	--with-db-libdir=${BDB_LIB_DIR} \	106	--with-db-libdir=${BDB_LIB_DIR} \
92	--with-db-lib=${BDB_LIB_NAME}	107	--with-db-lib=${BDB_LIB_NAME}
93	USE_BDB= 41+	108	USE_BDB= 41+
94	.endif	109	.endif
95	.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)	110	.if ${PORT_OPTIONS:MUNBOUND}
96	.if defined(WITH_ARLIB)	111	CONFIGURE_ARGS+= --with-unbound
97	IGNORE= libar cannot be used simultaneously with libunbound
98	.endif
99	CONFIGURE_ARGS+= --with-unbound \
100	--disable-arlib
101	LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound	112	LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound
102	PLIST_SUB+= ARLIB="@comment "
103	.else
104	.if defined(WITH_ARLIB)
105	PLIST_SUB+= ARLIB=""
106	CONFIGURE_ARGS+= --enable-arlib
107	MAN3= ar.3
108	.else
109	CONFIGURE_ARGS+= --disable-arlib
110	PLIST_SUB+= ARLIB="@comment "
111	.endif	113	.endif
112	.endif	114	.if ${PORT_OPTIONS:MPOPAUTH}
113	.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
114	CONFIGURE_ARGS+= --enable-popauth	115	CONFIGURE_ARGS+= --enable-popauth
115	.endif	116	.endif
116	.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)	117	.if ${PORT_OPTIONS:MQUERY_CACHE}
117	CONFIGURE_ARGS+= --enable-query_cache	118	CONFIGURE_ARGS+= --enable-query_cache
118	.endif	119	.endif
119	.if defined(WITH_MEMCACHED)	120	.if ${PORT_OPTIONS:MMEMCACHED}
120	CONFIGURE_ARGS+= --with-libmemcached	121	CONFIGURE_ARGS+= --with-libmemcached
121	LIB_DEPENDS+= memcached:${PORTSDIR}/databases/libmemcached	122	LIB_DEPENDS+= memcached:${PORTSDIR}/databases/libmemcached
		123	.else
		124	CONFIGURE_ARGS+= --without-libmemcached
122	.endif	125	.endif
123	.if defined(WITH_OPENDBX)	126	.if ${PORT_OPTIONS:MOPENDBX}
124	CONFIGURE_ARGS+= --with-odbx	127	CONFIGURE_ARGS+= --with-odbx
125	LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx	128	LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx
		129	PLIST_SUB+= ODBX=""
		130	.else
		131	CONFIGURE_ARGS+= --without-odbx
		132	PLIST_SUB+= ODBX="@comment "
126	.endif	133	.endif
127	.if defined(WITH_OPENLDAP)	134	.if ${PORT_OPTIONS:MOPENLDAP}
128	CONFIGURE_ARGS+= --with-openldap	135	CONFIGURE_ARGS+= --with-openldap
		136	LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap24-sasl-client
129	USE_OPENLDAP= yes	137	USE_OPENLDAP= yes
		138	.else
		139	CONFIGURE_ARGS+= --without-openldap
130	.endif	140	.endif
131	.if defined(WITH_LUA) \|\| defined(WITH_RBL) \|\| defined(WITH_STATSEXT)	141	.if ${PORT_OPTIONS:MLUA} \|\| ${PORT_OPTIONS:MRBL} \|\| ${PORT_OPTIONS:MSTATSEXT}
132	CONFIGURE_ARGS+= --with-lua	142	CONFIGURE_ARGS+= --with-lua
133	. if !defined(WITHOUT_FILTER)	143	. if ${PORT_OPTIONS:MFILTER}
134	MAN3+= opendkim-lua.3	144	MAN3+= opendkim-lua.3
135	. endif	145	. endif
136	MAN8+= miltertest.8	146	MAN8+= miltertest.8
Lines 141-156 Link Here
141	.endif	151	.endif
142		152
143	post-install:	153	post-install:
144	.if !defined(WITH_DEBUG) && defined(WITH_FILTER) && !defined(WITHOUT_FILTER)	154	.if ! ${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER}
145	@${STRIP_CMD} ${PREFIX}/sbin/opendkim	155	@${STRIP_CMD} ${PREFIX}/sbin/opendkim
146	.endif	156	.endif
147	@${MKDIR} ${PREFIX}/etc/mail	157	@${MKDIR} ${PREFIX}/etc/mail
148	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/	158	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
149	.if !defined(WITHOUT_FILTER)	159	.if ${PORT_OPTIONS:MFILTER}
150	@${CAT} ${PKGMESSAGE}	160	@${CAT} ${PKGMESSAGE}
151	.endif	161	.endif
152		162
153	regression-test: build	163	regression-test: build
154	cd ${WRKSRC} ; ${MAKE} check	164	cd ${WRKSRC} ; ${MAKE} check
155		165
156	.include <bsd.port.post.mk>	166	.include <bsd.port.mk>




# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
# $FreeBSD$

# This file is used to tune build time options.
# Please refer FEATURES file distributed with the source for details.
#
# $FreeBSD$
#

.if ${PORT_OPTIONS:MADSP_LISTS}
CONFIGURE_ARGS+=	--enable-adsp_lists
.endif

.if ${PORT_OPTIONS:MALLSYMBOLS}
CONFIGURE_ARGS+=	--enable-allsymbols
.endif

.if ${PORT_OPTIONS:MATPS}
WITH_XTAGS=		yes
CONFIGURE_ARGS+=	--enable-atps
MAN8+=			opendkim-atpszone.8
PLIST_SUB+=		ATPS=""

PLIST_SUB+=		ATPS="@comment "
.endif

.if ${PORT_OPTIONS:MCODECOVERAGE}
CONFIGURE_ARGS+=	--enable-codecoverage
.endif

.if ${PORT_OPTIONS:MDB_HANDLE_POOLS}
CONFIGURE_ARGS+=	--enable-db_handle_pools
.endif

.if ${PORT_OPTIONS:MDEFAULT_SENDER}
CONFIGURE_ARGS+=	--enable-default_sender
.endif

.if ${PORT_OPTIONS:MDIFFHEADERS}
CONFIGURE_ARGS+=	--enable-diffheaders
LIB_DEPENDS+=		tre:${PORTSDIR}/textproc/libtre
.else
CONFIGURE_ARGS+=	--without-tre
.endif

.if ${PORT_OPTIONS:MDKIM_REPUTATION}
CONFIGURE_ARGS+=	--enable-dkim_reputation
MAN3+=			dkim-rep.3
PLIST_SUB+=		DKIMREP=""

PLIST_SUB+=		DKIMREP="@comment "
.endif

.if ${PORT_OPTIONS:MERLANG}
BUILD_DEPENDS+=		erl:${PORTSDIR}/lang/erlang
CONFIGURE_ARGS+=	--with-erlang
.else
CONFIGURE_ARGS+=	--without-erlang
.endif

.if ${PORT_OPTIONS:MIDENTITY_HEADER}
CONFIGURE_ARGS+=	--enable-identity_header
.endif

.if ${PORT_OPTIONS:MLDAP_CACHING}
WITH_OPENLDAP=		yes
CONFIGURE_ARGS+=	--enable-ldap_caching
.endif

.if ${PORT_OPTIONS:MPOSTGRES_RECONNECT_HACK}
CONFIGURE_ARGS+=	--enable-postgresql_reconnect_hack
WITH_LUA=		yes
.endif

.if ${PORT_OPTIONS:MRATE_LIMIT}
CONFIGURE_ARGS+=	--enable-oversign
.endif

.if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME)
CONFIGURE_ARGS+=	--enable-parsetime
.endif

.if defined(WITH_POSTGRES_RECONNECT_HACK) && !defined(WITHOUT_POSTGRES_RECONNECT_HACK)
CONFIGURE_ARGS+=	--enable-postgres_reconnect_hack
.endif

.if defined(WITH_RATE_LIMIT) || defined(WITH_RESIGN)
CONFIGURE_ARGS+=	--enable-rate_limit
.endif

.if ${PORT_OPTIONS:MRBL}
CONFIGURE_ARGS+=	--enable-rbl
MAN3+=			rbl.3
PLIST_SUB+=		RBL=""

PLIST_SUB+=		RBL="@comment "
.endif

.if ${PORT_OPTIONS:MREDIRECT}
CONFIGURE_ARGS+=	--enable-redirect
.endif

.if ${PORT_OPTIONS:MREPLACE_RULES}
CONFIGURE_ARGS+=	--enable-replace_rules
.endif

.if ${PORT_OPTIONS:MREPRRD}
CONFIGURE_ARGS+=	--enable-reprrd
MAN8+=			opendkim-reprrdimport.8
PLIST_SUB+=		REPRRD=""
BUILD_DEPENDS=		rrdtool>=0:${PORTSDIR}/databases/rrdtool
.else
CONFIGURE_ARGS+=	--disable-reprrd
PLIST_SUB+=		REPRRD="@comment "
.endif

.if ${PORT_OPTIONS:MREPUTATION}
CONFIGURE_ARGS+=	--enable-reputation \
			--with-libcurl
LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
. if ${PORT_OPTIONS:MXML}
CONFIGURE_ARGS+=	--with-libxml2
LIB_DEPENDS+=		xml2:${PORTSDIR}/devel/libxml2
. else
CONFIGURE_ARGS+=	--with-libjansson
LIB_DEPENDS+=		jansson:${PORTSDIR}/devel/jansson
. endif
MAN3+=			ut.3
MAN8+=			opendkim-genrates.8 opendkim-modtotals.8 \
			opendkim-rephistory.8
PLIST_SUB+=		REPUTE=""
.else
CONFIGURE_ARGS+=	--without-libcurl
PLIST_SUB+=		REPUTE="@comment "
.endif

.if ${PORT_OPTIONS:MRESIGN}
CONFIGURE_ARGS+=	--enable-reputation_cache
.endif

.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
CONFIGURE_ARGS+=	--enable-resign
.endif

.if ${PORT_OPTIONS:MSENDER_MACRO}
CONFIGURE_ARGS+=	--enable-select_canonicalization
.endif

.if defined(WITH_SELECTOR_HEADER) && !defined(WITHOUT_SELECTOR_HEADER)
CONFIGURE_ARGS+=	--enable-selector_header
.endif

.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO)
CONFIGURE_ARGS+=	--enable-sender_macro
.endif

.if ${PORT_OPTIONS:MSOCKETDB}
CONFIGURE_ARGS+=	--enable-socketdb
MAN1+=			opendkim-spam.1
MAN8+=			opendkim-stats.8
PLIST_SUB+=		STATS=""
.else
PLIST_SUB+=		STATS="@comment "
.endif

.if ${PORT_OPTIONS:MSTATSEXT}
CONFIGURE_ARGS+=	--enable-statsext
.endif

.if ${PORT_OPTIONS:MVBR}
CONFIGURE_ARGS+=	--enable-vbr
MAN3+=			vbr.3
PLIST_SUB+=		VBR=""
.else
PLIST_SUB+=		VBR="@comment "
.endif

.if defined(WITH_XTAGS) && !defined(WITHOUT_XTAGS)
CONFIGURE_ARGS+=	--enable-xtags
.endif




# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
# $FreeBSD$

# This file is used to tune build time options.
# Please refer FEATURES file distributed with the source for details.

OPTIONS_DEFINE+=	FFR
FFR_DESC=		Use features marked as For-Future-Releases

OPTIONS_MULTI+=		FFR
OPTIONS_MULTI_FFR=	ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \
			DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \
			DKIM_REPUTATION ERLANG IDENTITY_HEADER \
			LDAP_CACHING POSTGRES_RECONNECT_HACK \
			RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \
			REPUTATION RESIGN SENDER_MACRO SOCKETDB \
			STATSEXT VBR

ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
ALLSYMBOLS_DESC=		Export internal symbols for test
ATPS_DESC=			Authorized Third Party Sign check
CODECOVERAGE_DESC=		Include coverage/profile code
DB_HANDLE_POOLS_DESC=		Database handle pools (experimental)
DEFAULT_SENDER_DESC=		Default sender address
DIFFHEADERS_DESC=		Compare signed and verified headers (experimental)
DKIM_REPUTATION_DESC=		DKIM reputation check (experimental)
ERLANG_DESC=			Support for Erlang datasets
IDENTITY_HEADER_DESC=		Special header to set identity
LDAP_CACHING_DESC=		LDAP query piggybacking and caching
POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
RATE_LIMIT_DESC=		DKIM based rate limiting support
RBL_DESC=			Realtime Blacklist query support
REDIRECT_DESC=			Redirecting failed verification to a mailbox
REPLACE_RULES_DESC=		String substition when signing
REPRRD_DESC=			Support for collaborative reputation that uses rrdtool (experimental)
REPUTATION_DESC=		Reputation check (experimental)
RESIGN_DESC=			One-step resigning
SENDER_MACRO_DESC=		Macro to determine sender
SOCKETDB_DESC=			Arbitrary socket data sets
STATSEXT_DESC=			Extended stats
VBR_DESC=			Vouch-By-Reference support

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (opendkim-2.5.2.tar.gz) = fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9	1	SHA256 (opendkim-2.7.1.tar.gz) = 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed
2	SIZE (opendkim-2.5.2.tar.gz) = 1475225	2	SIZE (opendkim-2.7.1.tar.gz) = 1153665




--- ./libopendkim/dkim.c.orig	2012-10-19 05:22:16.000000000 +0900
+++ ./libopendkim/dkim.c	2012-10-20 15:52:54.000000000 +0900
@@ -938,7 +938,7 @@
 			dkim_dstring_cat(dkim->dkim_sslerrbuf, "; ");
 
 		dkim_dstring_cat(dkim->dkim_sslerrbuf,
-		                 gnutls_strerror(status));
+		                 (u_char *) gnutls_strerror(status));
 	}
 
 #else /* USE_GNUTLS */
@@ -1004,7 +1004,7 @@
 			dkim_dstring_cat(sig->sig_sslerrbuf, "; ");
 
 		dkim_dstring_cat(sig->sig_sslerrbuf,
-		                 gnutls_strerror(status));
+		                 (u_char *) gnutls_strerror(status));
 	}
 
 #else /* USE_GNUTLS */




@comment $FreeBSD$
%%LUA%%bin/miltertest
%%REPRRD%%bin/opendkim-reprrdimport
%%ODBX%%%%STATS%%bin/opendkim-spam
%%REPUTE%%bin/opendkim-genrates
bin/opendkim-genzone
%%REPUTE%%bin/opendkim-modtotals
%%STATS%%bin/opendkim-spam
%%STATS%%bin/opendkim-stats
bin/opendkim-testadsp
bin/opendkim-testkey
bin/opendkim-testmsg
etc/mail/opendkim.conf.sample
%%ARLIB%%include/async-resolv.h
%%DKIMREP%%include/dkim-rep/dkim-rep.h
include/opendkim/dkim.h
%%RBL%%include/rbl/rbl.h
%%REPRRD%%include/reprrd/reprrd.h
%%REPUTE%%include/repute/repute.h
%%REPUTE%%include/ut/ut.h
%%VBR%%include/vbr/vbr.h
%%ARLIB%%lib/libar.a
%%ARLIB%%lib/libar.la
%%ARLIB%%lib/libar.so
%%ARLIB%%lib/libar.so.2
%%DKIMREP%%lib/libdkimrep.a
%%DKIMREP%%lib/libdkimrep.la
%%DKIMREP%%lib/libdkimrep.so

lib/libopendkim.a
lib/libopendkim.la
lib/libopendkim.so
lib/libopendkim.so.8
%%RBL%%lib/librbl.a
%%RBL%%lib/librbl.la
%%RBL%%lib/librbl.so
%%RBL%%lib/librbl.so.1
%%REPRRD%%lib/libreprrd.a
%%REPRRD%%lib/libreprrd.la
%%REPRRD%%lib/libreprrd.so
%%REPRRD%%lib/libreprrd.so.1
%%REPUTE%%lib/librepute.a
%%REPUTE%%lib/librepute.la
%%REPUTE%%lib/librepute.so

%%VBR%%lib/libvbr.la
%%VBR%%lib/libvbr.so
%%VBR%%lib/libvbr.so.2
%%ARLIB%%libdata/pkgconfig/ar.pc
%%DKIMREP%%libdata/pkgconfig/dkim-rep.pc
libdata/pkgconfig/opendkim.pc
%%RBL%%libdata/pkgconfig/rbl.pc

%%REPUTE%%libdata/pkgconfig/ut.pc
%%VBR%%libdata/pkgconfig/vbr.pc
%%FILTER%%sbin/opendkim
%%ATPS%%sbin/opendkim-atpszone
%%STATS%%sbin/opendkim-expire
%%STATS%%sbin/opendkim-gengraphs
sbin/opendkim-genkey
%%REPUTE%%sbin/opendkim-genrates
%%STATS%%sbin/opendkim-genstats
sbin/opendkim-genzone
%%ODBX%%%%STATS%%sbin/opendkim-importstats
%%REPUTE%%sbin/opendkim-modtotals
%%REPUTE%%sbin/opendkim-rephistory
%%STATS%%sbin/opendkim-reportstats
%%STATS%%sbin/opendkim-stats
sbin/opendkim-testadsp
sbin/opendkim-testkey
sbin/opendkim-testmsg
%%VBR%%@dirrm include/vbr
%%REPUTE%%@dirrm include/ut
%%REPUTE%%@dirrm include/repute
%%REPRRD%%@dirrm include/reprrd
%%RBL%%@dirrm include/rbl
@dirrm include/opendkim
%%DKIMREP%%@dirrm include/dkim-rep
@dirrmtry etc/mail

Return to bug 173226

Lines 1-22 Link Here

(-)Makefile.features (-66 / +58 lines)
1	# Makefile.features	1	# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
2	# Author: Hirohisa Yamaguchi <umq@ueo.co.jp>	2	# $FreeBSD$
3	#	3
4	# This file is used to tune build time options.	4	# This file is used to tune build time options.
5	# Please refer FEATURES file distributed with the source for details.	5	# Please refer FEATURES file distributed with the source for details.
6	#
7	# $FreeBSD$
8	#
9		6
10	.if defined(WITH_ADSP_LISTS) && !defined(WITHOUT_ADSP_LISTS)	7	.if ${PORT_OPTIONS:MADSP_LISTS}
11	CONFIGURE_ARGS+= --enable-adsp_lists	8	CONFIGURE_ARGS+= --enable-adsp_lists
12	.endif	9	.endif
13		10
14	.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)	11	.if ${PORT_OPTIONS:MALLSYMBOLS}
15	CONFIGURE_ARGS+= --enable-allsymbols	12	CONFIGURE_ARGS+= --enable-allsymbols
16	.endif	13	.endif
17		14
18	.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS)	15	.if ${PORT_OPTIONS:MATPS}
19	WITH_XTAGS= yes
20	CONFIGURE_ARGS+= --enable-atps	16	CONFIGURE_ARGS+= --enable-atps
21	MAN8+= opendkim-atpszone.8	17	MAN8+= opendkim-atpszone.8
22	PLIST_SUB+= ATPS=""	18	PLIST_SUB+= ATPS=""
Lines 24-47 Link Here
24	PLIST_SUB+= ATPS="@comment "	20	PLIST_SUB+= ATPS="@comment "
25	.endif	21	.endif
26		22
27	.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)	23	.if ${PORT_OPTIONS:MCODECOVERAGE}
28	CONFIGURE_ARGS+= --enable-codecoverage	24	CONFIGURE_ARGS+= --enable-codecoverage
29	.endif	25	.endif
30		26
31	.if defined(WITH_DB_HANDLE_POOLS) && !defined(WITHOUT_DB_HANDLE_POOLS)	27	.if ${PORT_OPTIONS:MDB_HANDLE_POOLS}
32	CONFIGURE_ARGS+= --enable-db_handle_pools	28	CONFIGURE_ARGS+= --enable-db_handle_pools
33	.endif	29	.endif
34		30
35	.if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER)	31	.if ${PORT_OPTIONS:MDEFAULT_SENDER}
36	CONFIGURE_ARGS+= --enable-default_sender	32	CONFIGURE_ARGS+= --enable-default_sender
37	.endif	33	.endif
38		34
39	.if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)	35	.if ${PORT_OPTIONS:MDIFFHEADERS}
40	CONFIGURE_ARGS+= --enable-diffheaders	36	CONFIGURE_ARGS+= --enable-diffheaders
41	LIB_DEPENDS+= tre:${PORTSDIR}/textproc/libtre	37	LIB_DEPENDS+= tre:${PORTSDIR}/textproc/libtre
		38	.else
		39	CONFIGURE_ARGS+= --without-tre
42	.endif	40	.endif
43		41
44	.if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION)	42	.if ${PORT_OPTIONS:MDKIM_REPUTATION}
45	CONFIGURE_ARGS+= --enable-dkim_reputation	43	CONFIGURE_ARGS+= --enable-dkim_reputation
46	MAN3+= dkim-rep.3	44	MAN3+= dkim-rep.3
47	PLIST_SUB+= DKIMREP=""	45	PLIST_SUB+= DKIMREP=""
Lines 49-85 Link Here
49	PLIST_SUB+= DKIMREP="@comment "	47	PLIST_SUB+= DKIMREP="@comment "
50	.endif	48	.endif
51		49
52	.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)	50	.if ${PORT_OPTIONS:MERLANG}
		51	BUILD_DEPENDS+= erl:${PORTSDIR}/lang/erlang
		52	CONFIGURE_ARGS+= --with-erlang
		53	.else
		54	CONFIGURE_ARGS+= --without-erlang
		55	.endif
		56
		57	.if ${PORT_OPTIONS:MIDENTITY_HEADER}
53	CONFIGURE_ARGS+= --enable-identity_header	58	CONFIGURE_ARGS+= --enable-identity_header
54	.endif	59	.endif
55		60
56	.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING)	61	.if ${PORT_OPTIONS:MLDAP_CACHING}
57	WITH_OPENLDAP= yes	62	WITH_OPENLDAP= yes
58	CONFIGURE_ARGS+= --enable-ldap_caching	63	CONFIGURE_ARGS+= --enable-ldap_caching
59	.endif	64	.endif
60		65
61	.if defined(WITH_LUA_GLOBALS) && !defined(WITHOUT_LUA_GLOBALS)	66	.if ${PORT_OPTIONS:MPOSTGRES_RECONNECT_HACK}
62	CONFIGURE_ARGS+= --enable-lua_globals	67	CONFIGURE_ARGS+= --enable-postgresql_reconnect_hack
63	WITH_LUA= yes
64	.endif	68	.endif
65		69
66	.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN)	70	.if ${PORT_OPTIONS:MRATE_LIMIT}
67	CONFIGURE_ARGS+= --enable-oversign
68	.endif
69
70	.if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME)
71	CONFIGURE_ARGS+= --enable-parsetime
72	.endif
73
74	.if defined(WITH_POSTGRES_RECONNECT_HACK) && !defined(WITHOUT_POSTGRES_RECONNECT_HACK)
75	CONFIGURE_ARGS+= --enable-postgres_reconnect_hack
76	.endif
77
78	.if defined(WITH_RATE_LIMIT) \|\| defined(WITH_RESIGN)
79	CONFIGURE_ARGS+= --enable-rate_limit	71	CONFIGURE_ARGS+= --enable-rate_limit
80	.endif	72	.endif
81		73
82	.if defined(WITH_RBL) && !defined(WITHOUT_RBL)	74	.if ${PORT_OPTIONS:MRBL}
83	CONFIGURE_ARGS+= --enable-rbl	75	CONFIGURE_ARGS+= --enable-rbl
84	MAN3+= rbl.3	76	MAN3+= rbl.3
85	PLIST_SUB+= RBL=""	77	PLIST_SUB+= RBL=""
Lines 87-150 Link Here
87	PLIST_SUB+= RBL="@comment "	79	PLIST_SUB+= RBL="@comment "
88	.endif	80	.endif
89		81
90	.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT)	82	.if ${PORT_OPTIONS:MREDIRECT}
91	CONFIGURE_ARGS+= --enable-redirect	83	CONFIGURE_ARGS+= --enable-redirect
92	.endif	84	.endif
93		85
94	.if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES)	86	.if ${PORT_OPTIONS:MREPLACE_RULES}
95	CONFIGURE_ARGS+= --enable-replace_rules	87	CONFIGURE_ARGS+= --enable-replace_rules
96	.endif	88	.endif
97		89
98	.if defined(WITH_REPUTATION) && !defined(WITHOUT_REPUTATION)	90	.if ${PORT_OPTIONS:MREPRRD}
99	CONFIGURE_ARGS+= --enable-reputation	91	CONFIGURE_ARGS+= --enable-reprrd
		92	MAN8+= opendkim-reprrdimport.8
		93	PLIST_SUB+= REPRRD=""
		94	BUILD_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool
		95	.else
		96	CONFIGURE_ARGS+= --disable-reprrd
		97	PLIST_SUB+= REPRRD="@comment "
		98	.endif
		99
		100	.if ${PORT_OPTIONS:MREPUTATION}
		101	CONFIGURE_ARGS+= --enable-reputation \
		102	--with-libcurl
		103	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
		104	. if ${PORT_OPTIONS:MXML}
		105	CONFIGURE_ARGS+= --with-libxml2
		106	LIB_DEPENDS+= xml2:${PORTSDIR}/devel/libxml2
		107	. else
		108	CONFIGURE_ARGS+= --with-libjansson
		109	LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson
		110	. endif
100	MAN3+= ut.3	111	MAN3+= ut.3
101	MAN8+= opendkim-genrates.8 opendkim-modtotals.8	112	MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \
		113	opendkim-rephistory.8
102	PLIST_SUB+= REPUTE=""	114	PLIST_SUB+= REPUTE=""
103	.else	115	.else
		116	CONFIGURE_ARGS+= --without-libcurl
104	PLIST_SUB+= REPUTE="@comment "	117	PLIST_SUB+= REPUTE="@comment "
105	.endif	118	.endif
106		119
107	.if defined(WITH_REPUTATION_CACHE) && !defined(WITHOUT_REPUTATION_CACHE)	120	.if ${PORT_OPTIONS:MRESIGN}
108	CONFIGURE_ARGS+= --enable-reputation_cache
109	.endif
110
111	.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
112	CONFIGURE_ARGS+= --enable-resign	121	CONFIGURE_ARGS+= --enable-resign
113	.endif	122	.endif
114		123
115	.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)	124	.if ${PORT_OPTIONS:MSENDER_MACRO}
116	CONFIGURE_ARGS+= --enable-select_canonicalization
117	.endif
118
119	.if defined(WITH_SELECTOR_HEADER) && !defined(WITHOUT_SELECTOR_HEADER)
120	CONFIGURE_ARGS+= --enable-selector_header
121	.endif
122
123	.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO)
124	CONFIGURE_ARGS+= --enable-sender_macro	125	CONFIGURE_ARGS+= --enable-sender_macro
125	.endif	126	.endif
126		127
127	.if defined(WITH_STATS) \|\| defined(WITH_STATSEXT)	128	.if ${PORT_OPTIONS:MSOCKETDB}
128	CONFIGURE_ARGS+= --enable-stats	129	CONFIGURE_ARGS+= --enable-socketdb
129	MAN1+= opendkim-spam.1
130	MAN8+= opendkim-stats.8
131	PLIST_SUB+= STATS=""
132	.else
133	PLIST_SUB+= STATS="@comment "
134	.endif	130	.endif
135		131
136	.if defined(WITH_STATSEXT) && !defined(WITHOUT_STATSEXT)	132	.if ${PORT_OPTIONS:MSTATSEXT}
137	CONFIGURE_ARGS+= --enable-statsext	133	CONFIGURE_ARGS+= --enable-statsext
138	.endif	134	.endif
139		135
140	.if defined(WITH_VBR) && !defined(WITHOUT_VBR)	136	.if ${PORT_OPTIONS:MVBR}
141	CONFIGURE_ARGS+= --enable-vbr	137	CONFIGURE_ARGS+= --enable-vbr
142	MAN3+= vbr.3	138	MAN3+= vbr.3
143	PLIST_SUB+= VBR=""	139	PLIST_SUB+= VBR=""
144	.else	140	.else
145	PLIST_SUB+= VBR="@comment "	141	PLIST_SUB+= VBR="@comment "
146	.endif	142	.endif
147
148	.if defined(WITH_XTAGS) && !defined(WITHOUT_XTAGS)
149	CONFIGURE_ARGS+= --enable-xtags
150	.endif

Line 0 Link Here

(-)Makefile.options (+41 lines)
	1	# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
	2	# $FreeBSD$
	3
	4	# This file is used to tune build time options.
	5	# Please refer FEATURES file distributed with the source for details.
	6
	7	OPTIONS_DEFINE+= FFR
	8	FFR_DESC= Use features marked as For-Future-Releases
	9
	10	OPTIONS_MULTI+= FFR
	11	OPTIONS_MULTI_FFR= ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \
	12	DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \
	13	DKIM_REPUTATION ERLANG IDENTITY_HEADER \
	14	LDAP_CACHING POSTGRES_RECONNECT_HACK \
	15	RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \
	16	REPUTATION RESIGN SENDER_MACRO SOCKETDB \
	17	STATSEXT VBR
	18
	19	ADSP_LISTS_DESC= ADSP filtering for lists (experimental)
	20	ALLSYMBOLS_DESC= Export internal symbols for test
	21	ATPS_DESC= Authorized Third Party Sign check
	22	CODECOVERAGE_DESC= Include coverage/profile code
	23	DB_HANDLE_POOLS_DESC= Database handle pools (experimental)
	24	DEFAULT_SENDER_DESC= Default sender address
	25	DIFFHEADERS_DESC= Compare signed and verified headers (experimental)
	26	DKIM_REPUTATION_DESC= DKIM reputation check (experimental)
	27	ERLANG_DESC= Support for Erlang datasets
	28	IDENTITY_HEADER_DESC= Special header to set identity
	29	LDAP_CACHING_DESC= LDAP query piggybacking and caching
	30	POSTGRES_RECONNECT_HACK_DESC= PostgreSQL connection error detection bug hack
	31	RATE_LIMIT_DESC= DKIM based rate limiting support
	32	RBL_DESC= Realtime Blacklist query support
	33	REDIRECT_DESC= Redirecting failed verification to a mailbox
	34	REPLACE_RULES_DESC= String substition when signing
	35	REPRRD_DESC= Support for collaborative reputation that uses rrdtool (experimental)
	36	REPUTATION_DESC= Reputation check (experimental)
	37	RESIGN_DESC= One-step resigning
	38	SENDER_MACRO_DESC= Macro to determine sender
	39	SOCKETDB_DESC= Arbitrary socket data sets
	40	STATSEXT_DESC= Extended stats
	41	VBR_DESC= Vouch-By-Reference support

Line 0 Link Here

(-)files/patch-libopendkim__dkim.c (+20 lines)
	1	--- ./libopendkim/dkim.c.orig 2012-10-19 05:22:16.000000000 +0900
	2	+++ ./libopendkim/dkim.c 2012-10-20 15:52:54.000000000 +0900
	3	@@ -938,7 +938,7 @@
	4	dkim_dstring_cat(dkim->dkim_sslerrbuf, "; ");
	5
	6	dkim_dstring_cat(dkim->dkim_sslerrbuf,
	7	- gnutls_strerror(status));
	8	+ (u_char *) gnutls_strerror(status));
	9	}
	10
	11	#else /* USE_GNUTLS */
	12	@@ -1004,7 +1004,7 @@
	13	dkim_dstring_cat(sig->sig_sslerrbuf, "; ");
	14
	15	dkim_dstring_cat(sig->sig_sslerrbuf,
	16	- gnutls_strerror(status));
	17	+ (u_char *) gnutls_strerror(status));
	18	}
	19
	20	#else /* USE_GNUTLS */

Lines 1-27 Link Here

(-)pkg-plist (-17 / +29 lines)
1	@comment $FreeBSD$	1	@comment $FreeBSD$
2	%%LUA%%bin/miltertest	2	%%LUA%%bin/miltertest
3	%%ATPS%%bin/opendkim-atpszone	3	%%REPRRD%%bin/opendkim-reprrdimport
4	bin/opendkim-genkey	4	%%ODBX%%%%STATS%%bin/opendkim-spam
5	%%REPUTE%%bin/opendkim-genrates
6	bin/opendkim-genzone
7	%%REPUTE%%bin/opendkim-modtotals
8	%%STATS%%bin/opendkim-spam
9	%%STATS%%bin/opendkim-stats
10	bin/opendkim-testadsp
11	bin/opendkim-testkey
12	bin/opendkim-testmsg
13	etc/mail/opendkim.conf.sample	5	etc/mail/opendkim.conf.sample
14	%%ARLIB%%include/async-resolv.h
15	%%DKIMREP%%include/dkim-rep/dkim-rep.h	6	%%DKIMREP%%include/dkim-rep/dkim-rep.h
16	include/opendkim/dkim.h	7	include/opendkim/dkim.h
17	%%RBL%%include/rbl/rbl.h	8	%%RBL%%include/rbl/rbl.h
		9	%%REPRRD%%include/reprrd/reprrd.h
18	%%REPUTE%%include/repute/repute.h	10	%%REPUTE%%include/repute/repute.h
19	%%REPUTE%%include/ut/ut.h	11	%%REPUTE%%include/ut/ut.h
20	%%VBR%%include/vbr/vbr.h	12	%%VBR%%include/vbr/vbr.h
21	%%ARLIB%%lib/libar.a
22	%%ARLIB%%lib/libar.la
23	%%ARLIB%%lib/libar.so
24	%%ARLIB%%lib/libar.so.2
25	%%DKIMREP%%lib/libdkimrep.a	13	%%DKIMREP%%lib/libdkimrep.a
26	%%DKIMREP%%lib/libdkimrep.la	14	%%DKIMREP%%lib/libdkimrep.la
27	%%DKIMREP%%lib/libdkimrep.so	15	%%DKIMREP%%lib/libdkimrep.so
Lines 29-39 Link Here
29	lib/libopendkim.a	17	lib/libopendkim.a
30	lib/libopendkim.la	18	lib/libopendkim.la
31	lib/libopendkim.so	19	lib/libopendkim.so
32	lib/libopendkim.so.6	20	lib/libopendkim.so.8
33	%%RBL%%lib/librbl.a	21	%%RBL%%lib/librbl.a
34	%%RBL%%lib/librbl.la	22	%%RBL%%lib/librbl.la
35	%%RBL%%lib/librbl.so	23	%%RBL%%lib/librbl.so
36	%%RBL%%lib/librbl.so.1	24	%%RBL%%lib/librbl.so.1
		25	%%REPRRD%%lib/libreprrd.a
		26	%%REPRRD%%lib/libreprrd.la
		27	%%REPRRD%%lib/libreprrd.so
		28	%%REPRRD%%lib/libreprrd.so.1
37	%%REPUTE%%lib/librepute.a	29	%%REPUTE%%lib/librepute.a
38	%%REPUTE%%lib/librepute.la	30	%%REPUTE%%lib/librepute.la
39	%%REPUTE%%lib/librepute.so	31	%%REPUTE%%lib/librepute.so
Lines 46-52 Link Here
46	%%VBR%%lib/libvbr.la	38	%%VBR%%lib/libvbr.la
47	%%VBR%%lib/libvbr.so	39	%%VBR%%lib/libvbr.so
48	%%VBR%%lib/libvbr.so.2	40	%%VBR%%lib/libvbr.so.2
49	%%ARLIB%%libdata/pkgconfig/ar.pc
50	%%DKIMREP%%libdata/pkgconfig/dkim-rep.pc	41	%%DKIMREP%%libdata/pkgconfig/dkim-rep.pc
51	libdata/pkgconfig/opendkim.pc	42	libdata/pkgconfig/opendkim.pc
52	%%RBL%%libdata/pkgconfig/rbl.pc	43	%%RBL%%libdata/pkgconfig/rbl.pc
Lines 54-58 Link Here
54	%%REPUTE%%libdata/pkgconfig/ut.pc	45	%%REPUTE%%libdata/pkgconfig/ut.pc
55	%%VBR%%libdata/pkgconfig/vbr.pc	46	%%VBR%%libdata/pkgconfig/vbr.pc
56	%%FILTER%%sbin/opendkim	47	%%FILTER%%sbin/opendkim
		48	%%ATPS%%sbin/opendkim-atpszone
		49	%%STATS%%sbin/opendkim-expire
		50	%%STATS%%sbin/opendkim-gengraphs
		51	sbin/opendkim-genkey
		52	%%REPUTE%%sbin/opendkim-genrates
		53	%%STATS%%sbin/opendkim-genstats
		54	sbin/opendkim-genzone
		55	%%ODBX%%%%STATS%%sbin/opendkim-importstats
		56	%%REPUTE%%sbin/opendkim-modtotals
		57	%%REPUTE%%sbin/opendkim-rephistory
		58	%%STATS%%sbin/opendkim-reportstats
		59	%%STATS%%sbin/opendkim-stats
		60	sbin/opendkim-testadsp
		61	sbin/opendkim-testkey
		62	sbin/opendkim-testmsg
		63	%%VBR%%@dirrm include/vbr
		64	%%REPUTE%%@dirrm include/ut
		65	%%REPUTE%%@dirrm include/repute
		66	%%REPRRD%%@dirrm include/reprrd
		67	%%RBL%%@dirrm include/rbl
57	@dirrm include/opendkim	68	@dirrm include/opendkim
		69	%%DKIMREP%%@dirrm include/dkim-rep
58	@dirrmtry etc/mail	70	@dirrmtry etc/mail