Attachment 116606 Details for Bug 158575 – file.diff

[patch] file.diff

file.diff (text/plain), 5.29 KB, created by Hirohisa Yamaguchi on 2011-07-01 19:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2011-07-01 19:10:04 UTC

Size: 5.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	5 Jun 2011 18:43:08 -0000	1.7
>+++ Makefile	1 Jul 2011 17:23:32 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	opendkim
>-PORTVERSION=	2.3.2
>-PORTREVISION=	1
>+PORTVERSION=	2.4.1
> CATEGORIES=	mail security
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -18,10 +17,12 @@
> LICENSE=	BSD SENDMAIL
> LICENSE_COMB=	multi
> LICENSE_FILE=	${WRKSRC}/LICENSE
>+
> LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
> LICENSE_GROUPS_SENDMAIL=	FSF OSI
> LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
> LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
> USE_RC_SUBR=	milter-opendkim
>@@ -36,7 +37,9 @@
> 
> OPTIONS= \
> 	ARLIB		"Asynchronous thread-safe DNS library"	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 \
>@@ -92,6 +95,9 @@
> PLIST_SUB+=		ARLIB="@comment "
> .else
> .if defined(WITH_ARLIB)
>+. if ${CC} == "clang"
>+BROKEN=		ARLIB option does not compile with clang
>+. endif
> PLIST_SUB+=		ARLIB=""
> CONFIGURE_ARGS+=	--enable-arlib
> MAN3=			ar.3
>@@ -106,6 +112,10 @@
> .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
> CONFIGURE_ARGS+=	--enable-query_cache
> .endif
>+.if defined(WITH_MEMCACHED)
>+CONFIGURE_ARGS+=	--with-libmemcached
>+LIB_DEPENDS+=		memcached:${PORTSDIR}/databases/libmemcached
>+.endif
> .if defined(WITH_OPENDBX)
> CONFIGURE_ARGS+=	--with-odbx
> LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
>Index: Makefile.features
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/Makefile.features,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.features
>--- Makefile.features	27 Apr 2011 10:12:21 -0000	1.4
>+++ Makefile.features	1 Jul 2011 17:23:32 -0000
>@@ -19,14 +19,14 @@
> CONFIGURE_ARGS+=	--enable-atps
> .endif
> 
>-.if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
>-CONFIGURE_ARGS+=	--enable-bodylength_db
>-.endif
>-
> .if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
> CONFIGURE_ARGS+=	--enable-codecoverage
> .endif
> 
>+.if defined(WITH_DB_HANDLE_POOLS) && !defined(WITHOUT_DB_HANDLE_POOLS)
>+CONFIGURE_ARGS+=	--enable-db_handle_pools
>+.endif
>+
> .if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER)
> CONFIGURE_ARGS+=	--enable-default_sender
> .endif
>@@ -49,8 +49,8 @@
> CONFIGURE_ARGS+=	--enable-ldap_caching
> .endif
> 
>-.if defined(WITH_MAXVERIFY) && !defined(WITHOUT_MAXVERIFY)
>-CONFIGURE_ARGS+=	--enable-maxverify
>+.if defined(WITH_LUA_GLOBALS) && !defined(WITHOUT_LUA_GLOBALS)
>+CONFIGURE_ARGS+=	--enable-lua_globals
> .endif
> 
> .if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN)
>@@ -66,6 +66,10 @@
> CONFIGURE_ARGS+=	--enable-postgres_reconnect_hack
> .endif
> 
>+.if defined(WITH_RATE_LIMIT) && !defined(WITHOUT_RATE_LIMIT)
>+CONFIGURE_ARGS+=	--enable-rate_limit
>+.endif
>+
> .if defined(WITH_RBL) && !defined(WITHOUT_RBL)
> CONFIGURE_ARGS+=	--enable-rbl
> .endif
>@@ -98,7 +102,7 @@
> CONFIGURE_ARGS+=	--enable-sender_macro
> .endif
> 
>-.if defined(WITH_STATS) || defined(WITH_STATS_I) || defined(WITH_STATSEXT)
>+.if defined(WITH_STATS) || defined(WITH_STATSEXT)
> CONFIGURE_ARGS+=	--enable-stats
> MAN8+=			opendkim-stats.8
> PLIST_SUB+=		STATS=""
>@@ -113,3 +117,7 @@
> .if defined(WITH_VBR) && !defined(WITHOUT_VBR)
> CONFIGURE_ARGS+=	--enable-vbr
> .endif
>+
>+.if defined(WITH_XTAGS) && !defined(WITHOUT_XTAGS)
>+CONFIGURE_ARGS+=	--enable-xtags
>+.endif
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/distinfo,v
>retrieving revision 1.5
>diff -u -r1.5 distinfo
>--- distinfo	27 Apr 2011 10:12:21 -0000	1.5
>+++ distinfo	1 Jul 2011 17:23:32 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (opendkim-2.3.2.tar.gz) = 40c566fe0a182d3c9019d39f3748928c7fa7178cafbfc678630ca85248f55548
>-SIZE (opendkim-2.3.2.tar.gz) = 1281269
>+SHA256 (opendkim-2.4.1.tar.gz) = 1567a6d41dba92977d3eaae726580c5ecdc74766866331e87fc201792333b1f2
>+SIZE (opendkim-2.4.1.tar.gz) = 1322057
>cvs diff: Diffing files
>Index: files/patch-libopendkim_tests_t-test144.c
>===================================================================
>RCS file: files/patch-libopendkim_tests_t-test144.c
>diff -N files/patch-libopendkim_tests_t-test144.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-libopendkim_tests_t-test144.c	1 Jul 2011 17:23:32 -0000
>@@ -0,0 +1,13 @@
>+diff --git a/libopendkim/tests/t-test144.c b/libopendkim/tests/t-test144.c
>+index d64c718..a380b40 100644
>+--- libopendkim/tests/t-test144.c
>++++ libopendkim/tests/t-test144.c
>+@@ -28,7 +28,7 @@ static char t_test144_c_id[] = "@(#)$Id: t-test00.c,v 1.2 2009/12/08 19:14:27 cm
>+ #define	MAXHEADER	4096
>+ 
>+ #define BADKEY		"-----BEGIN RSA PRIVATE KEY-----" \
>+-	"MIICXQIBAAKBgQC4GUGr+d/6SFNzVLYpphnRd0QPGKz2uWnV65RAxa1Pw352Bqiz" \
>++	"MIICXQIBAAKBgQC4GUGr*d/6SFNzVLYpphnRd0QPGKz2uWnV65RAxa1Pw352Bqiz" \
>+ 	"qiKOBjgYGzj8pJQSs8tOvv/2k6jpI809RnESqOFgF0gu3UJbNnu3+cd8k/kiQj+q" \
>+ 	"4cKKRpAT92ccxc7svhCNgN1sBGmROYZuysG3Vu3Dyc079gSLtnSrgXb+gQIDAQAB" \
>+ 	"AoGAemlI0opm1Kvs2T4VliH8/tvX5FXbBH8LEZQAUwVeFTB/UQlieXyCV39pIxZO" \

Actions: View | Diff

Attachments on bug 158575: 116606