From umq.876@gmail.com  Thu Mar 28 06:22:04 2013
Return-Path: <umq.876@gmail.com>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 8E28B503
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Mar 2013 06:22:04 +0000 (UTC)
	(envelope-from umq.876@gmail.com)
Received: from mail-da0-x22b.google.com (mail-da0-x22b.google.com [IPv6:2607:f8b0:400e:c00::22b])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B786AB5
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Mar 2013 06:22:04 +0000 (UTC)
Received: by mail-da0-f43.google.com with SMTP id u36so4433861dak.30
        for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Mar 2013 23:22:04 -0700 (PDT)
Received: from nafbsd2.m.nd.to (p057007.dynamic.ppp.asahi-net.or.jp. [221.113.57.7])
        by mx.google.com with ESMTPS id ij15sm26423957pac.4.2013.03.27.23.22.00
        (version=TLSv1 cipher=RC4-SHA bits=128/128);
        Wed, 27 Mar 2013 23:22:02 -0700 (PDT)
Message-Id: <86txnw9h96.wl%umq@ueo.co.jp>
Date: Thu, 28 Mar 2013 15:21:25 +0900
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
Sender: Hirohisa Yamaguchi <umq.876@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [maintainer] mail/opendkim update to 2.8.2
X-Send-Pr-Version: 3.113

>Number:         177433
>Category:       ports
>Synopsis:       [maintainer] mail/opendkim update to 2.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 28 06:30:00 UTC 2013
>Closed-Date:    Thu Mar 28 22:59:06 UTC 2013
>Last-Modified:  Thu Mar 28 23:00:00 UTC 2013
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD **** 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	The new version of mail/opendkim 2.8.2 is now available.
	Release-announcement: http://lists.opendkim.org/archive/opendkim/announce/2013/03/0043.html

	This update supersedes ports/177168.


>How-To-Repeat:
	N/A
>Fix:

	The patch follows:

	M       mail/opendkim/Makefile                                   |    3 +-
	M       mail/opendkim/Makefile.options                           |    4 +--
	M       mail/opendkim/distinfo                                   |    4 +--
	D       mail/opendkim/files/patch-libopendkim__dkim-cache.c      |   18 ---------------
	D       mail/opendkim/files/patch-libopendkim__tests__t-test49.c |   26 ----------------------
	A       mail/opendkim/files/patch-librbl__rbl.c                  |   10 ++++++++
	A       mail/opendkim/files/patch-opendkim__opendkim.c           |   33 +++++++++++++++++++++++++++++
	 7 files changed, 49 insertions(+), 49 deletions(-)

Index: mail/opendkim/Makefile
===================================================================
--- mail/opendkim/Makefile	(revision 315437)
+++ mail/opendkim/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		opendkim
-PORTVERSION=		2.8.0
+PORTVERSION=		2.8.2
 CATEGORIES=		mail security
 MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	${PORTNAME} \
@@ -156,6 +156,7 @@
 
 pre-configure:
 	${REINPLACE_CMD} -e '/PKG_CONFIG/s/lua5/lua-5/' \
+	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \
 	${WRKSRC}/configure
 
 post-patch:
Index: mail/opendkim/Makefile.options
===================================================================
--- mail/opendkim/Makefile.options	(revision 315437)
+++ mail/opendkim/Makefile.options	(working copy)
@@ -4,7 +4,7 @@
 # This file is used to tune build time options.
 # Please refer FEATURES file distributed with the source for details.
 
-OPTIONS_DEFINE+=	XML FFR
+OPTIONS_DEFINE+=	FFR
 XML_DESC=		Prefer textproc/libxml2 to devel/jansson for JSON processing
 FFR_DESC=		Use features marked as For-Future-Releases
 
@@ -15,7 +15,7 @@
 			LDAP_CACHING POSTGRES_RECONNECT_HACK \
 			RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \
 			REPUTATION RESIGN SENDER_MACRO SOCKETDB \
