Attachment 114804 Details for Bug 156518 – file.diff

[patch] file.diff

file.diff (text/plain), 4.69 KB, created by Hirohisa Yamaguchi on 2011-04-20 14:40:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2011-04-20 14:40:07 UTC

Size: 4.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- Makefile	29 Nov 2010 19:01:14 -0000	1.5
>+++ Makefile	20 Apr 2011 13:31:58 -0000
>@@ -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 @@
> 	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,14 @@
> .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
> CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
> 
>-.if ${OSVERSION} < 700000
>-WITH_OPENSSL_PORT=	yes
>-.endif
>+.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
> .include "${PORTSDIR}/Mk/bsd.openssl.mk"
> CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
>+.endif
> 
> .include "${.CURDIR}/Makefile.features"
> 
>@@ -112,7 +115,7 @@
> 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
>Index: Makefile.features
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/Makefile.features,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.features
>--- Makefile.features	29 Nov 2010 19:01:14 -0000	1.3
>+++ Makefile.features	20 Apr 2011 13:31:58 -0000
>@@ -15,12 +15,12 @@
> 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 @@
> 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="@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
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/distinfo,v
>retrieving revision 1.4
>diff -u -r1.4 distinfo
>--- distinfo	29 Nov 2010 19:01:14 -0000	1.4
>+++ distinfo	20 Apr 2011 13:31:58 -0000
>@@ -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
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/pkg-plist,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-plist
>--- pkg-plist	29 Nov 2010 19:01:14 -0000	1.4
>+++ pkg-plist	20 Apr 2011 13:31:58 -0000
>@@ -7,7 +7,6 @@
> 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
>cvs diff: Diffing files

Actions: View | Diff

Attachments on bug 156518: 114804