Date: Thu, 11 Oct 2012 11:49:33 GMT From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/171276: [PATCH] mail/opendkim: update to 2.6.7 Message-ID: <201210111149.q9BBnXXL062739@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/171276; it has been noted by GNATS.
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: bug-followup@freebsd.org
Cc: jaap@NLnetLabs.nl
Subject: Re: ports/171276: [PATCH] mail/opendkim: update to 2.6.7
Date: Thu, 11 Oct 2012 11:05:10 +0900
--Multipart_Thu_Oct_11_11:05:10_2012-1
Content-Type: text/plain; charset=US-ASCII
Hi,
Retry attaching a patch in text/plain
- update to 2.6.7
- compliant with OPTIONS NG
--
Hirohisa Yamaguchi
<umq@ueo.co.jp>
--Multipart_Thu_Oct_11_11:05:10_2012-1
Content-Type: text/plain; type=patch; charset=US-ASCII
Content-Disposition: attachment; filename="mail_opendkim_171276.patch"
Content-Transfer-Encoding: 7bit
Index: mail/opendkim/Makefile.options
===================================================================
--- mail/opendkim/Makefile.options (revision 0)
+++ mail/opendkim/Makefile.options (working copy)
@@ -0,0 +1,46 @@
+# Makefile.options
+# Author: Hirohisa Yamaguchi <umq@ueo.co.jp>
+#
+# This file is used to tune build time options.
+# Please refer FEATURES file distributed with the source for details.
+#
+# $FreeBSD$
+#
+
+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 \
+ LUA_GLOBALS OVERSIGN POSTGRES_RECONNECT_HACK \
+ RATE_LIMIT RBL REDIRECT REPLACE_RULES \
+ REPUTATION REPUTATION_CACHE 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
+LUA_GLOBALS_DESC= Passing global variabls between Lua scripts
+OVERSIGN_DESC= Enable optional header field over-signing
+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
+REPUTATION_DESC= Reputation check (experimental)
+REPUTATION_CACHE_DESC= Reputation caching (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
Index: mail/opendkim/Makefile.features
===================================================================
--- mail/opendkim/Makefile.features (revision 305697)
+++ mail/opendkim/Makefile.features (working copy)
@@ -7,16 +7,15 @@
# $FreeBSD$
#
-.if defined(WITH_ADSP_LISTS) && !defined(WITHOUT_ADSP_LISTS)
+.if ${PORT_OPTIONS:MADSP_LISTS}
CONFIGURE_ARGS+= --enable-adsp_lists
.endif
-.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
+.if ${PORT_OPTIONS:MALLSYMBOLS}
CONFIGURE_ARGS+= --enable-allsymbols
.endif
-.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS)
-WITH_XTAGS= yes
+.if ${PORT_OPTIONS:MATPS}
CONFIGURE_ARGS+= --enable-atps
MAN8+= opendkim-atpszone.8
PLIST_SUB+= ATPS=""
@@ -24,24 +23,26 @@
PLIST_SUB+= ATPS="@comment "
.endif
-.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
+.if ${PORT_OPTIONS:MCODECOVERAGE}
CONFIGURE_ARGS+= --enable-codecoverage
.endif
-.if defined(WITH_DB_HANDLE_POOLS) && !defined(WITHOUT_DB_HANDLE_POOLS)
+.if ${PORT_OPTIONS:MDB_HANDLE_POOLS}
CONFIGURE_ARGS+= --enable-db_handle_pools
.endif
-.if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER)
+.if ${PORT_OPTIONS:MDEFAULT_SENDER}
CONFIGURE_ARGS+= --enable-default_sender
.endif
-.if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
+.if ${PORT_OPTIONS:MDIFFHEADERS}
CONFIGURE_ARGS+= --enable-diffheaders
LIB_DEPENDS+= tre:${PORTSDIR}/textproc/libtre
+.else
+CONFIGURE_ARGS+= --without-tre
.endif
-.if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION)
+.if ${PORT_OPTIONS:MDKIM_REPUTATION}
CONFIGURE_ARGS+= --enable-dkim_reputation
MAN3+= dkim-rep.3
PLIST_SUB+= DKIMREP=""
@@ -49,37 +50,40 @@
PLIST_SUB+= DKIMREP="@comment "
.endif
-.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)
+.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 defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING)
+.if ${PORT_OPTIONS:MLDAP_CACHING}
WITH_OPENLDAP= yes
CONFIGURE_ARGS+= --enable-ldap_caching
.endif
-.if defined(WITH_LUA_GLOBALS) && !defined(WITHOUT_LUA_GLOBALS)
+.if ${PORT_OPTIONS:MLUA_GLOBALS}
CONFIGURE_ARGS+= --enable-lua_globals
WITH_LUA= yes
.endif
-.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN)
+.if ${PORT_OPTIONS:MOVERSIGN}
CONFIGURE_ARGS+= --enable-oversign
.endif
-.if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME)
-CONFIGURE_ARGS+= --enable-parsetime
+.if ${PORT_OPTIONS:MPOSTGRES_RECONNECT_HACK}
+CONFIGURE_ARGS+= --enable-postgresql_reconnect_hack
.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)
+.if ${PORT_OPTIONS:MRATE_LIMIT} || ${PORT_OPTIONS:MRESIGN}
CONFIGURE_ARGS+= --enable-rate_limit
.endif
-.if defined(WITH_RBL) && !defined(WITHOUT_RBL)
+.if ${PORT_OPTIONS:MRBL}
CONFIGURE_ARGS+= --enable-rbl
MAN3+= rbl.3
PLIST_SUB+= RBL=""
@@ -87,64 +91,57 @@
PLIST_SUB+= RBL="@comment "
.endif
-.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT)
+.if ${PORT_OPTIONS:MREDIRECT}
CONFIGURE_ARGS+= --enable-redirect
.endif
-.if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES)
+.if ${PORT_OPTIONS:MREPLACE_RULES}
CONFIGURE_ARGS+= --enable-replace_rules
.endif
-.if defined(WITH_REPUTATION) && !defined(WITHOUT_REPUTATION)
-CONFIGURE_ARGS+= --enable-reputation
+.if ${PORT_OPTIONS:MREPUTATION}
+CONFIGURE_ARGS+= --enable-reputation \
+ --with-libcurl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+. if defined(WITH_LIBXML2) && !defined(WITHOUT_LIBXML2)
+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
PLIST_SUB+= REPUTE=""
.else
+CONFIGURE_ARGS+= --without-libcurl
PLIST_SUB+= REPUTE="@comment "
.endif
-.if defined(WITH_REPUTATION_CACHE) && !defined(WITHOUT_REPUTATION_CACHE)
+.if ${PORT_OPTIONS:MREPUTATION_CACHE}
CONFIGURE_ARGS+= --enable-reputation_cache
.endif
-.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
+.if ${PORT_OPTIONS:MRESIGN}
CONFIGURE_ARGS+= --enable-resign
.endif
-.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
-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)
+.if ${PORT_OPTIONS:MSENDER_MACRO}
CONFIGURE_ARGS+= --enable-sender_macro
.endif
-.if defined(WITH_STATS) || defined(WITH_STATSEXT)
-CONFIGURE_ARGS+= --enable-stats
-MAN1+= opendkim-spam.1
-MAN8+= opendkim-stats.8
-PLIST_SUB+= STATS=""
-.else
-PLIST_SUB+= STATS="@comment "
+.if ${PORT_OPTIONS:MSOCKETDB}
+CONFIGURE_ARGS+= --enable-socketdb
.endif
-.if defined(WITH_STATSEXT) && !defined(WITHOUT_STATSEXT)
+.if ${PORT_OPTIONS:MSTATSEXT}
CONFIGURE_ARGS+= --enable-statsext
.endif
-.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
+.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
Index: mail/opendkim/pkg-plist
===================================================================
--- mail/opendkim/pkg-plist (revision 305697)
+++ mail/opendkim/pkg-plist (working copy)
@@ -21,7 +21,7 @@
%%ARLIB%%lib/libar.a
%%ARLIB%%lib/libar.la
%%ARLIB%%lib/libar.so
-%%ARLIB%%lib/libar.so.2
+%%ARLIB%%lib/libar.so.3
%%DKIMREP%%lib/libdkimrep.a
%%DKIMREP%%lib/libdkimrep.la
%%DKIMREP%%lib/libdkimrep.so
@@ -29,7 +29,7 @@
lib/libopendkim.a
lib/libopendkim.la
lib/libopendkim.so
-lib/libopendkim.so.6
+lib/libopendkim.so.7
%%RBL%%lib/librbl.a
%%RBL%%lib/librbl.la
%%RBL%%lib/librbl.so
Index: mail/opendkim/Makefile
===================================================================
--- mail/opendkim/Makefile (revision 305697)
+++ mail/opendkim/Makefile (working copy)
@@ -6,10 +6,11 @@
#
PORTNAME= opendkim
-PORTVERSION= 2.5.2
+PORTVERSION= 2.6.7
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
+ ${PORTNAME}/Pre-Releases \
${PORTNAME}/Previous%20Releases
MAINTAINER= umq@ueo.co.jp
@@ -17,7 +18,6 @@
LICENSE= BSD SENDMAIL
LICENSE_COMB= multi
-LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail
LICENSE_GROUPS_SENDMAIL= FSF OSI
@@ -25,29 +25,38 @@
LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
GNU_CONFIGURE= yes
+NO_OPTIONS_SORT=yes
USE_OPENSSL= yes
USE_LDCONFIG= yes
MAN8= opendkim-genkey.8 opendkim-genzone.8 opendkim-testadsp.8 \
opendkim-testkey.8 opendkim-testmsg.8
-OPTIONS= \
- ARLIB "Asynchronous thread-safe DNS library" On \
- FILTER "OpenDKIM filter, requires libmilter/Sendmail" On \
- GNUTLS "Use GnuTLS instead of OpenSSL" Off \
- LUA "Describe filter policy with lua" Off \
- MEMCACHED "Use memcached as a data set" Off \
- OPENDBX "Store filter policies via OpenDBX" Off \
- OPENLDAP "Store filter policies in LDAP" Off \
- POPAUTH "Use POP authentication DB" Off \
- QUERY_CACHE "Cache DNS query results locally" Off \
- UNBOUND "Use unbound DNS library" Off
+OPTIONS_SINGLE= RESOLV
+OPTIONS_SINGLE_RESOLV= ARLIB STOCK_RESOLVER UNBOUND
+OPTIONS_DEFINE= FILTER GNUTLS LUA MEMCACHED OPENDBX OPENLDAP \
+ POPAUTH QUERY_CACHE STATS
+OPTIONS_DEFAULT= FILTER LUA UNBOUND
+ARLIB_DESC= Asynchronous thread-safe DNS library
+STOCK_RESOLVER_DESC= Use the stock resolver library
+UNBOUND_DESC= Use unbound DNS library
+FILTER_DESC= OpenDKIM filter, requires libmilter/Sendmail
+GNUTLS_DESC= Use GnuTLS instead of OpenSSL
+LUA_DESC= Describe filter policy with lua
+MEMCACHED_DESC= Use memcached as a data set
+OPENDBX_DESC= Store filter policies via OpenDBX
+OPENLDAP_DESC= Store filter policies in LDAP
+POPAUTH_DESC= Use POP authentication DB
+QUERY_CACHE_DESC= Cache DNS query results locally
+STATS_DESC= Setup statistics tools
+
MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
+.include "${.CURDIR}/Makefile.options"
.include <bsd.port.pre.mk>
-.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
+.if ${PORT_OPTIONS:MFILTER}
USE_RC_SUBR= milter-opendkim
MAN5+= opendkim.conf.5
MAN8+= opendkim.8
@@ -61,9 +70,10 @@
CONFIGURE_ARGS+= --disable-filter
PLIST_SUB+= FILTER="@comment "
.endif
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
@@ -71,66 +81,75 @@
.include "${.CURDIR}/Makefile.features"
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-debug
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
.else
CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
.endif
-.if (defined(WITH_POPAUTH) \
- || defined(WITH_QUERY_CACHE) \
- || defined(WITH_BODYLENGTH_DB) \
- || defined(WITH_LDAP_CACHING) \
- || defined(WITH_STATS)) \
- && !defined(WITH_BDB_BASE)
+.if ${PORT_OPTIONS:MSTATS} || ${PORT_OPTIONS:MSTATSEXT}
+CONFIGURE_ARGS+= --enable-stats
+MAN1+= opendkim-spam.1
+MAN8+= opendkim-stats.8
+PLIST_SUB+= STATS=""
+.else
+PLIST_SUB+= STATS="@comment "
+.endif
+.if ${PORT_OPTIONS:MPOPAUTH} \
+ || ${PORT_OPTIONS:MQUERY_CACHE} \
+ || ${PORT_OPTIONS:MLDAP_CACHING} \
+ || ${PORT_OPTIONS:MSTATS}
+. if !defined(WITH_BDB_BASE)
CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \
--with-db-libdir=${BDB_LIB_DIR} \
--with-db-lib=${BDB_LIB_NAME}
USE_BDB= 41+
+. endif
.endif
-.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
-.if defined(WITH_ARLIB)
-IGNORE= libar cannot be used simultaneously with libunbound
+.if ${PORT_OPTIONS:MUNBOUND}
+CONFIGURE_ARGS+= --with-unbound
+LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound
.endif
-CONFIGURE_ARGS+= --with-unbound \
- --disable-arlib
-LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound
-PLIST_SUB+= ARLIB="@comment "
-.else
-.if defined(WITH_ARLIB)
+.if ${PORT_OPTIONS:MARLIB}
PLIST_SUB+= ARLIB=""
CONFIGURE_ARGS+= --enable-arlib
-MAN3= ar.3
+MAN3+= ar.3
.else
CONFIGURE_ARGS+= --disable-arlib
PLIST_SUB+= ARLIB="@comment "
.endif
-.endif
-.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
+.if ${PORT_OPTIONS:MPOPAUTH}
CONFIGURE_ARGS+= --enable-popauth
.endif
-.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
+.if ${PORT_OPTIONS:MQUERY_CACHE}
CONFIGURE_ARGS+= --enable-query_cache
.endif
-.if defined(WITH_MEMCACHED)
+.if ${PORT_OPTIONS:MMEMCACHED}
CONFIGURE_ARGS+= --with-libmemcached
LIB_DEPENDS+= memcached:${PORTSDIR}/databases/libmemcached
+.else
+CONFIGURE_ARGS+= --without-libmemcached
.endif
-.if defined(WITH_OPENDBX)
+.if ${PORT_OPTIONS:MOPENDBX}
CONFIGURE_ARGS+= --with-odbx
LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx
+.else
+CONFIGURE_ARGS+= --without-odbx
.endif
-.if defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MOPENLDAP}
CONFIGURE_ARGS+= --with-openldap
+LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap24-sasl-client
USE_OPENLDAP= yes
+.else
+CONFIGURE_ARGS+= --without-openldap
.endif
-.if defined(WITH_LUA) || defined(WITH_RBL) || defined(WITH_STATSEXT)
+.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MRBL} || ${PORT_OPTIONS:MSTATSEXT}
CONFIGURE_ARGS+= --with-lua
-. if !defined(WITHOUT_FILTER)
+. if ${PORT_OPTIONS:MFILTER}
MAN3+= opendkim-lua.3
. endif
MAN8+= miltertest.8
@@ -141,12 +160,12 @@
.endif
post-install:
-.if !defined(WITH_DEBUG) && defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
+.if !${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER}
@${STRIP_CMD} ${PREFIX}/sbin/opendkim
.endif
@${MKDIR} ${PREFIX}/etc/mail
${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
-.if !defined(WITHOUT_FILTER)
+.if ${PORT_OPTIONS:MFILTER}
@${CAT} ${PKGMESSAGE}
.endif
Index: mail/opendkim/distinfo
===================================================================
--- mail/opendkim/distinfo (revision 305697)
+++ mail/opendkim/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.5.2.tar.gz) = fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9
-SIZE (opendkim-2.5.2.tar.gz) = 1475225
+SHA256 (opendkim-2.6.7.tar.gz) = 45da209ccddfb6f6888ac2366b6e38a6460b36ff0da527aed910217cead6fc84
+SIZE (opendkim-2.6.7.tar.gz) = 1129124
--Multipart_Thu_Oct_11_11:05:10_2012-1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210111149.q9BBnXXL062739>