-			STATSEXT VBR
+			STATSEXT VBR XML
 
 ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
 ALLSYMBOLS_DESC=		Export internal symbols for test
Index: mail/opendkim/distinfo
===================================================================
--- mail/opendkim/distinfo	(revision 315437)
+++ mail/opendkim/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.8.0.tar.gz) = a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c
-SIZE (opendkim-2.8.0.tar.gz) = 1175377
+SHA256 (opendkim-2.8.2.tar.gz) = 6ccb6a4a8906e18e2c487669bf0a24e7b8e7fd791da38ff45a5ab25264f071bc
+SIZE (opendkim-2.8.2.tar.gz) = 1181815
Index: mail/opendkim/files/patch-libopendkim__dkim-cache.c
===================================================================
--- mail/opendkim/files/patch-libopendkim__dkim-cache.c	(revision 315437)
+++ mail/opendkim/files/patch-libopendkim__dkim-cache.c	(working copy)
@@ -1,18 +0,0 @@
-diff --git a/libopendkim/dkim-cache.c b/libopendkim/dkim-cache.c
-index 1bb10e8..3a0d6c5 100644
---- ./libopendkim/dkim-cache.c
-+++ ./libopendkim/dkim-cache.c
-@@ -508,7 +508,13 @@ dkim_cache_stats(DB *db, u_int *queries, u_int *hits, u_int *expired,
- #if DB_VERSION_CHECK(2,0,0)
- 		DB_HASH_STAT *sp;
- 
-+# if DB_VERSION_CHECK(4,3,0)
- 		if (db->stat(db, NULL, (void *) &sp, 0) != 0)
-+# elif DB_VERSION_CHECK(4,0,0)
-+		if (db->stat(db, (void *) &sp, 0) != 0)
-+# else /* DB_VERSION_CHECK(4,0,0) */
-+		if (db->stat(db, (void *) &sp, NULL, 0) != 0)
-+# endif /* DB_VERSION_CHECK(4,0,0) */
- 		{
- 			*keys = (u_int) -1;
- 		}
Index: mail/opendkim/files/patch-libopendkim__tests__t-test49.c
===================================================================
--- mail/opendkim/files/patch-libopendkim__tests__t-test49.c	(revision 315437)
+++ mail/opendkim/files/patch-libopendkim__tests__t-test49.c	(working copy)
@@ -1,26 +0,0 @@
-diff --git a/libopendkim/tests/t-test49.c b/libopendkim/tests/t-test49.c
-index e54cb37..318ad8a 100644
---- ./libopendkim/tests/t-test49.c
-+++ ./libopendkim/tests/t-test49.c
-@@ -53,7 +53,7 @@ main(int argc, char **argv)
- 
- 	int status;
- 	int err;
--	u_int s1, s2, s3;
-+	u_int s1, s2, s3, s4;
- 	size_t buflen;
- 	DB *cache;
- 	char buf[BUFRSZ + 1];
-@@ -99,10 +99,11 @@ main(int argc, char **argv)
- 	assert(status == 1);
- 
- 	printf("--- retrieve cache stats\n");
--	dkim_cache_stats(&s1, &s2, &s3);
-+	dkim_cache_stats(cache, &s1, &s2, &s3, &s4, FALSE);
- 	assert(s1 == 3);
- 	assert(s2 == 1);
- 	assert(s3 == 1);
-+	assert(s4 == 0);
- 
- 	dkim_cache_close(cache);
- #endif /* ! QUERY_CACHE */
Index: mail/opendkim/files/patch-librbl__rbl.c
===================================================================
--- mail/opendkim/files/patch-librbl__rbl.c	(revision 0)
+++ mail/opendkim/files/patch-librbl__rbl.c	(working copy)
@@ -0,0 +1,10 @@
+--- ./librbl/rbl.c.orig	2012-10-25 07:12:31.000000000 +0900
++++ ./librbl/rbl.c	2013-03-21 02:26:41.000000000 +0900
+@@ -312,6 +312,7 @@
+ 
+ 	free(tmp);
+ #endif /* HAVE_RES_SETSERVERS */
++	return 0;
+ }
+ 
+ /*
Index: mail/opendkim/files/patch-opendkim__opendkim.c
===================================================================
--- mail/opendkim/files/patch-opendkim__opendkim.c	(revision 0)
+++ mail/opendkim/files/patch-opendkim__opendkim.c	(working copy)
@@ -0,0 +1,33 @@
+--- ./opendkim/opendkim.c.orig	2013-03-20 03:02:40.000000000 +0900
++++ ./opendkim/opendkim.c	2013-03-21 02:47:29.000000000 +0900
+@@ -12421,7 +12421,7 @@
+ 			{
+ 				syslog(LOG_INFO,
+ 				       "%s: can't parse default sender value '%s'",
+-				       dfc->mctx_jobid, from);
++				       dfc->mctx_jobid, conf->conf_defsender);
+ 			}
+ #endif /* _FFR_DEFAULT_SENDER */
+ 		}
+@@ -14945,8 +14945,8 @@
+ 				for (c = 0; c < nsigs && domain == NULL; c++)
+ 				{
+ 					if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
+-					    (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
+-					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
++					    ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
++					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
+ 						continue;
+ 
+ 					cd = dkim_sig_getdomain(sigs[c]);
+@@ -15121,8 +15121,8 @@
+ 				for (c = 0; c < nsigs; c++)
+ 				{
+ 					if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
+-					    (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
+-					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
++					    ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
++					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
+ 						continue;
+ 
+ 					checked = TRUE;
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Thu Mar 28 08:03:16 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177433 
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Thu Mar 28 22:59:04 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177433 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177433: commit references a PR
Date: Thu, 28 Mar 2013 22:59:04 +0000 (UTC)

 Author: madpilot
 Date: Thu Mar 28 22:58:55 2013
 New Revision: 315506
 URL: http://svnweb.freebsd.org/changeset/ports/315506
 
 Log:
   Update to 2.8.2
   
   PR:		ports/177433
   Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
 
 Added:
   head/mail/opendkim/files/patch-librbl__rbl.c   (contents, props changed)
   head/mail/opendkim/files/patch-opendkim__opendkim.c   (contents, props changed)
 Deleted:
   head/mail/opendkim/files/patch-libopendkim__dkim-cache.c
   head/mail/opendkim/files/patch-libopendkim__tests__t-test49.c
 Modified:
   head/mail/opendkim/Makefile
   head/mail/opendkim/Makefile.options
   head/mail/opendkim/distinfo
 
 Modified: head/mail/opendkim/Makefile
 ==============================================================================
 --- head/mail/opendkim/Makefile	Thu Mar 28 22:55:18 2013	(r315505)
 +++ head/mail/opendkim/Makefile	Thu Mar 28 22:58:55 2013	(r315506)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=		opendkim
 -PORTVERSION=		2.8.0
 +PORTVERSION=		2.8.2
  CATEGORIES=		mail security
  MASTER_SITES=		SF
  MASTER_SITE_SUBDIR=	${PORTNAME} \
 @@ -156,6 +156,7 @@ PLIST_SUB+=		LUA="@comment "
  
  pre-configure:
  	${REINPLACE_CMD} -e '/PKG_CONFIG/s/lua5/lua-5/' \
 +	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \
  	${WRKSRC}/configure
  
  post-patch:
 
 Modified: head/mail/opendkim/Makefile.options
 ==============================================================================
 --- head/mail/opendkim/Makefile.options	Thu Mar 28 22:55:18 2013	(r315505)
 +++ head/mail/opendkim/Makefile.options	Thu Mar 28 22:58:55 2013	(r315506)
 @@ -4,8 +4,7 @@
  # 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
 +OPTIONS_DEFINE+=	FFR
  FFR_DESC=		Use features marked as For-Future-Releases
  
  OPTIONS_GROUP+=		FFR
 @@ -15,7 +14,7 @@ OPTIONS_GROUP_FFR=	ADSP_LISTS ALLSYMBOLS
  			LDAP_CACHING POSTGRES_RECONNECT_HACK \
  			RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \
  			REPUTATION RESIGN SENDER_MACRO SOCKETDB \
 -			STATSEXT VBR
 +			STATSEXT VBR XML
  
  ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
  ALLSYMBOLS_DESC=		Export internal symbols for test
 @@ -41,3 +40,4 @@ SENDER_MACRO_DESC=		Macro to determine s
  SOCKETDB_DESC=			Arbitrary socket data sets
  STATSEXT_DESC=			Extended stats
  VBR_DESC=			Vouch-By-Reference support
 +XML_DESC=			Prefer textproc/libxml2 to devel/jansson for JSON processing
 
 Modified: head/mail/opendkim/distinfo
 ==============================================================================
 --- head/mail/opendkim/distinfo	Thu Mar 28 22:55:18 2013	(r315505)
 +++ head/mail/opendkim/distinfo	Thu Mar 28 22:58:55 2013	(r315506)
 @@ -1,2 +1,2 @@
 -SHA256 (opendkim-2.8.0.tar.gz) = a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c
 -SIZE (opendkim-2.8.0.tar.gz) = 1175377
 +SHA256 (opendkim-2.8.2.tar.gz) = 6ccb6a4a8906e18e2c487669bf0a24e7b8e7fd791da38ff45a5ab25264f071bc
 +SIZE (opendkim-2.8.2.tar.gz) = 1181815
 
 Added: head/mail/opendkim/files/patch-librbl__rbl.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/opendkim/files/patch-librbl__rbl.c	Thu Mar 28 22:58:55 2013	(r315506)
 @@ -0,0 +1,10 @@
 +--- ./librbl/rbl.c.orig	2012-10-25 07:12:31.000000000 +0900
 ++++ ./librbl/rbl.c	2013-03-21 02:26:41.000000000 +0900
 +@@ -312,6 +312,7 @@
 + 
 + 	free(tmp);
 + #endif /* HAVE_RES_SETSERVERS */
 ++	return 0;
 + }
 + 
 + /*
 
 Added: head/mail/opendkim/files/patch-opendkim__opendkim.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/opendkim/files/patch-opendkim__opendkim.c	Thu Mar 28 22:58:55 2013	(r315506)
 @@ -0,0 +1,33 @@
 +--- ./opendkim/opendkim.c.orig	2013-03-20 03:02:40.000000000 +0900
 ++++ ./opendkim/opendkim.c	2013-03-21 02:47:29.000000000 +0900
 +@@ -12421,7 +12421,7 @@
 + 			{
 + 				syslog(LOG_INFO,
 + 				       "%s: can't parse default sender value '%s'",
 +-				       dfc->mctx_jobid, from);
 ++				       dfc->mctx_jobid, conf->conf_defsender);
 + 			}
 + #endif /* _FFR_DEFAULT_SENDER */
 + 		}
 +@@ -14945,8 +14945,8 @@
 + 				for (c = 0; c < nsigs && domain == NULL; c++)
 + 				{
 + 					if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
 +-					    (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
 +-					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
 ++					    ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
 ++					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
 + 						continue;
 + 
 + 					cd = dkim_sig_getdomain(sigs[c]);
 +@@ -15121,8 +15121,8 @@
 + 				for (c = 0; c < nsigs; c++)
 + 				{
 + 					if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
 +-					    (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
 +-					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)
 ++					    ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 &&
 ++					    dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
 + 						continue;
 + 
 + 					checked = TRUE;
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
