Attachment #144054 for bug #191286

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




# $FreeBSD$

PORTNAME=		opendkim
PORTVERSION=		2.9.2
PORTREVISION=		1
CATEGORIES=		mail security
MASTER_SITES=		SF
MASTER_SITE_SUBDIR=	${PORTNAME} \


GNU_CONFIGURE=	yes
NO_OPTIONS_SORT=yes
USES=		pkgconfig perl5 shebangfix libtool
USE_PERL5=	run
SHEBANG_FILES=	opendkim/opendkim-genkey.in
SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-*


PORTDOCS=	*

CONFIGURE_ARGS+=	--without-tre

OPTIONS_SUB=		yes
OPTIONS_SINGLE=		RESOLV
OPTIONS_SINGLE_RESOLV=	STOCK_RESOLVER UNBOUND
OPTIONS_DEFINE=		FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \
			BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL
OPTIONS_DEFAULT=	FILTER LUA UNBOUND

STOCK_RESOLVER_DESC=	Use the stock resolver library

UNBOUND_DESC=		Use unbound DNS library
UNBOUND_CONFIGURE_WITH=	unbound
UNBOUND_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound

FILTER_DESC=		OpenDKIM filter, requires libmilter/Sendmail
FILTER_USE=		RC_SUBR=milter-opendkim

CURL_DESC=		Use cURL for web queries
CURL_CONFIGURE_WITH=	libcurl
CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl

GNUTLS_DESC=		Use GnuTLS instead of OpenSSL
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_WITH=	gnutls
GNUTLS_CONFIGURE_OFF=	--with-openssl=${OPENSSLBASE}

JANSSON_DESC=		Statistics and other output as JSON data
JANSSON_CONFIGURE_WITH=	libjansson
JANSSON_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson

LDNS_DESC=		Use LDNS library for DNS queries
LDNS_CONFIGURE_WITH=	ldns
LDNS_LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns

LMDB_DESC=		Use Lightning Memory-Mapped DB key-value store
LMDB_CONFIGURE_WITH=	lmdb
LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb

LUA_DESC=		Describe filter policy with lua
LUA_CONFIGURE_WITH=	lua
LUA_USES=		lua

MEMCACHED_DESC=		Use memcached as a data set
MEMCACHED_CONFIGURE_WITH=	libmemcached
MEMCACHED_LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached

BDB_BASE_DESC=		Use Berkeley DB from base

OPENDBX_DESC=		Store filter policies via OpenDBX
OPENDBX_CONFIGURE_WITH=	odbx
OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx

OPENLDAP_DESC=		Store filter policies in LDAP
OPENLDAP_CONFIGURE_WITH=openldap
OPENLDAP_USE=		OPENLDAP=yes

POPAUTH_DESC=		Use POP authentication DB
POPAUTH_CONFIGURE_ENABLE=	popauth

QUERY_CACHE_DESC=	Cache DNS query results locally
QUERY_CACHE_CONFIGURE_ENABLE=	query_cache
DEBUG_DESC=		Build with debug symbols

SASL_DESC=		Enable SASL authentication with LDAP
SASL_CONFIGURE_WITH=	sasl

DOCS_CONFIGURE_ON=	--docdir=${WRKDIR}/doc

MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}

.include "${.CURDIR}/Makefile.options"

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSASL} && ${PORT_OPTIONS:MOPENLDAP}
WANT_OPENLDAP_SASL=	yes
.endif

.if ${PORT_OPTIONS:MFILTER}
USE_RC_SUBR=		milter-opendkim
PLIST_SUB+=		FILTER=""
SUB_FILES=		pkg-message
WITHOUT_MILTER_CFLAGS=	yes
WITHOUT_MILTER_LDFLAGS=	yes
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
.else
CONFIGURE_ARGS+=	--disable-filter
PLIST_SUB+=		FILTER="@comment "
.endif

.if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} || \
    ${PORT_OPTIONS:MRBL}
.if !${PORT_OPTIONS:MLUA}
IGNORE= Options LUA_ONLY_SIGNING and RBL require LUA as well
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
.endif
.endif

.if ${PORT_OPTIONS:MREPUTATION}
.if !${PORT_OPTIONS:MCURL} || !${PORT_OPTIONS:MJANNSON}
IGNORE= Option REPUTATION requires CURL and JANSSON as well
CONFIGURE_ARGS+=	--enable-debug
.endif
.endif

.if ${PORT_OPTIONS:MSTATSEXT}
.if !${PORT_OPTIONS:MSTATS} || !${PORT_OPTIONS:MLUA}
IGNORE= Option STATSEXT requires STATS and LUA as well
.endif
.endif

.if ${PORT_OPTIONS:MPOPAUTH}             \
	|| ${PORT_OPTIONS:MQUERY_CACHE}  \
	|| ${PORT_OPTIONS:MLDAP_CACHING} \
	|| ${PORT_OPTIONS:MREPUTATION}   \
PLIST_SUB+=		STATS="@comment "
.endif
.if ${PORT_OPTIONS:MPOPAUTH} \
	|| ${PORT_OPTIONS:MQUERY_CACHE} \
	|| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MLDAP_CACHING} ) \
	|| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MREPUTATION} ) \
	|| ${PORT_OPTIONS:MSTATS}
. if ${PORT_OPTIONS:MBDB_BASE}
CONFIGURE_ARGS+=	--with-db-lib=c
. else
CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
			--with-db-libdir=${BDB_LIB_DIR}     \
			--with-db-lib=${BDB_LIB_NAME}
USE_BDB=		40+
. endif
.endif
.if ${PORT_OPTIONS:MUNBOUND}
CONFIGURE_ARGS+=	--with-unbound
LIB_DEPENDS+=		libunbound.so:${PORTSDIR}/dns/unbound
.endif
.if ${PORT_OPTIONS:MPOPAUTH}
CONFIGURE_ARGS+=	--enable-popauth
.endif
.if ${PORT_OPTIONS:MQUERY_CACHE}
CONFIGURE_ARGS+=	--enable-query_cache
.endif
.if ${PORT_OPTIONS:MMEMCACHED}
CONFIGURE_ARGS+=	--with-libmemcached
LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
.else
CONFIGURE_ARGS+=	--without-libmemcached
.endif
.if ${PORT_OPTIONS:MOPENDBX}
CONFIGURE_ARGS+=	--with-odbx
LIB_DEPENDS+=		libopendbx.so:${PORTSDIR}/databases/opendbx
PLIST_SUB+=		ODBX=""
.else
CONFIGURE_ARGS+=	--without-odbx
PLIST_SUB+=		ODBX="@comment "
.endif
.if ${PORT_OPTIONS:MOPENLDAP}
CONFIGURE_ARGS+=	--with-openldap
LIB_DEPENDS+=		libldap.so:${PORTSDIR}/net/openldap24-sasl-client
USE_OPENLDAP=		yes
.else
CONFIGURE_ARGS+=	--without-openldap
.endif
.if ${PORT_OPTIONS:MLUA}
CONFIGURE_ARGS+=	--with-lua
PLIST_SUB+=		LUA=""
USES+=			lua
.else
PLIST_SUB+=		LUA="@comment "
.endif

