Date: Mon, 12 Nov 2012 13:04:37 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307334 - in head: mail/opendkim mail/opendkim/files security/vuxml Message-ID: <201211121304.qACD4b14018104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Nov 12 13:04:37 2012 New Revision: 307334 URL: http://svnweb.freebsd.org/changeset/ports/307334 Log: - Update to 2.7.1 - Convert to new options framework - Document US-CERT VU#268267 - Trim Makefile headers PR: ports/173226 Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer) Feature safe: yes Added: head/mail/opendkim/Makefile.options (contents, props changed) head/mail/opendkim/files/patch-Makefile.in (contents, props changed) head/mail/opendkim/files/patch-libopendkim__dkim.c (contents, props changed) Modified: head/mail/opendkim/Makefile (contents, props changed) head/mail/opendkim/Makefile.features (contents, props changed) head/mail/opendkim/distinfo (contents, props changed) head/mail/opendkim/pkg-plist (contents, props changed) head/security/vuxml/vuln.xml Modified: head/mail/opendkim/Makefile ============================================================================== --- head/mail/opendkim/Makefile Mon Nov 12 12:07:56 2012 (r307333) +++ head/mail/opendkim/Makefile Mon Nov 12 13:04:37 2012 (r307334) @@ -1,12 +1,8 @@ -# New ports collection makefile for: opendkim -# Date created: 2009-08-26 -# Whom: Hirohisa Yamaguchi <umq@ueo.co.jp> -# +# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp> # $FreeBSD$ -# PORTNAME= opendkim -PORTVERSION= 2.5.2 +PORTVERSION= 2.7.1 CATEGORIES= mail security MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} \ @@ -17,7 +13,6 @@ COMMENT= DKIM library and milter implem LICENSE= BSD SENDMAIL LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail LICENSE_GROUPS_SENDMAIL= FSF OSI @@ -25,29 +20,40 @@ LICENSE_NAME_SENDMAIL= Sendmail Open Sou LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes +MAKE_JOBS_SAFE= 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 +PORTDOCS= * -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= STOCK_RESOLVER UNBOUND +OPTIONS_DEFINE= FILTER GNUTLS LUA MEMCACHED BDB_BASE OPENDBX OPENLDAP \ + POPAUTH QUERY_CACHE STATS +OPTIONS_DEFAULT= FILTER LUA UNBOUND + +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 +BDB_BASE_DESC= Use Berkeley DB from base +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 <bsd.port.pre.mk> +.include "${.CURDIR}/Makefile.options" +.include <bsd.port.options.mk> -.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER) +.if ${PORT_OPTIONS:MFILTER} USE_RC_SUBR= milter-opendkim MAN5+= opendkim.conf.5 MAN8+= opendkim.8 @@ -62,8 +68,8 @@ CONFIGURE_ARGS+= --disable-filter PLIST_SUB+= FILTER="@comment " .endif -.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 +77,74 @@ CONFIGURE_ARGS+= --with-openssl=${OPENSS .include "${.CURDIR}/Makefile.features" -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if !defined(NOPORTDOCS) -PORTDOCS= * -.else +.if ! ${PORT_OPTIONS:MDOCS} 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 +MAN8+= opendkim-expire.8 opendkim-gengraphs.8 \ + opendkim-genstats.8 opendkim-stats.8 +. if ${PORT_OPTIONS:MOPENDBX} +MAN1+= opendkim-spam.1 +MAN8+= opendkim-importstats.8 +. endif +PLIST_SUB+= STATS="" +.else +PLIST_SUB+= STATS="@comment " +.endif +.if ${PORT_OPTIONS:MPOPAUTH} \ + || ${PORT_OPTIONS:MQUERY_CACHE} \ + || ${PORT_OPTIONS:MLDAP_CACHING} \ + || ${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= 41+ +. endif .endif -.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND) -.if defined(WITH_ARLIB) -IGNORE= libar cannot be used simultaneously with libunbound -.endif -CONFIGURE_ARGS+= --with-unbound \ - --disable-arlib +.if ${PORT_OPTIONS:MUNBOUND} +CONFIGURE_ARGS+= --with-unbound LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound -PLIST_SUB+= ARLIB="@comment " -.else -.if defined(WITH_ARLIB) -PLIST_SUB+= ARLIB="" -CONFIGURE_ARGS+= --enable-arlib -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 +PLIST_SUB+= ODBX="" +.else +CONFIGURE_ARGS+= --without-odbx +PLIST_SUB+= ODBX="@comment " .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,16 +155,16 @@ PLIST_SUB+= LUA="@comment " .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 regression-test: build cd ${WRKSRC} ; ${MAKE} check -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/opendkim/Makefile.features ============================================================================== --- head/mail/opendkim/Makefile.features Mon Nov 12 12:07:56 2012 (r307333) +++ head/mail/opendkim/Makefile.features Mon Nov 12 13:04:37 2012 (r307334) @@ -1,22 +1,18 @@ -# Makefile.features -# Author: Hirohisa Yamaguchi <umq@ueo.co.jp> -# +# 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 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 +20,26 @@ PLIST_SUB+= ATPS="" 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 +47,31 @@ PLIST_SUB+= DKIMREP="" 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) -CONFIGURE_ARGS+= --enable-lua_globals -WITH_LUA= yes -.endif - -.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN) -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} 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 +79,64 @@ PLIST_SUB+= RBL="" 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: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}/textproc/libxml2 +. else +CONFIGURE_ARGS+= --with-libjansson +LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson +. endif MAN3+= ut.3 -MAN8+= opendkim-genrates.8 opendkim-modtotals.8 +MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \ + opendkim-rephistory.8 PLIST_SUB+= REPUTE="" .else +CONFIGURE_ARGS+= --without-libcurl PLIST_SUB+= REPUTE="@comment " .endif -.if defined(WITH_REPUTATION_CACHE) && !defined(WITHOUT_REPUTATION_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 Added: head/mail/opendkim/Makefile.options ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opendkim/Makefile.options Mon Nov 12 13:04:37 2012 (r307334) @@ -0,0 +1,42 @@ +# 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+= XML FFR +XML_DESC= Prefer textproc/libxml2 to devel/jansson for JSON processing +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 Modified: head/mail/opendkim/distinfo ============================================================================== --- head/mail/opendkim/distinfo Mon Nov 12 12:07:56 2012 (r307333) +++ head/mail/opendkim/distinfo Mon Nov 12 13:04:37 2012 (r307334) @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.5.2.tar.gz) = fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9 -SIZE (opendkim-2.5.2.tar.gz) = 1475225 +SHA256 (opendkim-2.7.1.tar.gz) = 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed +SIZE (opendkim-2.7.1.tar.gz) = 1153665 Added: head/mail/opendkim/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opendkim/files/patch-Makefile.in Mon Nov 12 13:04:37 2012 (r307334) @@ -0,0 +1,29 @@ +--- ./Makefile.in.orig 2012-10-31 03:14:49.000000000 +0900 ++++ ./Makefile.in 2012-11-12 16:39:23.000000000 +0900 +@@ -61,7 +61,6 @@ + @STATS_TRUE@am__append_6 = stats + @REPUTE_TRUE@am__append_7 = libut reputation + @REPRRD_TRUE@am__append_8 = reprrd +-@JANSSON_TRUE@am__append_9 = autobuild + subdir = . + DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +@@ -139,8 +138,7 @@ + CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = libstrl libopendkim contrib docs libvbr librbl \ +- libdkimrep miltertest stats libut reputation reprrd autobuild \ +- opendkim ++ libdkimrep miltertest stats libut reputation reprrd opendkim + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -419,7 +417,7 @@ + SUBDIRS = $(am__append_1) libopendkim contrib docs $(am__append_2) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) $(am__append_7) $(am__append_8) \ +- $(am__append_9) opendkim ++ opendkim + dist_doc_DATA = FEATURES KNOWNBUGS LICENSE LICENSE.Sendmail \ + RELEASE_NOTES.Sendmail + Added: head/mail/opendkim/files/patch-libopendkim__dkim.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opendkim/files/patch-libopendkim__dkim.c Mon Nov 12 13:04:37 2012 (r307334) @@ -0,0 +1,20 @@ +--- ./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 */ Modified: head/mail/opendkim/pkg-plist ============================================================================== --- head/mail/opendkim/pkg-plist Mon Nov 12 12:07:56 2012 (r307333) +++ head/mail/opendkim/pkg-plist Mon Nov 12 13:04:37 2012 (r307334) @@ -1,27 +1,15 @@ @comment $FreeBSD$ %%LUA%%bin/miltertest -%%ATPS%%bin/opendkim-atpszone -bin/opendkim-genkey -%%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 +%%REPRRD%%bin/opendkim-reprrdimport +%%ODBX%%%%STATS%%bin/opendkim-spam 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 @@ -29,11 +17,15 @@ include/opendkim/dkim.h lib/libopendkim.a lib/libopendkim.la lib/libopendkim.so -lib/libopendkim.so.6 +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 @@ -46,7 +38,6 @@ lib/libopendkim.so.6 %%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 @@ -54,5 +45,26 @@ libdata/pkgconfig/opendkim.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 Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Mon Nov 12 12:07:56 2012 (r307333) +++ head/security/vuxml/vuln.xml Mon Nov 12 13:04:37 2012 (r307334) @@ -51,6 +51,33 @@ Note: Please add new entries to the beg --> <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">; + <vuln vid="a537b449-2b19-11e2-b339-90e6ba652cce"> + <topic>DomainKeys Identified Mail (DKIM) Verifiers may inappropriately convey message trust</topic> + <affects> + <package> + <name>opendkim</name> + <range><lt>2.7.1</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml">; + <p>US-CERT reports:</p> + <blockquote cite="http://www.kb.cert.org/vuls/id/268267">; + <p>DomainKeys Identified Mail (DKIM) Verifiers may + inappropriately convey message trust when messages are + signed using test or small bit signing keys.</p> + </blockquote> + </body> + </description> + <references> + <certvu>268267</certvu> + </references> + <dates> + <discovery>2012-11-24</discovery> + <entry>2012-11-12</entry> + </dates> + </vuln> + <vuln vid="e02c572f-2af0-11e2-bb44-003067b2972c"> <topic>weechat -- Crash or freeze when decoding IRC colors in strings</topic> <affects>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211121304.qACD4b14018104>