From 920c98e3068369e55ca80b505bf6decfa3667cbb Mon Sep 17 00:00:00 2001 From: bapt Date: Wed, 27 Apr 2011 10:12:21 +0000 Subject: - update to 2.3.2 PR: ports/156518 Submitted by: Hirohisa Yamaguchi (maintainer) --- mail/opendkim/Makefile | 20 +++++++++++--------- mail/opendkim/Makefile.features | 28 ++++++++++++++++++++-------- mail/opendkim/distinfo | 4 ++-- mail/opendkim/pkg-plist | 1 - 4 files changed, 33 insertions(+), 20 deletions(-) (limited to 'mail') diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index bbef38f2b98f..d6a1755531d0 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -6,12 +6,13 @@ # PORTNAME= opendkim -PORTVERSION= 2.2.2 +PORTVERSION= 2.3.2 CATEGORIES= mail security -MASTER_SITES= SF/opendkim +MASTER_SITES= SF +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= umq@ueo.co.jp -COMMENT= DKIM library and milter implimentation +COMMENT= DKIM library and milter implementation LICENSE= BSD SENDMAIL LICENSE_COMB= multi @@ -37,7 +38,6 @@ OPTIONS= \ LUA "Describe filter policy with lua" Off \ OPENDBX "Store filter policies via OpenDBX" Off \ OPENLDAP "Store filter policies in LDAP" Off \ - OPENSSL_PORT "Use OpenSSL in ports" Off \ POPAUTH "Use POP authentication DB" Off \ QUERY_CACHE "Cache DNS query results locally" Off \ UNBOUND "Use unbound DNS library" Off @@ -51,11 +51,13 @@ WITHOUT_MILTER_LDFLAGS= yes .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" CONFIGURE_ARGS+= --with-milter=${MILTERBASE} -.if ${OSVERSION} < 700000 -WITH_OPENSSL_PORT= yes -.endif -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +.if defined(WITH_GNUTLS) +BROKEN= WITH_GNUTLS option requires security/gnutls 2.12.0 or later +LIB_DEPENDS+= gnutls.44:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} +.else CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +.endif .include "${.CURDIR}/Makefile.features" @@ -112,7 +114,7 @@ LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx CONFIGURE_ARGS+= --with-openldap USE_OPENLDAP= yes .endif -.if defined(WITH_LUA) || defined(WITH_STATSEXT) +.if defined(WITH_LUA) || defined(WITH_RBL) || defined(WITH_STATSEXT) CONFIGURE_ARGS+= --with-lua MAN3+= opendkim-lua.3 MAN8+= miltertest.8 diff --git a/mail/opendkim/Makefile.features b/mail/opendkim/Makefile.features index 8e464ea423c8..90ef55bce693 100644 --- a/mail/opendkim/Makefile.features +++ b/mail/opendkim/Makefile.features @@ -15,12 +15,12 @@ CONFIGURE_ARGS+= --enable-adsp_lists CONFIGURE_ARGS+= --enable-allsymbols .endif -.if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB) -CONFIGURE_ARGS+= --enable-bodylength_db +.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS) +CONFIGURE_ARGS+= --enable-atps .endif -.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS) -CONFIGURE_ARGS+= --enable-capture_unknown_errors +.if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB) +CONFIGURE_ARGS+= --enable-bodylength_db .endif .if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE) @@ -49,11 +49,27 @@ WITH_OPENLDAP= yes CONFIGURE_ARGS+= --enable-ldap_caching .endif +.if defined(WITH_MAXVERIFY) && !defined(WITHOUT_MAXVERIFY) +CONFIGURE_ARGS+= --enable-maxverify +.endif + +.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN) +CONFIGURE_ARGS+= --enable-oversign +.endif + .if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME) BROKEN= The feature ``_FFR_PARSE_TIME'' is incomplete, does not work 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_RBL) && !defined(WITHOUT_RBL) +CONFIGURE_ARGS+= --enable-rbl +.endif + .if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT) CONFIGURE_ARGS+= --enable-redirect .endif @@ -90,10 +106,6 @@ PLIST_SUB+= STATS="" PLIST_SUB+= STATS="@comment " .endif -.if defined(WITH_STATS_I) && !defined(WITHOUT_STATS_I) -CONFIGURE_ARGS+= --enable-stats_i -.endif - .if defined(WITH_STATSEXT) && !defined(WITHOUT_STATSEXT) CONFIGURE_ARGS+= --enable-statsext .endif diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo index 10488e23865c..8190698ba08d 100644 --- a/mail/opendkim/distinfo +++ b/mail/opendkim/distinfo @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.2.2.tar.gz) = 049fbf05ad6c22dacd0005886e4067533af6af6ebbd9ffb76ddcd2410d84c80b -SIZE (opendkim-2.2.2.tar.gz) = 1098812 +SHA256 (opendkim-2.3.2.tar.gz) = 40c566fe0a182d3c9019d39f3748928c7fa7178cafbfc678630ca85248f55548 +SIZE (opendkim-2.3.2.tar.gz) = 1281269 diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist index 82322ee5e690..fe8755c183ea 100644 --- a/mail/opendkim/pkg-plist +++ b/mail/opendkim/pkg-plist @@ -7,7 +7,6 @@ bin/opendkim-testadsp bin/opendkim-testkey etc/mail/opendkim.conf.sample %%ARLIB%%include/ar/ar.h -%%ARLIB%%include/ar/manual.h include/opendkim/dkim.h %%ARLIB%%lib/libar.a %%ARLIB%%lib/libar.la -- cgit