pre-configure:
	${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \
	    -e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/'		 \
	    -e '/PKG_CONFIG/s/cyrussasl/libsasl2/'			 \
	    ${WRKSRC}/configure

post-patch:
.if ${PORT_OPTIONS:MLCOV}

.endif

post-install:
.if ! ${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER}
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/opendkim
.endif
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendkim.so.9
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
	    ${STAGEDIR}${PREFIX}/etc/mail/

regression-test: build
	cd ${WRKSRC} ; ${MAKE} check




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

.if ${PORT_OPTIONS:MFFR}

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

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

.if ${PORT_OPTIONS:MATPS}
CONFIGURE_ARGS+=	--enable-atps
MAN8+=			opendkim-atpszone.8
PLIST_SUB+=		ATPS=""
.else
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=""
.else
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:MLCOV}
BROKEN=			Does not install
BUILD_DEPENDS+=		lcov:${PORTSDIR}/devel/lcov \
			p5-GD>=0:${PORTSDIR}/graphics/p5-GD
CONFIGURE_ARGS+=	--with-lcov
.else
CONFIGURE_ARGS+=	--without-lcov
.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
.endif

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

.if ${PORT_OPTIONS:MRBL}
CONFIGURE_ARGS+=	--enable-rbl
MAN3+=			rbl.3
PLIST_SUB+=		RBL=""
PORT_OPTIONS+=		LUA
.else
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+=	--without-libjansson --with-libxml2
LIB_DEPENDS+=		xml2:${PORTSDIR}/textproc/libxml2
PLIST_SUB+=		JANSSON="@comment "
. else
CONFIGURE_ARGS+=	--with-libjansson
LIB_DEPENDS+=		jansson:${PORTSDIR}/devel/jansson
MAN8+=			autobuild.8
PLIST_SUB+=		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-resign
.endif

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

.if ${PORT_OPTIONS:MSOCKETDB}
CONFIGURE_ARGS+=	--enable-socketdb
.endif

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

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

.else # ${PORT_OPTIONS:MFFR}
PLIST_SUB+=		ATPS="@comment "
PLIST_SUB+=		DKIMREP="@comment "
PLIST_SUB+=		RBL="@comment "
PLIST_SUB+=		REPRRD="@comment "
PLIST_SUB+=		JANSSON="@comment "
PLIST_SUB+=		REPUTE="@comment "
PLIST_SUB+=		VBR="@comment "
.endif # ${PORT_OPTIONS:MFFR}




# $FreeBSD$

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

OPTIONS_GROUP+=		DEVELOPER
DEVELOPER_DESC=		Options useful for OpenDKIM development

OPTIONS_GROUP_DEVELOPER=	ALLSYMBOLS CODECOVERAGE DEBUG

ALLSYMBOLS_DESC=	Export all internal symbols for better test coverage
ALLSYMBOLS_CONFIGURE_ENABLE=	allsymbols

CODECOVERAGE_DESC=	Enable internal code-coverage/profiling
CODECOVERAGE_CONFIGURE_ENABLE=	codecoverage

DEBUG_DESC=		Build with debug symbols
DEBUG_CONFIGURE_ENABLE=	debug

## Please refer FEATURES file distributed with the source for details.

FFR_DESC=		Use features marked as For-Future-Releases

OPTIONS_GROUP+=		FFR

## _FFR_DNSSEC is referenced in the code, but does not appear to do
## anything much.

OPTIONS_GROUP_FFR=	ADSP_LISTS ATPS DB_HANDLE_POOLS \
			DEFAULT_SENDER DIFFHEADERS IDENTITY_HEADER \
			LDAP_CACHING POSTGRES_RECONNECT_HACK \
			RATE_LIMIT RBL REPLACE_RULES REPRRD \
			REPUTATION RESIGN SENDER_MACRO \
			SOCKETDB STATS STATSEXT VBR

ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
ADSP_LISTS_CONFIGURE_ENABLE=	adsp_lists

ATPS_DESC=			Authorized Third Party Sign check
ATPS_CONFIGURE_ENABLE=		atps

DB_HANDLE_POOLS_DESC=		Database handle pools (experimental)
DB_HANDLE_POOLS_CONFIGURE_ENABLE=	db_handle_pools

DEFAULT_SENDER_DESC=		Default sender address
DEFAULT_SENDER_CONFIGURE_ENABLE=default_sender

DIFFHEADERS_DESC=		Compare signed and verified headers (experimental)
DIFFHEADERS_CONFIGURE_ENABLE=	diffheaders

IDENTITY_HEADER_DESC=		Special header to set identity
IDENTITY_HEADER_CONFIGURE_ENABLE=	identity_header

LDAP_CACHING_DESC=		LDAP query piggybacking and caching
LDAP_CACHING_CONFIGURE_ENABLE=	ldap_caching
LDAP_CACHING_USE=		OPENLDAP=yes

LUA_ONLY_SIGNING=		Message signing by Lua only
LUA_ONLY_SIGNING_CONFIGURE_ENABLE=	lua_only_signing

POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
POSTGRES_RECONNECT_HACK_CONFIGURE_ENABLE=	postgresql_reconnect_hack

RATE_LIMIT_DESC=		DKIM based rate limiting support
RATE_LIMIT_CONFIGURE_ENABLE=	rate_limit

RBL_DESC=			Realtime Blacklist query support
RBL_CONFIGURE_ENABLE=		rbl

REPLACE_RULES_DESC=		String substition when signing
REPLACE_RULES_CONFIGURE_ENABLE=	replace_rules

REPRRD_DESC=			Support for collaborative reputation that uses rrdtool (experimental)
REPRRD_CONFIGURE_ENABLE=	reprrd
REPRRD_LIB_DEPENDS=		librrd.so:${PORTSDIR}/databases/rrdtool

REPUTATION_DESC=		Reputation check (experimental)
REPUTATION_CONFIGURE_ENABLE=	reputation

RESIGN_DESC=			One-step resigning
RESIGN_CONFIGURE_ENABLE=	resign

SENDER_MACRO_DESC=		Macro to determine sender
SENDER_MACRO_CONFIGURE_ENABLE=	sender_macro

SOCKETDB_DESC=			Arbitrary socket data sets
SOCKETDB_CONFIGURE_ENABLE=	socketdb

STATS_DESC=			Per-message and per-signature statistics
STATS_CONFIGURE_ENABLE=		stats

STATSEXT_DESC=			Localized stats extensions
STATSEXT_CONFIGURE_ENABLE=	statsext

VBR_DESC=			Vouch-By-Reference support
VBR_CONFIGURE_ENABLE=		vbr

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (opendkim-2.8.3.tar.gz) = eb36003b0d2d7514312c65db2b45afd9ce4d02744fbf4b2fe6f8e1e2893ce989	1	SHA256 (opendkim-2.9.2.tar.gz) = 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0
2	SIZE (opendkim-2.8.3.tar.gz) = 1182214	2	SIZE (opendkim-2.9.2.tar.gz) = 1229383

Lines 1-10 Link Here

(-)files/patch-librbl__rbl.c (-10 lines)
1	--- ./librbl/rbl.c.orig 2012-10-25 07:12:31.000000000 +0900
2	+++ ./librbl/rbl.c 2013-03-21 02:26:41.000000000 +0900
3	@@ -312,6 +312,7 @@
4
5	free(tmp);
6	#endif /* HAVE_RES_SETSERVERS */
7	+ return 0;
8	}
9
10	/*




--- ./opendkim/opendkim.c.orig	2013-03-20 03:02:40.000000000 +0900
+++ ./opendkim/opendkim.c	2013-03-21 02:47:29.000000000 +0900
@@ -12421,7 +12421,7 @@
 			{
 				syslog(LOG_INFO,
 				       "%s: can't parse default sender value '%s'",
-				       dfc->mctx_jobid, from);
+				       dfc->mctx_jobid, conf->conf_defsender);
 			}
 #endif /* _FFR_DEFAULT_SENDER */
 		}
@@ -14945,8 +14945,8 @@
 				for (c = 0; c < nsigs && domain == NULL; c++)
 				{
 					if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
-					    (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
-					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
+					    ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
+					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
 						continue;
 
 					cd = dkim_sig_getdomain(sigs[c]);
@@ -15121,8 +15121,8 @@
 				for (c = 0; c < nsigs; c++)
 				{
 					if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
-					    (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
-					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
+					    ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
+					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
 						continue;
 
 					checked = TRUE;




%%ATPS%%man/man8/opendkim-atpszone.8.gz
%%ATPS%%sbin/opendkim-atpszone
%%FILTER%%man/man5/opendkim.conf.5.gz
%%FILTER%%man/man8/opendkim.8.gz
%%FILTER%%sbin/opendkim
%%JANSSON%%bin/autobuild
%%JANSSON%%man/man8/autobuild.8.gz
%%LUA%%%%FILTER%%man/man3/opendkim-lua.3.gz
%%LUA%%bin/miltertest
%%LUA%%man/man3/opendkim-lua.3.gz
%%LUA%%man/man8/miltertest.8.gz
%%OPENDBX%%%%STATS%%bin/opendkim-spam
%%OPENDBX%%%%STATS%%sbin/opendkim-importstats
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
%%DKIMREP%%lib/libdkimrep.a
%%DKIMREP%%lib/libdkimrep.la
%%DKIMREP%%lib/libdkimrep.so
%%DKIMREP%%lib/libdkimrep.so.1
lib/libopendkim.a
lib/libopendkim.la
lib/libopendkim.so
lib/libopendkim.so.9
%%RBL%%lib/librbl.a
%%RBL%%lib/librbl.la
%%RBL%%lib/librbl.so
%%RBL%%lib/librbl.so.1
%%RBL%%libdata/pkgconfig/rbl.pc
%%RBL%%man/man3/rbl.3.gz
%%REPRRD%%bin/opendkim-reprrdimport
%%REPRRD%%include/reprrd/reprrd.h
%%REPRRD%%lib/libreprrd.a
%%REPRRD%%lib/libreprrd.la
%%REPRRD%%lib/libreprrd.so
%%REPRRD%%lib/libreprrd.so.1
%%REPRRD%%man/man8/opendkim-reprrdimport.8.gz
%%REPUTATION%%include/repute/repute.h
%%REPUTATION%%include/ut/ut.h
%%REPUTATION%%lib/librepute.a
%%REPUTATION%%lib/librepute.so
%%REPUTATION%%lib/librepute.so.1
%%REPUTATION%%lib/libut.a
%%REPUTATION%%lib/libut.so
%%REPUTATION%%lib/libut.so.1
%%REPUTATION%%libdata/pkgconfig/repute.pc
%%REPUTATION%%libdata/pkgconfig/ut.pc
%%REPUTATION%%man/man3/ut.3.gz
%%REPUTATION%%man/man8/opendkim-genrates.8.gz
%%REPUTATION%%man/man8/opendkim-modtotals.8.gz
%%REPUTATION%%man/man8/opendkim-rephistory.8.gz
%%REPUTATION%%sbin/opendkim-genrates
%%REPUTATION%%sbin/opendkim-modtotals
%%REPUTATION%%sbin/opendkim-rephistory
%%STATS%%%%OPENDBX%%man/man1/opendkim-spam.1.gz
%%STATS%%%%OPENDBX%%man/man8/opendkim-importstats.8.gz
%%STATS%%man/man8/opendkim-expire.8.gz
%%STATS%%man/man8/opendkim-gengraphs.8.gz
%%STATS%%man/man8/opendkim-genstats.8.gz
%%STATS%%man/man8/opendkim-stats.8.gz
%%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
%%VBR%%include/vbr/vbr.h
%%VBR%%lib/libvbr.a
%%VBR%%lib/libvbr.so
%%VBR%%lib/libvbr.so.2
%%VBR%%libdata/pkgconfig/vbr.pc
%%VBR%%man/man3/vbr.3.gz
@sample etc/mail/opendkim.conf.sample
include/opendkim/dkim.h
lib/libopendkim.a
lib/libopendkim.so
lib/libopendkim.so.9
lib/libopendkim.so.9.0.3
libdata/pkgconfig/opendkim.pc
man/man8/opendkim-genkey.8.gz
man/man8/opendkim-genzone.8.gz
man/man8/opendkim-testadsp.8.gz
man/man8/opendkim-testkey.8.gz
man/man8/opendkim-testmsg.8.gz
sbin/opendkim-genkey
sbin/opendkim-genzone
sbin/opendkim-testadsp
sbin/opendkim-testkey
sbin/opendkim-testmsg
%%VBR%%@dirrm include/vbr
%%REPUTATION%%@dirrm include/ut
%%REPUTATION%%@dirrm include/repute
%%REPRRD%%@dirrm include/reprrd
%%RBL%%@dirrm include/rbl
@dirrm include/opendkim
%%DKIMREP%%@dirrm include/dkim-rep
@dirrmtry etc/mail
%%FILTER%%man/man5/opendkim.conf.5.gz
%%LUA%%man/man8/miltertest.8.gz
man/man8/opendkim-genkey.8.gz
man/man8/opendkim-genzone.8.gz
man/man8/opendkim-testadsp.8.gz
man/man8/opendkim-testkey.8.gz
man/man8/opendkim-testmsg.8.gz
%%FILTER%%man/man8/opendkim.8.gz
%%LUA%%%%FILTER%%man/man3/opendkim-lua.3.gz
%%STATS%%man/man8/opendkim-expire.8.gz
%%STATS%%man/man8/opendkim-gengraphs.8.gz
%%STATS%%man/man8/opendkim-genstats.8.gz
%%STATS%%man/man8/opendkim-stats.8.gz
%%STATS%%%%ODBX%%man/man1/opendkim-spam.1.gz
%%STATS%%%%ODBX%%man/man8/opendkim-importstats.8.gz

Return to bug 191286

Lines 2-9 Link Here

(-)Makefile (-80 / +84 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= opendkim	4	PORTNAME= opendkim
5	PORTVERSION= 2.8.3	5	PORTVERSION= 2.9.2
6	PORTREVISION= 1
7	CATEGORIES= mail security	6	CATEGORIES= mail security
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9	MASTER_SITE_SUBDIR= ${PORTNAME} \	8	MASTER_SITE_SUBDIR= ${PORTNAME} \
Lines 22-28 Link Here
22		21
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	NO_OPTIONS_SORT=yes	23	NO_OPTIONS_SORT=yes
25	USES= pkgconfig perl5 shebangfix	24	USES= pkgconfig perl5 shebangfix libtool
26	USE_PERL5= run	25	USE_PERL5= run
27	SHEBANG_FILES= opendkim/opendkim-genkey.in	26	SHEBANG_FILES= opendkim/opendkim-genkey.in
28	SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-*	27	SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-*
Lines 31-154 Link Here
31		30
32	PORTDOCS= *	31	PORTDOCS= *
33		32
		33	CONFIGURE_ARGS+= --without-tre
		34
		35	OPTIONS_SUB= yes
34	OPTIONS_SINGLE= RESOLV	36	OPTIONS_SINGLE= RESOLV
35	OPTIONS_SINGLE_RESOLV= STOCK_RESOLVER UNBOUND	37	OPTIONS_SINGLE_RESOLV= STOCK_RESOLVER UNBOUND
36	OPTIONS_DEFINE= FILTER GNUTLS LUA MEMCACHED BDB_BASE OPENDBX OPENLDAP \	38	OPTIONS_DEFINE= FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \
37	POPAUTH QUERY_CACHE STATS DEBUG	39	BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL
38	OPTIONS_DEFAULT= FILTER LUA UNBOUND	40	OPTIONS_DEFAULT= FILTER LUA UNBOUND
39		41
40	STOCK_RESOLVER_DESC= Use the stock resolver library	42	STOCK_RESOLVER_DESC= Use the stock resolver library
		43
41	UNBOUND_DESC= Use unbound DNS library	44	UNBOUND_DESC= Use unbound DNS library
		45	UNBOUND_CONFIGURE_WITH= unbound
		46	UNBOUND_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
		47
42	FILTER_DESC= OpenDKIM filter, requires libmilter/Sendmail	48	FILTER_DESC= OpenDKIM filter, requires libmilter/Sendmail
		49	FILTER_USE= RC_SUBR=milter-opendkim
		50
		51	CURL_DESC= Use cURL for web queries
		52	CURL_CONFIGURE_WITH= libcurl
		53	CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
		54
43	GNUTLS_DESC= Use GnuTLS instead of OpenSSL	55	GNUTLS_DESC= Use GnuTLS instead of OpenSSL
		56	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
		57	GNUTLS_CONFIGURE_WITH= gnutls
		58	GNUTLS_CONFIGURE_OFF= --with-openssl=${OPENSSLBASE}
		59
		60	JANSSON_DESC= Statistics and other output as JSON data
		61	JANSSON_CONFIGURE_WITH= libjansson
		62	JANSSON_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson
		63
		64	LDNS_DESC= Use LDNS library for DNS queries
		65	LDNS_CONFIGURE_WITH= ldns
		66	LDNS_LIB_DEPENDS= libldns.so:${PORTSDIR}/dns/ldns
		67
		68	LMDB_DESC= Use Lightning Memory-Mapped DB key-value store
		69	LMDB_CONFIGURE_WITH= lmdb
		70	LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb
		71
44	LUA_DESC= Describe filter policy with lua	72	LUA_DESC= Describe filter policy with lua
		73	LUA_CONFIGURE_WITH= lua
		74	LUA_USES= lua
		75
45	MEMCACHED_DESC= Use memcached as a data set	76	MEMCACHED_DESC= Use memcached as a data set
		77	MEMCACHED_CONFIGURE_WITH= libmemcached
		78	MEMCACHED_LIB_DEPENDS= libmemcached.so:${PORTSDIR}/databases/libmemcached
		79
46	BDB_BASE_DESC= Use Berkeley DB from base	80	BDB_BASE_DESC= Use Berkeley DB from base
		81
47	OPENDBX_DESC= Store filter policies via OpenDBX	82	OPENDBX_DESC= Store filter policies via OpenDBX
		83	OPENDBX_CONFIGURE_WITH= odbx
		84	OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx
		85
48	OPENLDAP_DESC= Store filter policies in LDAP	86	OPENLDAP_DESC= Store filter policies in LDAP
		87	OPENLDAP_CONFIGURE_WITH=openldap
		88	OPENLDAP_USE= OPENLDAP=yes
		89
49	POPAUTH_DESC= Use POP authentication DB	90	POPAUTH_DESC= Use POP authentication DB
		91	POPAUTH_CONFIGURE_ENABLE= popauth
		92
50	QUERY_CACHE_DESC= Cache DNS query results locally	93	QUERY_CACHE_DESC= Cache DNS query results locally
51	STATS_DESC= Setup statistics tools	94	QUERY_CACHE_CONFIGURE_ENABLE= query_cache
52	DEBUG_DESC= Build with debug symbols
53		95
		96	SASL_DESC= Enable SASL authentication with LDAP
		97	SASL_CONFIGURE_WITH= sasl
		98
		99	DOCS_CONFIGURE_ON= --docdir=${WRKDIR}/doc
		100
54	MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"	101	MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
		102	MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP}
55		103
56	.include "${.CURDIR}/Makefile.options"	104	.include "${.CURDIR}/Makefile.options"
		105
57	.include <bsd.port.options.mk>	106	.include <bsd.port.options.mk>
58		107
		108	.if ${PORT_OPTIONS:MSASL} && ${PORT_OPTIONS:MOPENLDAP}
		109	WANT_OPENLDAP_SASL= yes
		110	.endif
		111
59	.if ${PORT_OPTIONS:MFILTER}	112	.if ${PORT_OPTIONS:MFILTER}
60	USE_RC_SUBR= milter-opendkim
61	PLIST_SUB+= FILTER=""
62	SUB_FILES= pkg-message	113	SUB_FILES= pkg-message
63	WITHOUT_MILTER_CFLAGS= yes	114	WITHOUT_MILTER_CFLAGS= yes
64	WITHOUT_MILTER_LDFLAGS= yes	115	WITHOUT_MILTER_LDFLAGS= yes
65	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"	116	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
66	CONFIGURE_ARGS+= --with-milter=${MILTERBASE}	117	CONFIGURE_ARGS+= --with-milter=${MILTERBASE}
67	.else
68	CONFIGURE_ARGS+= --disable-filter
69	PLIST_SUB+= FILTER="@comment "
70	.endif	118	.endif
71		119
72	.if ${PORT_OPTIONS:MGNUTLS}	120	.if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} \|\| \
73	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls	121	${PORT_OPTIONS:MRBL}
74	CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE}	122	.if !${PORT_OPTIONS:MLUA}
75	.else	123	IGNORE= Options LUA_ONLY_SIGNING and RBL require LUA as well
76	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
77	.endif	124	.endif
		125	.endif
78		126
79	.include "${.CURDIR}/Makefile.features"	127	.if ${PORT_OPTIONS:MREPUTATION}
80		128	.if !${PORT_OPTIONS:MCURL} \|\| !${PORT_OPTIONS:MJANNSON}
81	.if ${PORT_OPTIONS:MDEBUG}	129	IGNORE= Option REPUTATION requires CURL and JANSSON as well
82	CONFIGURE_ARGS+= --enable-debug
83	.endif	130	.endif
		131	.endif
84		132
85	.if ! ${PORT_OPTIONS:MDOCS}	133	.if ${PORT_OPTIONS:MSTATSEXT}
86	CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc	134	.if !${PORT_OPTIONS:MSTATS} \|\| !${PORT_OPTIONS:MLUA}
		135	IGNORE= Option STATSEXT requires STATS and LUA as well
87	.endif	136	.endif
		137	.endif
88		138
89	.if ${PORT_OPTIONS:MSTATS}	139	.if ${PORT_OPTIONS:MPOPAUTH} \
90	CONFIGURE_ARGS+= --enable-stats	140	\|\| ${PORT_OPTIONS:MQUERY_CACHE} \
91	PLIST_SUB+= STATS=""	141	\|\| ${PORT_OPTIONS:MLDAP_CACHING} \
92	.else	142	\|\| ${PORT_OPTIONS:MREPUTATION} \
93	PLIST_SUB+= STATS="@comment "
94	.endif
95	.if ${PORT_OPTIONS:MPOPAUTH} \
96	\|\| ${PORT_OPTIONS:MQUERY_CACHE} \
97	\|\| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MLDAP_CACHING} ) \
98	\|\| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MREPUTATION} ) \
99	\|\| ${PORT_OPTIONS:MSTATS}	143	\|\| ${PORT_OPTIONS:MSTATS}
100	. if ${PORT_OPTIONS:MBDB_BASE}	144	. if ${PORT_OPTIONS:MBDB_BASE}
101	CONFIGURE_ARGS+= --with-db-lib=c	145	CONFIGURE_ARGS+= --with-db-lib=c
102	. else	146	. else
103	CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \	147	CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \
104	--with-db-libdir=${BDB_LIB_DIR} \	148	--with-db-libdir=${BDB_LIB_DIR} \
105	--with-db-lib=${BDB_LIB_NAME}	149	--with-db-lib=${BDB_LIB_NAME}
106	USE_BDB= 40+	150	USE_BDB= 40+
107	. endif	151	. endif
108	.endif	152	.endif
109	.if ${PORT_OPTIONS:MUNBOUND}
110	CONFIGURE_ARGS+= --with-unbound
111	LIB_DEPENDS+= libunbound.so:${PORTSDIR}/dns/unbound
112	.endif
113	.if ${PORT_OPTIONS:MPOPAUTH}
114	CONFIGURE_ARGS+= --enable-popauth
115	.endif
116	.if ${PORT_OPTIONS:MQUERY_CACHE}
117	CONFIGURE_ARGS+= --enable-query_cache
118	.endif
119	.if ${PORT_OPTIONS:MMEMCACHED}
120	CONFIGURE_ARGS+= --with-libmemcached
121	LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached
122	.else
123	CONFIGURE_ARGS+= --without-libmemcached
124	.endif
125	.if ${PORT_OPTIONS:MOPENDBX}
126	CONFIGURE_ARGS+= --with-odbx
127	LIB_DEPENDS+= libopendbx.so:${PORTSDIR}/databases/opendbx
128	PLIST_SUB+= ODBX=""
129	.else
130	CONFIGURE_ARGS+= --without-odbx
131	PLIST_SUB+= ODBX="@comment "
132	.endif
133	.if ${PORT_OPTIONS:MOPENLDAP}
134	CONFIGURE_ARGS+= --with-openldap
135	LIB_DEPENDS+= libldap.so:${PORTSDIR}/net/openldap24-sasl-client
136	USE_OPENLDAP= yes
137	.else
138	CONFIGURE_ARGS+= --without-openldap
139	.endif
140	.if ${PORT_OPTIONS:MLUA}
141	CONFIGURE_ARGS+= --with-lua
142	PLIST_SUB+= LUA=""
143	USES+= lua
144	.else
145	PLIST_SUB+= LUA="@comment "
146	.endif
147		153
148	pre-configure:	154	pre-configure:
149	${REINPLACE_CMD} -e '/PKG_CONFIG/s/lua5\.2/lua-${LUA_VER}/' \	155	${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \
150	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \	156	-e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/' \
151	${WRKSRC}/configure	157	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \
		158	${WRKSRC}/configure
152		159
153	post-patch:	160	post-patch:
154	.if ${PORT_OPTIONS:MLCOV}	161	.if ${PORT_OPTIONS:MLCOV}
Lines 158-169 Link Here
158	.endif	165	.endif
159		166
160	post-install:	167	post-install:
161	.if ! ${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER}
162	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/opendkim
163	.endif
164	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendkim.so.9
165	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail	168	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
166	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${STAGEDIR}${PREFIX}/etc/mail/	169	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
		170	${STAGEDIR}${PREFIX}/etc/mail/
167		171
168	regression-test: build	172	regression-test: build
169	cd ${WRKSRC} ; ${MAKE} check	173	cd ${WRKSRC} ; ${MAKE} check

Lines 1-168 Link Here

(-)Makefile.features (-168 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	.if ${PORT_OPTIONS:MFFR}
8
9	.if ${PORT_OPTIONS:MADSP_LISTS}
10	CONFIGURE_ARGS+= --enable-adsp_lists
11	.endif
12
13	.if ${PORT_OPTIONS:MALLSYMBOLS}
14	CONFIGURE_ARGS+= --enable-allsymbols
15	.endif
16
17	.if ${PORT_OPTIONS:MATPS}
18	CONFIGURE_ARGS+= --enable-atps
19	MAN8+= opendkim-atpszone.8
20	PLIST_SUB+= ATPS=""
21	.else
22	PLIST_SUB+= ATPS="@comment "
23	.endif
24
25	.if ${PORT_OPTIONS:MCODECOVERAGE}
26	CONFIGURE_ARGS+= --enable-codecoverage
27	.endif
28
29	.if ${PORT_OPTIONS:MDB_HANDLE_POOLS}
30	CONFIGURE_ARGS+= --enable-db_handle_pools
31	.endif
32
33	.if ${PORT_OPTIONS:MDEFAULT_SENDER}
34	CONFIGURE_ARGS+= --enable-default_sender
35	.endif
36
37	.if ${PORT_OPTIONS:MDIFFHEADERS}
38	CONFIGURE_ARGS+= --enable-diffheaders
39	LIB_DEPENDS+= tre:${PORTSDIR}/textproc/libtre
40	.else
41	CONFIGURE_ARGS+= --without-tre
42	.endif
43
44	.if ${PORT_OPTIONS:MDKIM_REPUTATION}
45	CONFIGURE_ARGS+= --enable-dkim_reputation
46	MAN3+= dkim-rep.3
47	PLIST_SUB+= DKIMREP=""
48	.else
49	PLIST_SUB+= DKIMREP="@comment "
50	.endif
51
52	.if ${PORT_OPTIONS:MERLANG}
53	BUILD_DEPENDS+= erl:${PORTSDIR}/lang/erlang
54	CONFIGURE_ARGS+= --with-erlang
55	.else
56	CONFIGURE_ARGS+= --without-erlang
57	.endif
58
59	.if ${PORT_OPTIONS:MIDENTITY_HEADER}
60	CONFIGURE_ARGS+= --enable-identity_header
61	.endif
62
63	.if ${PORT_OPTIONS:MLCOV}
64	BROKEN= Does not install
65	BUILD_DEPENDS+= lcov:${PORTSDIR}/devel/lcov \
66	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
67	CONFIGURE_ARGS+= --with-lcov
68	.else
69	CONFIGURE_ARGS+= --without-lcov
70	.endif
71
72	.if ${PORT_OPTIONS:MLDAP_CACHING}
73	WITH_OPENLDAP= yes
74	CONFIGURE_ARGS+= --enable-ldap_caching
75	.endif
76
77	.if ${PORT_OPTIONS:MPOSTGRES_RECONNECT_HACK}
78	CONFIGURE_ARGS+= --enable-postgresql_reconnect_hack
79	.endif
80
81	.if ${PORT_OPTIONS:MRATE_LIMIT}
82	CONFIGURE_ARGS+= --enable-rate_limit
83	.endif
84
85	.if ${PORT_OPTIONS:MRBL}
86	CONFIGURE_ARGS+= --enable-rbl
87	MAN3+= rbl.3
88	PLIST_SUB+= RBL=""
89	PORT_OPTIONS+= LUA
90	.else
91	PLIST_SUB+= RBL="@comment "
92	.endif
93
94	.if ${PORT_OPTIONS:MREDIRECT}
95	CONFIGURE_ARGS+= --enable-redirect
96	.endif
97
98	.if ${PORT_OPTIONS:MREPLACE_RULES}
99	CONFIGURE_ARGS+= --enable-replace_rules
100	.endif
101
102	.if ${PORT_OPTIONS:MREPRRD}
103	CONFIGURE_ARGS+= --enable-reprrd
104	MAN8+= opendkim-reprrdimport.8
105	PLIST_SUB+= REPRRD=""
106	BUILD_DEPENDS+= rrdtool>=0:${PORTSDIR}/databases/rrdtool
107	.else
108	CONFIGURE_ARGS+= --disable-reprrd
109	PLIST_SUB+= REPRRD="@comment "
110	.endif
111
112	.if ${PORT_OPTIONS:MREPUTATION}
113	CONFIGURE_ARGS+= --enable-reputation \
114	--with-libcurl
115	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
116	. if ${PORT_OPTIONS:MXML}
117	CONFIGURE_ARGS+= --without-libjansson --with-libxml2
118	LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
119	PLIST_SUB+= JANSSON="@comment "
120	. else
121	CONFIGURE_ARGS+= --with-libjansson
122	LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson
123	MAN8+= autobuild.8
124	PLIST_SUB+= JANSSON=""
125	. endif
126	MAN3+= ut.3
127	MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \
128	opendkim-rephistory.8
129	PLIST_SUB+= REPUTE=""
130	.else
131	CONFIGURE_ARGS+= --without-libcurl
132	PLIST_SUB+= REPUTE="@comment "
133	.endif
134
135	.if ${PORT_OPTIONS:MRESIGN}
136	CONFIGURE_ARGS+= --enable-resign
137	.endif
138
139	.if ${PORT_OPTIONS:MSENDER_MACRO}
140	CONFIGURE_ARGS+= --enable-sender_macro
141	.endif
142
143	.if ${PORT_OPTIONS:MSOCKETDB}
144	CONFIGURE_ARGS+= --enable-socketdb
145	.endif
146
147	.if ${PORT_OPTIONS:MSTATSEXT}
148	CONFIGURE_ARGS+= --enable-statsext
149	PORT_OPTIONS+= LUA STATS
150	.endif
151
152	.if ${PORT_OPTIONS:MVBR}
153	CONFIGURE_ARGS+= --enable-vbr
154	MAN3+= vbr.3
155	PLIST_SUB+= VBR=""
156	.else
157	PLIST_SUB+= VBR="@comment "
158	.endif
159
160	.else # ${PORT_OPTIONS:MFFR}
161	PLIST_SUB+= ATPS="@comment "
162	PLIST_SUB+= DKIMREP="@comment "
163	PLIST_SUB+= RBL="@comment "
164	PLIST_SUB+= REPRRD="@comment "
165	PLIST_SUB+= JANSSON="@comment "
166	PLIST_SUB+= REPUTE="@comment "
167	PLIST_SUB+= VBR="@comment "
168	.endif # ${PORT_OPTIONS:MFFR}

Lines 2-43 Link Here

(-)Makefile.options (-16 / +69 lines)
2	# $FreeBSD$	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.
6		5
7	OPTIONS_DEFINE+= FFR	6	OPTIONS_GROUP+= DEVELOPER
		7	DEVELOPER_DESC= Options useful for OpenDKIM development
		8
		9	OPTIONS_GROUP_DEVELOPER= ALLSYMBOLS CODECOVERAGE DEBUG
		10
		11	ALLSYMBOLS_DESC= Export all internal symbols for better test coverage
		12	ALLSYMBOLS_CONFIGURE_ENABLE= allsymbols
		13
		14	CODECOVERAGE_DESC= Enable internal code-coverage/profiling
		15	CODECOVERAGE_CONFIGURE_ENABLE= codecoverage
		16
		17	DEBUG_DESC= Build with debug symbols
		18	DEBUG_CONFIGURE_ENABLE= debug
		19
		20	## Please refer FEATURES file distributed with the source for details.
		21
8	FFR_DESC= Use features marked as For-Future-Releases	22	FFR_DESC= Use features marked as For-Future-Releases
9		23
10	OPTIONS_GROUP+= FFR	24	OPTIONS_GROUP+= FFR
11	OPTIONS_GROUP_FFR= ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \	25
12	DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \	26	## _FFR_DNSSEC is referenced in the code, but does not appear to do
13	DKIM_REPUTATION ERLANG IDENTITY_HEADER LCOV \	27	## anything much.
		28
		29	OPTIONS_GROUP_FFR= ADSP_LISTS ATPS DB_HANDLE_POOLS \
		30	DEFAULT_SENDER DIFFHEADERS IDENTITY_HEADER \
14	LDAP_CACHING POSTGRES_RECONNECT_HACK \	31	LDAP_CACHING POSTGRES_RECONNECT_HACK \
15	RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \	32	RATE_LIMIT RBL REPLACE_RULES REPRRD \
16	REPUTATION RESIGN SENDER_MACRO SOCKETDB \	33	REPUTATION RESIGN SENDER_MACRO \
17	STATSEXT VBR XML	34	SOCKETDB STATS STATSEXT VBR
18		35
19	ADSP_LISTS_DESC= ADSP filtering for lists (experimental)	36	ADSP_LISTS_DESC= ADSP filtering for lists (experimental)
20	ALLSYMBOLS_DESC= Export internal symbols for test	37	ADSP_LISTS_CONFIGURE_ENABLE= adsp_lists
		38
21	ATPS_DESC= Authorized Third Party Sign check	39	ATPS_DESC= Authorized Third Party Sign check
22	CODECOVERAGE_DESC= Include coverage/profile code	40	ATPS_CONFIGURE_ENABLE= atps
		41
23	DB_HANDLE_POOLS_DESC= Database handle pools (experimental)	42	DB_HANDLE_POOLS_DESC= Database handle pools (experimental)
		43	DB_HANDLE_POOLS_CONFIGURE_ENABLE= db_handle_pools
		44
24	DEFAULT_SENDER_DESC= Default sender address	45	DEFAULT_SENDER_DESC= Default sender address
		46	DEFAULT_SENDER_CONFIGURE_ENABLE=default_sender
		47
25	DIFFHEADERS_DESC= Compare signed and verified headers (experimental)	48	DIFFHEADERS_DESC= Compare signed and verified headers (experimental)
26	DKIM_REPUTATION_DESC= DKIM reputation check (experimental)	49	DIFFHEADERS_CONFIGURE_ENABLE= diffheaders
27	ERLANG_DESC= Support for Erlang datasets	50
28	IDENTITY_HEADER_DESC= Special header to set identity	51	IDENTITY_HEADER_DESC= Special header to set identity
29	LCOV_DESC= Profiling with LCOV	52	IDENTITY_HEADER_CONFIGURE_ENABLE= identity_header
		53
30	LDAP_CACHING_DESC= LDAP query piggybacking and caching	54	LDAP_CACHING_DESC= LDAP query piggybacking and caching
		55	LDAP_CACHING_CONFIGURE_ENABLE= ldap_caching
		56	LDAP_CACHING_USE= OPENLDAP=yes
		57
		58	LUA_ONLY_SIGNING= Message signing by Lua only
		59	LUA_ONLY_SIGNING_CONFIGURE_ENABLE= lua_only_signing
		60
31	POSTGRES_RECONNECT_HACK_DESC= PostgreSQL connection error detection bug hack	61	POSTGRES_RECONNECT_HACK_DESC= PostgreSQL connection error detection bug hack
		62	POSTGRES_RECONNECT_HACK_CONFIGURE_ENABLE= postgresql_reconnect_hack
		63
32	RATE_LIMIT_DESC= DKIM based rate limiting support	64	RATE_LIMIT_DESC= DKIM based rate limiting support
		65	RATE_LIMIT_CONFIGURE_ENABLE= rate_limit
		66
33	RBL_DESC= Realtime Blacklist query support	67	RBL_DESC= Realtime Blacklist query support
34	REDIRECT_DESC= Redirecting failed verification to a mailbox	68	RBL_CONFIGURE_ENABLE= rbl
		69
35	REPLACE_RULES_DESC= String substition when signing	70	REPLACE_RULES_DESC= String substition when signing
		71	REPLACE_RULES_CONFIGURE_ENABLE= replace_rules
		72
36	REPRRD_DESC= Support for collaborative reputation that uses rrdtool (experimental)	73	REPRRD_DESC= Support for collaborative reputation that uses rrdtool (experimental)
		74	REPRRD_CONFIGURE_ENABLE= reprrd
		75	REPRRD_LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool
		76
37	REPUTATION_DESC= Reputation check (experimental)	77	REPUTATION_DESC= Reputation check (experimental)
		78	REPUTATION_CONFIGURE_ENABLE= reputation
		79
38	RESIGN_DESC= One-step resigning	80	RESIGN_DESC= One-step resigning
		81	RESIGN_CONFIGURE_ENABLE= resign
		82
39	SENDER_MACRO_DESC= Macro to determine sender	83	SENDER_MACRO_DESC= Macro to determine sender
		84	SENDER_MACRO_CONFIGURE_ENABLE= sender_macro
		85
40	SOCKETDB_DESC= Arbitrary socket data sets	86	SOCKETDB_DESC= Arbitrary socket data sets
41	STATSEXT_DESC= Extended stats	87	SOCKETDB_CONFIGURE_ENABLE= socketdb
		88
		89	STATS_DESC= Per-message and per-signature statistics
		90	STATS_CONFIGURE_ENABLE= stats
		91
		92	STATSEXT_DESC= Localized stats extensions
		93	STATSEXT_CONFIGURE_ENABLE= statsext
		94
42	VBR_DESC= Vouch-By-Reference support	95	VBR_DESC= Vouch-By-Reference support
43	XML_DESC= Prefer textproc/libxml2 to devel/jansson for JSON processing	96	VBR_CONFIGURE_ENABLE= vbr

Lines 1-33 Link Here

(-)files/patch-opendkim__opendkim.c (-33 lines)
1	--- ./opendkim/opendkim.c.orig 2013-03-20 03:02:40.000000000 +0900
2	+++ ./opendkim/opendkim.c 2013-03-21 02:47:29.000000000 +0900
3	@@ -12421,7 +12421,7 @@
4	{
5	syslog(LOG_INFO,
6	"%s: can't parse default sender value '%s'",
7	- dfc->mctx_jobid, from);
8	+ dfc->mctx_jobid, conf->conf_defsender);
9	}
10	#endif /* _FFR_DEFAULT_SENDER */
11	}
12	@@ -14945,8 +14945,8 @@
13	for (c = 0; c < nsigs && domain == NULL; c++)
14	{
15	if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 \|\|
16	- (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
17	- dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
18	+ ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
19	+ dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
20	continue;
21
22	cd = dkim_sig_getdomain(sigs[c]);
23	@@ -15121,8 +15121,8 @@
24	for (c = 0; c < nsigs; c++)
25	{
26	if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 \|\|
27	- (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
28	- dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
29	+ ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
30	+ dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
31	continue;
32
33	checked = TRUE;

Lines 1-94 Link Here

(-)pkg-plist (-68 / +57 lines)
1	%%REPUTE%%%%JANSSON%%bin/autobuild	1	%%ATPS%%man/man8/opendkim-atpszone.8.gz
		2	%%ATPS%%sbin/opendkim-atpszone
		3	%%FILTER%%man/man5/opendkim.conf.5.gz
		4	%%FILTER%%man/man8/opendkim.8.gz
		5	%%FILTER%%sbin/opendkim
		6	%%JANSSON%%bin/autobuild
		7	%%JANSSON%%man/man8/autobuild.8.gz
		8	%%LUA%%%%FILTER%%man/man3/opendkim-lua.3.gz
2	%%LUA%%bin/miltertest	9	%%LUA%%bin/miltertest
3	%%REPRRD%%bin/opendkim-reprrdimport	10	%%LUA%%man/man3/opendkim-lua.3.gz
4	%%ODBX%%%%STATS%%bin/opendkim-spam	11	%%LUA%%man/man8/miltertest.8.gz
5	etc/mail/opendkim.conf.sample	12	%%OPENDBX%%%%STATS%%bin/opendkim-spam
6	%%DKIMREP%%include/dkim-rep/dkim-rep.h	13	%%OPENDBX%%%%STATS%%sbin/opendkim-importstats
7	include/opendkim/dkim.h
8	%%RBL%%include/rbl/rbl.h	14	%%RBL%%include/rbl/rbl.h
9	%%REPRRD%%include/reprrd/reprrd.h
10	%%REPUTE%%include/repute/repute.h
11	%%REPUTE%%include/ut/ut.h
12	%%VBR%%include/vbr/vbr.h
13	%%DKIMREP%%lib/libdkimrep.a
14	%%DKIMREP%%lib/libdkimrep.la
15	%%DKIMREP%%lib/libdkimrep.so
16	%%DKIMREP%%lib/libdkimrep.so.1
17	lib/libopendkim.a
18	lib/libopendkim.la
19	lib/libopendkim.so
20	lib/libopendkim.so.9
21	%%RBL%%lib/librbl.a	15	%%RBL%%lib/librbl.a
22	%%RBL%%lib/librbl.la
23	%%RBL%%lib/librbl.so	16	%%RBL%%lib/librbl.so
24	%%RBL%%lib/librbl.so.1	17	%%RBL%%lib/librbl.so.1
		18	%%RBL%%libdata/pkgconfig/rbl.pc
		19	%%RBL%%man/man3/rbl.3.gz
		20	%%REPRRD%%bin/opendkim-reprrdimport
		21	%%REPRRD%%include/reprrd/reprrd.h
25	%%REPRRD%%lib/libreprrd.a	22	%%REPRRD%%lib/libreprrd.a
26	%%REPRRD%%lib/libreprrd.la
27	%%REPRRD%%lib/libreprrd.so	23	%%REPRRD%%lib/libreprrd.so
28	%%REPRRD%%lib/libreprrd.so.1	24	%%REPRRD%%lib/libreprrd.so.1
29	%%REPUTE%%lib/librepute.a	25	%%REPRRD%%man/man8/opendkim-reprrdimport.8.gz
30	%%REPUTE%%lib/librepute.la	26	%%REPUTATION%%include/repute/repute.h
31	%%REPUTE%%lib/librepute.so	27	%%REPUTATION%%include/ut/ut.h
32	%%REPUTE%%lib/librepute.so.1	28	%%REPUTATION%%lib/librepute.a
33	%%REPUTE%%lib/libut.a	29	%%REPUTATION%%lib/librepute.so
34	%%REPUTE%%lib/libut.la	30	%%REPUTATION%%lib/librepute.so.1
35	%%REPUTE%%lib/libut.so	31	%%REPUTATION%%lib/libut.a
36	%%REPUTE%%lib/libut.so.1	32	%%REPUTATION%%lib/libut.so
37	%%VBR%%lib/libvbr.a	33	%%REPUTATION%%lib/libut.so.1
38	%%VBR%%lib/libvbr.la	34	%%REPUTATION%%libdata/pkgconfig/repute.pc
39	%%VBR%%lib/libvbr.so	35	%%REPUTATION%%libdata/pkgconfig/ut.pc
40	%%VBR%%lib/libvbr.so.2	36	%%REPUTATION%%man/man3/ut.3.gz
41	%%DKIMREP%%libdata/pkgconfig/dkim-rep.pc	37	%%REPUTATION%%man/man8/opendkim-genrates.8.gz
42	libdata/pkgconfig/opendkim.pc	38	%%REPUTATION%%man/man8/opendkim-modtotals.8.gz
43	%%RBL%%libdata/pkgconfig/rbl.pc	39	%%REPUTATION%%man/man8/opendkim-rephistory.8.gz
44	%%REPUTE%%libdata/pkgconfig/repute.pc	40	%%REPUTATION%%sbin/opendkim-genrates
45	%%REPUTE%%libdata/pkgconfig/ut.pc	41	%%REPUTATION%%sbin/opendkim-modtotals
46	%%VBR%%libdata/pkgconfig/vbr.pc	42	%%REPUTATION%%sbin/opendkim-rephistory
47	%%FILTER%%sbin/opendkim	43	%%STATS%%%%OPENDBX%%man/man1/opendkim-spam.1.gz
48	%%ATPS%%sbin/opendkim-atpszone	44	%%STATS%%%%OPENDBX%%man/man8/opendkim-importstats.8.gz
		45	%%STATS%%man/man8/opendkim-expire.8.gz
		46	%%STATS%%man/man8/opendkim-gengraphs.8.gz
		47	%%STATS%%man/man8/opendkim-genstats.8.gz
		48	%%STATS%%man/man8/opendkim-stats.8.gz
49	%%STATS%%sbin/opendkim-expire	49	%%STATS%%sbin/opendkim-expire
50	%%STATS%%sbin/opendkim-gengraphs	50	%%STATS%%sbin/opendkim-gengraphs
51	sbin/opendkim-genkey
52	%%REPUTE%%sbin/opendkim-genrates
53	%%STATS%%sbin/opendkim-genstats	51	%%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	52	%%STATS%%sbin/opendkim-reportstats
59	%%STATS%%sbin/opendkim-stats	53	%%STATS%%sbin/opendkim-stats
60	%%LUA%%%%FILTER%%man/man3/opendkim-lua.3.gz	54	%%VBR%%include/vbr/vbr.h
61	%%FILTER%%man/man5/opendkim.conf.5.gz	55	%%VBR%%lib/libvbr.a
62	%%LUA%%man/man8/miltertest.8.gz	56	%%VBR%%lib/libvbr.so
		57	%%VBR%%lib/libvbr.so.2
		58	%%VBR%%libdata/pkgconfig/vbr.pc
		59	%%VBR%%man/man3/vbr.3.gz
		60	@sample etc/mail/opendkim.conf.sample
		61	include/opendkim/dkim.h
		62	lib/libopendkim.a
		63	lib/libopendkim.so
		64	lib/libopendkim.so.9
		65	lib/libopendkim.so.9.0.3
		66	libdata/pkgconfig/opendkim.pc
63	man/man8/opendkim-genkey.8.gz	67	man/man8/opendkim-genkey.8.gz
64	man/man8/opendkim-genzone.8.gz	68	man/man8/opendkim-genzone.8.gz
65	man/man8/opendkim-testadsp.8.gz	69	man/man8/opendkim-testadsp.8.gz
66	man/man8/opendkim-testkey.8.gz	70	man/man8/opendkim-testkey.8.gz
67	man/man8/opendkim-testmsg.8.gz	71	man/man8/opendkim-testmsg.8.gz
68	man/man8/opendkim.8.gz	72	sbin/opendkim-genkey
		73	sbin/opendkim-genzone
69	sbin/opendkim-testadsp	74	sbin/opendkim-testadsp
70	sbin/opendkim-testkey	75	sbin/opendkim-testkey
71	sbin/opendkim-testmsg	76	sbin/opendkim-testmsg
72	%%VBR%%@dirrm include/vbr	77	%%VBR%%@dirrm include/vbr
73	%%REPUTE%%@dirrm include/ut	78	%%REPUTATION%%@dirrm include/ut
74	%%REPUTE%%@dirrm include/repute	79	%%REPUTATION%%@dirrm include/repute
75	%%REPRRD%%@dirrm include/reprrd	80	%%REPRRD%%@dirrm include/reprrd
76	%%RBL%%@dirrm include/rbl	81	%%RBL%%@dirrm include/rbl
77	@dirrm include/opendkim	82	@dirrm include/opendkim
78	%%DKIMREP%%@dirrm include/dkim-rep
79	@dirrmtry etc/mail	83	@dirrmtry etc/mail
80	%%FILTER%%man/man5/opendkim.conf.5.gz
81	%%LUA%%man/man8/miltertest.8.gz
82	man/man8/opendkim-genkey.8.gz
83	man/man8/opendkim-genzone.8.gz
84	man/man8/opendkim-testadsp.8.gz
85	man/man8/opendkim-testkey.8.gz
86	man/man8/opendkim-testmsg.8.gz
87	%%FILTER%%man/man8/opendkim.8.gz
88	%%LUA%%%%FILTER%%man/man3/opendkim-lua.3.gz
89	%%STATS%%man/man8/opendkim-expire.8.gz
90	%%STATS%%man/man8/opendkim-gengraphs.8.gz
91	%%STATS%%man/man8/opendkim-genstats.8.gz
92	%%STATS%%man/man8/opendkim-stats.8.gz
93	%%STATS%%%%ODBX%%man/man1/opendkim-spam.1.gz
94	%%STATS%%%%ODBX%%man/man8/opendkim-importstats.8.gz