From alan@p-o.co.uk  Tue Jul 23 15:33:09 2013
Return-Path: <alan@p-o.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 566D6D35
	for <freebsd-gnats-submit@freebsd.org>; Tue, 23 Jul 2013 15:33:09 +0000 (UTC)
	(envelope-from alan@p-o.co.uk)
Received: from avasout06.plus.net (avasout06.plus.net [212.159.14.18])
	by mx1.freebsd.org (Postfix) with ESMTP id A9E6C24BC
	for <freebsd-gnats-submit@freebsd.org>; Tue, 23 Jul 2013 15:33:08 +0000 (UTC)
Received: from mail.p-o.co.uk ([80.229.143.200])
	by avasout06 with smtp
	id 3rVw1m0024Ke75s01rVxj9; Tue, 23 Jul 2013 16:29:57 +0100
Received: from alan by p-o.co.uk with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <alan@p-o.co.uk>)
	id 1V1eNx-000I8N-R4
	for FreeBSD-gnats-submit@freebsd.org; Tue, 23 Jul 2013 16:20:21 +0100
Message-Id: <E1V1eNx-000I8N-R4@p-o.co.uk>
Date: Tue, 23 Jul 2013 16:20:21 +0100
From: Alan Hicks <ahicks@p-o.co.uk>
Reply-To: Alan Hicks <ahicks@p-o.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer patch] Upgrade mail/dbmail from 3.0.2 to 3.1.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         180768
>Category:       ports
>Synopsis:       [Maintainer patch] Upgrade mail/dbmail from 3.0.2 to 3.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 23 15:40:01 UTC 2013
>Closed-Date:    Thu Jul 25 19:58:30 UTC 2013
>Last-Modified:  Thu Jul 25 20:00:00 UTC 2013
>Originator:     Alan Hicks
>Release:        FreeBSD 9.1-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:38:17 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Upgrade dbmail to 3.1.0, fixes many issues including memory leaks.
Also upgrades to libevent2
	
>How-To-Repeat:
	
>Fix:
Apply attached patch.  Also UPDATING message to advise changes.

  dbmail has been updated to 3.1.0
  Changes include a minor schema update and config changes see
  share/dbmail/* and share/doc/dbmail/UPGRADING for details

	

--- dbmail-302-310.diff begins here ---
diff -uNr dbmail/Makefile dbmail/Makefile
--- dbmail/Makefile	2013-07-19 21:57:59.000000000 +0100
+++ dbmail/Makefile	2013-07-23 13:07:20.000000000 +0100
@@ -1,21 +1,21 @@
 # Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
-# $FreeBSD: mail/dbmail/Makefile 323328 2013-07-19 20:57:59Z cs $
+# $FreeBSD: mail/dbmail/Makefile 319067 2013-05-25 18:57:44Z az $
 
 PORTNAME=	dbmail
-PORTVERSION=	3.0.2
-PORTREVISION=	7
+PORTVERSION=	3.1.0
+PORTREVISION=	0
 CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/3.0/
+MASTER_SITES=	http://www.dbmail.org/download/3.1/
 
 MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gmime-2.4:${PORTSDIR}/mail/gmime24 \
+LIB_DEPENDS=	gmime-2.6:${PORTSDIR}/mail/gmime24 \
 		zdb:${PORTSDIR}/databases/libzdb \
 		mhash:${PORTSDIR}/security/mhash \
-		event:${PORTSDIR}/devel/libevent
+		event-2:${PORTSDIR}/devel/libevent2
 
 CONFLICTS=	dbmail-2.*
 
@@ -30,15 +30,16 @@
 		xmlto:${PORTSDIR}/textproc/xmlto
 .endif
 
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	libtool autoheader autoconf
 USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 USE_OPENSSL=	yes
 USES=	shebangfix
 SHEBANG_FILES=	man/fixsp.pl
+WITH_DEBUG=	yes
 
-CFLAGS+=	-fPIC ${PTHREAD_CFLAGS}
+CFLAGS+=	-fPIC ${PTHREAD_CFLAGS} -DDEBUG
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
@@ -87,7 +88,7 @@
 
 .if ${PORT_OPTIONS:MTHREADS}
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-acinclude.m4
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
+#EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
diff -uNr dbmail/distinfo dbmail/distinfo
--- dbmail/distinfo	2012-07-14 14:54:48.000000000 +0100
+++ dbmail/distinfo	2013-07-23 13:07:37.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (dbmail-3.0.2.tar.gz) = 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e
-SIZE (dbmail-3.0.2.tar.gz) = 867560
+SHA256 (dbmail-3.1.0.tar.gz) = 60afd82c4787340e5814ea10571d04c47ec3723a9759448b763d95c44229ce84
+SIZE (dbmail-3.1.0.tar.gz) = 2396832
diff -uNr dbmail/files/extra-patch-acinclude.m4 dbmail/files/extra-patch-acinclude.m4
--- dbmail/files/extra-patch-acinclude.m4	2012-07-14 14:54:48.000000000 +0100
+++ dbmail/files/extra-patch-acinclude.m4	2013-06-03 18:57:44.000000000 +0100
@@ -1,6 +1,6 @@
---- acinclude.m4.orig	2012-05-30 16:42:44.000000000 +0100
-+++ acinclude.m4	2012-05-30 16:44:28.000000000 +0100
-@@ -235,7 +235,7 @@
+--- acinclude.m4.orig
++++ acinclude.m4
+@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
          dnl See if we already have the paths we need in the environment.
  	dnl ...but only if --with-ldap was given without a specific path.
          if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
@@ -9,7 +9,7 @@
              if test [ "x$LDAPLIB" != "xfailed" ]; then
                  break
              fi
-@@ -247,7 +247,7 @@
+@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
              SAVE_CFLAGS=$CFLAGS
  	    dnl The headers might be in a funny place, so we need to use -Ipath
              CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
@@ -18,3 +18,12 @@
              CFLAGS=$SAVE_CFLAGS
              if test [ "x$LDAPLIB" != "xfailed" ]; then
                  break 2
+@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
+         AC_MSG_ERROR([Could not find LDAP library.])
+     else
+         AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])
+-        AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
++        AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
+         AC_SUBST(LDAPLIB)
+         AC_SUBST(LDAPINC)
+         AUTHALIB="modules/.libs/libauth_ldap.a"
diff -uNr dbmail/files/extra-patch-configure dbmail/files/extra-patch-configure
--- dbmail/files/extra-patch-configure	2012-07-14 14:54:48.000000000 +0100
+++ dbmail/files/extra-patch-configure	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-+++ configure.orig	2012-03-11 08:02:30.000000000 +0000
---- configure	2012-05-31 12:47:22.000000000 +0100
-@@ -4420,7 +4420,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LDAP_H 1
- _ACEOF
-- LDAPLIB="-lldap"
-+ LDAPLIB="-lldap_r"
- else
-   LDAPLIB="failed"
- fi
-@@ -4443,7 +4443,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LDAP_H 1
- _ACEOF
-- LDAPLIB="-L$TEST_PATH -lldap"
-+ LDAPLIB="-L$TEST_PATH -lldap_r"
- else
-   LDAPLIB="failed"
- fi
-@@ -4489,7 +4489,7 @@
-   return 0;
- }
- _ACEOF
--for ac_lib in '' ldap; do
-+for ac_lib in '' ldap_r; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
diff -uNr dbmail/files/patch-acinclude.m4 dbmail/files/patch-acinclude.m4
--- dbmail/files/patch-acinclude.m4	1970-01-01 01:00:00.000000000 +0100
+++ dbmail/files/patch-acinclude.m4	2013-05-31 14:45:59.000000000 +0100
@@ -0,0 +1,58 @@
+--- acinclude.m4.orig	2013-05-31 14:03:59.000000000 +0100
++++ acinclude.m4	2013-05-31 14:45:49.000000000 +0100
+@@ -23,7 +23,7 @@
+  SOCKETS:                   $SOCKETLIB
+  MATH:                      $MATHLIB
+  MHASH:                     $MHASHLIB
+- LIBEVENT:                  $EVENTLIB
++ LIBEVENT:                  $ac_event_libs
+  OPENSSL:                   $SSLLIB
+  ZDB:                       $ZDBLIB
+  JEMALLOC:                  $JEMALLOCLIB
+@@ -342,13 +342,40 @@
+ 	fi
+ ])
+ 
+-AC_DEFUN([DM_CHECK_EVENT], [
+-	AC_CHECK_HEADERS([event.h], [EVENTLIB="-levent_pthreads -levent"],[EVENTLIB="failed"], [#include <event2/event.h>])
+-	if test [ "x$EVENTLIB" = "xfailed" ]; then
+-		AC_MSG_ERROR([Could not find EVENT library.])
+-	else
+-		LDFLAGS="$LDFLAGS $EVENTLIB"
++AC_DEFUN([DM_CHECK_EVENT], [dnl
++AC_PATH_PROG(eventconfig,pkg-config)
++if test [ -z "$eventconfig" ]
++then
++	AC_MSG_ERROR([pkg-config executable not found. Make sure pkg-config is in your path])
++else
++	AC_MSG_CHECKING([Event headers])
++	ac_event_cflags=`${eventconfig} --cflags libevent_pthreads`
++	if test -z "$ac_event_cflags"
++	then
++		AC_MSG_RESULT([no])
++		AC_MSG_ERROR([Unable to locate event development files])
++	fi
++ 
++	CFLAGS="$CFLAGS $ac_event_cflags"
++	AC_MSG_RESULT([$ac_event_cflags])
++        AC_MSG_CHECKING([Event libraries])
++	ac_event_libs=`${eventconfig} --libs libevent_pthreads`
++	if test -z "$ac_event_libs"
++	then
++		AC_MSG_RESULT([no])
++		AC_MSG_ERROR([Unable to locate event libaries])
+ 	fi
++ 	ac_event_minvers="2.0"
++	AC_MSG_CHECKING([Event version >= $ac_event_minvers])
++	ac_event_vers=`${eventconfig}  --atleast-version=$ac_event_minvers libevent_pthreads>/dev/null && echo yes`
++	if test -z "$ac_event_vers"
++	then
++		AC_MSG_ERROR([At least Event version $ac_event_minvers is required.])
++	fi
++
++	LDFLAGS="$LDFLAGS $ac_event_libs"
++        AC_MSG_RESULT([$ac_event_libs])
++fi
+ ])
+ 
+ AC_DEFUN([DM_CHECK_SSL], [
diff -uNr dbmail/files/patch-src_clientbase.c dbmail/files/patch-src_clientbase.c
--- dbmail/files/patch-src_clientbase.c	2012-07-14 14:54:48.000000000 +0100
+++ dbmail/files/patch-src_clientbase.c	2013-07-23 13:21:44.000000000 +0100
@@ -1,20 +1,28 @@
---- src/clientbase.c.orig	2012-06-19 17:49:50.000000000 +0100
-+++ src/clientbase.c	2012-06-19 17:50:29.000000000 +0100
-@@ -160,7 +160,7 @@
+--- src/clientbase.c.orig	2013-07-22 20:03:36.000000000 +0100
++++ src/clientbase.c	2013-07-23 13:14:56.000000000 +0100
+@@ -159,14 +159,14 @@
+ 		client->tx		= STDOUT_FILENO;
  	} else {
  		/* server-side */
- 		TRACE(TRACE_DEBUG,"saddr [%p] sa_family [%d] len [%d]", c->saddr, c->saddr->sa_family, c->saddr_len);
 -		if ((serr = getnameinfo(c->saddr, c->saddr_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV, 
 +		if ((serr = getnameinfo(c->saddr, c->saddr->sa_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV, 
  						NI_NUMERICHOST | NI_NUMERICSERV))) {
  			TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
  		}
-@@ -168,7 +168,7 @@
  
  		/* client-side */
- 		TRACE(TRACE_DEBUG,"caddr [%p] sa_family [%d] len [%d]", c->caddr, c->caddr->sa_family, c->caddr_len);
--		if ((serr = getnameinfo(c->caddr, c->caddr_len, client->src_ip, NI_MAXHOST, client->src_port, NI_MAXSERV,
-+		if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->src_ip, NI_MAXHOST, client->src_port, NI_MAXSERV,
- 						NI_NUMERICHOST | NI_NUMERICSERV))) {
- 			TRACE(TRACE_EMERG, "getnameinfo:error [%s]", gai_strerror(serr));
- 		} 
+ 		if (server_conf->resolveIP) {
+-			if ((serr = getnameinfo(c->caddr, c->caddr_len, client->clientname, NI_MAXHOST, NULL, 0,
++			if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->clientname, NI_MAXHOST, NULL, 0,
+ 						       	NI_NAMEREQD))) {
+ 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
+ 			} 
+@@ -177,7 +177,7 @@
+ 					client->clientname[0] ? client->clientname : "Lookup failed");
+ 		} else {
+ 
+-			if ((serr = getnameinfo(c->caddr, c->caddr_len, client->src_ip, NI_MAXHOST, client->src_port,
++			if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->src_ip, NI_MAXHOST, client->src_port,
+ 						       	NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) {
+ 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
+ 			} 
diff -uNr dbmail/files/patch-src_dbmail.h.in dbmail/files/patch-src_dbmail.h.in
--- dbmail/files/patch-src_dbmail.h.in	2012-07-14 14:54:48.000000000 +0100
+++ dbmail/files/patch-src_dbmail.h.in	2013-06-04 12:19:46.000000000 +0100
@@ -1,6 +1,22 @@
---- src/dbmail.h.in.orig	2012-05-31 13:06:26.000000000 +0100
-+++ src/dbmail.h.in	2012-05-31 13:07:01.000000000 +0100
-@@ -150,6 +150,10 @@
+--- src/dbmail.h.in.orig
++++ src/dbmail.h.in
+@@ -83,8 +83,14 @@
+ #include <mhash.h>
+ #include <sys/queue.h>
+ #include <event2/event.h>
++#include <event2/event_compat.h>
+ #include <event2/thread.h>
+-#include <evhttp.h>
++#include <event2/http.h>
++#include <event2/http_struct.h>
++#include <event2/http_compat.h>
++#include <event2/buffer.h>
++#include <event2/buffer_compat.h>
++#include <event2/keyvalq_struct.h>
+ #include <math.h>
+ #include <openssl/ssl.h>
+ 
+@@ -154,6 +160,11 @@
  #include <endian.h>
  #endif
  
@@ -8,6 +24,7 @@
 +#include "config.h"
 +#endif
 +
++
  #define GETCONFIGVALUE(key, sect, var) \
- 	config_get_value(key, sect, var); \
- 	if (strlen(var) > 0) \
+        config_get_value(key, sect, var); \
+        if (strlen(var) > 0) \
diff -uNr dbmail/pkg-plist dbmail/pkg-plist
--- dbmail/pkg-plist	2012-07-14 14:54:48.000000000 +0100
+++ dbmail/pkg-plist	2013-07-23 13:35:44.000000000 +0100
@@ -1,19 +1,15 @@
 @unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi
 etc/dbmail.conf-dist
 @exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
-%%LDAP%%lib/dbmail/libauth_ldap.a
 %%LDAP%%lib/dbmail/libauth_ldap.la
 %%LDAP%%lib/dbmail/libauth_ldap.so
 %%LDAP%%lib/dbmail/libauth_ldap.so.0
-lib/dbmail/libauth_sql.a
 lib/dbmail/libauth_sql.la
 lib/dbmail/libauth_sql.so
 lib/dbmail/libauth_sql.so.0
-lib/dbmail/libdbmail.a
 lib/dbmail/libdbmail.la
 lib/dbmail/libdbmail.so
 lib/dbmail/libdbmail.so.0
-%%SIEVE%%lib/dbmail/libsort_sieve.a
 %%SIEVE%%lib/dbmail/libsort_sieve.la
 %%SIEVE%%lib/dbmail/libsort_sieve.so
 %%SIEVE%%lib/dbmail/libsort_sieve.so.0
@@ -35,6 +31,7 @@
 %%DATADIR%%/mysql/2_3_4-2_3_5.mysql
 %%DATADIR%%/mysql/2_3_5-2_3_6.mysql
 %%DATADIR%%/mysql/2_3_6-3_0_0.mysql
+%%DATADIR%%/mysql/3_0_2-3_1_0.mysql
 %%DATADIR%%/mysql/create_tables.mysql
 %%DATADIR%%/mysql/fix_foreign_keys.mysql
 %%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
@@ -49,6 +46,7 @@
 %%DATADIR%%/postgresql/2_3_4-2_3_5.pgsql
 %%DATADIR%%/postgresql/2_3_5-2_3_6.pgsql
 %%DATADIR%%/postgresql/2_3_6-3_0_0.pgsql
+%%DATADIR%%/postgresql/3_0_2-3_1_0.psql
 %%DATADIR%%/postgresql/create_tables.pgsql
 %%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql
 %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
@@ -58,6 +56,7 @@
 %%DATADIR%%/sqlite/2_3_4-2_3_5.sqlite
 %%DATADIR%%/sqlite/2_3_5-2_3_6.sqlite
 %%DATADIR%%/sqlite/2_3_6-3_0_0.sqlite
+%%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite
 %%DATADIR%%/sqlite/create_tables.sqlite
 %%DATADIR%%/sqlite/trigger.tmpl.sql
 @dirrm %%DATADIR%%/sqlite
--- dbmail-302-310.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Alan Hicks <ahicks@p-o.co.uk>
To: bug-followup@FreeBSD.org, ahicks@p-o.co.uk
Cc:  
Subject: Re: ports/180768: [Maintainer patch] Upgrade mail/dbmail from 3.0.2
 to 3.1.0
Date: Thu, 25 Jul 2013 13:53:12 +0100

 This is a multi-part message in MIME format.
 --------------020801060603090504010903
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Update to 3.1.1 released earlier than expected.
 
 --------------020801060603090504010903
 Content-Type: text/plain; charset=UTF-8;
  name="dbmail-302-311.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="dbmail-302-311.diff"
 
 ZGlmZiAtdU5yIC91c3IvcG9ydHMvbWFpbC9kYm1haWwvTWFrZWZpbGUgZGJtYWlsL01ha2Vm
 aWxlCi0tLSBkYm1haWwvTWFrZWZpbGUJMjAxMy0wNy0xOSAyMTo1Nzo1OS4wMDAwMDAwMDAg
 KzAxMDAKKysrIGRibWFpbC9NYWtlZmlsZQkyMDEzLTA3LTI1IDEzOjM3OjQ0LjAwMDAwMDAw
 MCArMDEwMApAQCAtMSwyMSArMSwyMSBAQAogIyBDcmVhdGVkIGJ5OiBDbGVtZW50IExhZm9y
 ZXQgPHNoZWVwa2lsbGVyQGN1bHRkZWFkc2hlZXAub3JnPgotIyAkRnJlZUJTRDogbWFpbC9k
 Ym1haWwvTWFrZWZpbGUgMzIzMzI4IDIwMTMtMDctMTkgMjA6NTc6NTlaIGNzICQKKyMgJEZy
 ZWVCU0Q6IG1haWwvZGJtYWlsL01ha2VmaWxlIDMxOTA2NyAyMDEzLTA1LTI1IDE4OjU3OjQ0
 WiBheiAkCiAKIFBPUlROQU1FPQlkYm1haWwKLVBPUlRWRVJTSU9OPQkzLjAuMgotUE9SVFJF
 VklTSU9OPQk3CitQT1JUVkVSU0lPTj0JMy4xLjEKK1BPUlRSRVZJU0lPTj0JMAogQ0FURUdP
 UklFUz0JbWFpbAotTUFTVEVSX1NJVEVTPQlodHRwOi8vd3d3LmRibWFpbC5vcmcvZG93bmxv
 YWQvMy4wLworTUFTVEVSX1NJVEVTPQlodHRwOi8vd3d3LmRibWFpbC5vcmcvZG93bmxvYWQv
 My4xLwogCiBNQUlOVEFJTkVSPQlhaGlja3NAcC1vLmNvLnVrCiBDT01NRU5UPQlBbiBTUUwg
 ZGF0YWJhc2UtYmFzZWQgbWFpbCBzeXN0ZW0gKFBPUDMgYW5kIElNQVApCiAKIExJQ0VOU0U9
 CUdQTHYyCiAKLUxJQl9ERVBFTkRTPQlnbWltZS0yLjQ6JHtQT1JUU0RJUn0vbWFpbC9nbWlt
 ZTI0IFwKK0xJQl9ERVBFTkRTPQlnbWltZS0yLjY6JHtQT1JUU0RJUn0vbWFpbC9nbWltZTI0
 IFwKIAkJemRiOiR7UE9SVFNESVJ9L2RhdGFiYXNlcy9saWJ6ZGIgXAogCQltaGFzaDoke1BP
 UlRTRElSfS9zZWN1cml0eS9taGFzaCBcCi0JCWV2ZW50OiR7UE9SVFNESVJ9L2RldmVsL2xp
 YmV2ZW50CisJCWV2ZW50LTI6JHtQT1JUU0RJUn0vZGV2ZWwvbGliZXZlbnQyCiAKIENPTkZM
 SUNUUz0JZGJtYWlsLTIuKgogCkBAIC0zMCwxNSArMzAsMTYgQEAKIAkJeG1sdG86JHtQT1JU
 U0RJUn0vdGV4dHByb2MveG1sdG8KIC5lbmRpZgogCi1VU0VfQVVUT1RPT0xTPQlsaWJ0b29s
 CitVU0VfQVVUT1RPT0xTPQlsaWJ0b29sIGF1dG9oZWFkZXIgYXV0b2NvbmYKIFVTRV9HTUFL
 RT0JeWVzCiBVU0VfTERDT05GSUc9CSR7UFJFRklYfS9saWIvZGJtYWlsCiBVU0VfUkNfU1VC
 Uj0JZGJtYWlsLXBvcDNkIGRibWFpbC1sbXRwZCBkYm1haWwtaW1hcGQgZGJtYWlsLXRpbXNp
 ZXZlZAogVVNFX09QRU5TU0w9CXllcwogVVNFUz0Jc2hlYmFuZ2ZpeAogU0hFQkFOR19GSUxF
 Uz0JbWFuL2ZpeHNwLnBsCitXSVRIX0RFQlVHPQl5ZXMKIAotQ0ZMQUdTKz0JLWZQSUMgJHtQ
 VEhSRUFEX0NGTEFHU30KK0NGTEFHUys9CS1mUElDICR7UFRIUkVBRF9DRkxBR1N9IC1EREVC
 VUcKIENQUEZMQUdTKz0JLUkke0xPQ0FMQkFTRX0vaW5jbHVkZQogTERGTEFHUys9CS1MJHtM
 T0NBTEJBU0V9L2xpYiAke1BUSFJFQURfTElCU30KIENPTkZJR1VSRV9BUkdTKz0JLS13aXRo
 LXpkYj0ke0xPQ0FMQkFTRX0gLS1zeXNjb25mZGlyPSR7TE9DQUxCQVNFfS9ldGMKQEAgLTg3
 LDcgKzg4LDcgQEAKIAogLmlmICR7UE9SVF9PUFRJT05TOk1USFJFQURTfQogRVhUUkFfUEFU
 Q0hFUz0JJHtGSUxFU0RJUn0vZXh0cmEtcGF0Y2gtYWNpbmNsdWRlLm00Ci1FWFRSQV9QQVRD
 SEVTKz0JJHtGSUxFU0RJUn0vZXh0cmEtcGF0Y2gtY29uZmlndXJlCisjRVhUUkFfUEFUQ0hF
 Uys9CSR7RklMRVNESVJ9L2V4dHJhLXBhdGNoLWNvbmZpZ3VyZQogLmVuZGlmCiAKIC5pZiAk
 e1BPUlRfT1BUSU9OUzpNRE9DU30KZGlmZiAtdU5yIC91c3IvcG9ydHMvbWFpbC9kYm1haWwv
 ZGlzdGluZm8gZGJtYWlsL2Rpc3RpbmZvCi0tLSBkYm1haWwvZGlzdGluZm8JMjAxMi0wNy0x
 NCAxNDo1NDo0OC4wMDAwMDAwMDAgKzAxMDAKKysrIGRibWFpbC9kaXN0aW5mbwkyMDEzLTA3
 LTI1IDEzOjM4OjIwLjAwMDAwMDAwMCArMDEwMApAQCAtMSwyICsxLDIgQEAKLVNIQTI1NiAo
 ZGJtYWlsLTMuMC4yLnRhci5neikgPSAxMzk1NThmNGZhM2UwZjQ2MGQ2ODhmNmQyOTMxODM2
 NmNjM2Y0MGRkNTcwYTFhMjk0ODRiYjU4MGQwMTkwYzNlCi1TSVpFIChkYm1haWwtMy4wLjIu
 dGFyLmd6KSA9IDg2NzU2MAorU0hBMjU2IChkYm1haWwtMy4xLjEudGFyLmd6KSA9IDRkZjlm
 M2E4ZDEzYWYzYTVmNDFkZmFiNDgwZjg5YTllMzM4YjAyNWUzNmU0MmNiNzZkYzRmMzRiMjQy
 YWMxZTAKK1NJWkUgKGRibWFpbC0zLjEuMS50YXIuZ3opID0gMjM5ODU4MQpkaWZmIC11TnIg
 L3Vzci9wb3J0cy9tYWlsL2RibWFpbC9maWxlcy9leHRyYS1wYXRjaC1hY2luY2x1ZGUubTQg
 ZGJtYWlsL2ZpbGVzL2V4dHJhLXBhdGNoLWFjaW5jbHVkZS5tNAotLS0gZGJtYWlsL2ZpbGVz
 L2V4dHJhLXBhdGNoLWFjaW5jbHVkZS5tNAkyMDEyLTA3LTE0IDE0OjU0OjQ4LjAwMDAwMDAw
 MCArMDEwMAorKysgZGJtYWlsL2ZpbGVzL2V4dHJhLXBhdGNoLWFjaW5jbHVkZS5tNAkyMDEz
 LTA2LTAzIDE4OjU3OjQ0LjAwMDAwMDAwMCArMDEwMApAQCAtMSw2ICsxLDYgQEAKLS0tLSBh
 Y2luY2x1ZGUubTQub3JpZwkyMDEyLTA1LTMwIDE2OjQyOjQ0LjAwMDAwMDAwMCArMDEwMAot
 KysrIGFjaW5jbHVkZS5tNAkyMDEyLTA1LTMwIDE2OjQ0OjI4LjAwMDAwMDAwMCArMDEwMAot
 QEAgLTIzNSw3ICsyMzUsNyBAQAorLS0tIGFjaW5jbHVkZS5tNC5vcmlnCisrKysgYWNpbmNs
 dWRlLm00CitAQCAtMjM2LDcgKzIzNiw3IEBAIGlmICggdGVzdCBbICJ4JGxvb2tmb3JsZGFw
 IiAhPSAieG5vIiBdIHx8IHRlc3QgWyAieCRsb29rZm9yYXV0aGxkYXAiICE9ICJ4bm8iIF0K
 ICAgICAgICAgIGRubCBTZWUgaWYgd2UgYWxyZWFkeSBoYXZlIHRoZSBwYXRocyB3ZSBuZWVk
 IGluIHRoZSBlbnZpcm9ubWVudC4KICAJZG5sIC4uLmJ1dCBvbmx5IGlmIC0td2l0aC1sZGFw
 IHdhcyBnaXZlbiB3aXRob3V0IGEgc3BlY2lmaWMgcGF0aC4KICAgICAgICAgIGlmICggdGVz
 dCBbICJ4JGxvb2tmb3JsZGFwIiA9ICJ4eWVzIiBdIHx8IHRlc3QgWyAieCRsb29rZm9yYXV0
 aGxkYXAiID0gInh5ZXMiIF0gKTsgdGhlbgpAQCAtOSw3ICs5LDcgQEAKICAgICAgICAgICAg
 ICBpZiB0ZXN0IFsgIngkTERBUExJQiIgIT0gInhmYWlsZWQiIF07IHRoZW4KICAgICAgICAg
 ICAgICAgICAgYnJlYWsKICAgICAgICAgICAgICBmaQotQEAgLTI0Nyw3ICsyNDcsNyBAQAor
 QEAgLTI0OCw3ICsyNDgsNyBAQCBpZiAoIHRlc3QgWyAieCRsb29rZm9ybGRhcCIgIT0gInhu
 byIgXSB8fCB0ZXN0IFsgIngkbG9va2ZvcmF1dGhsZGFwIiAhPSAieG5vIiBdCiAgICAgICAg
 ICAgICAgU0FWRV9DRkxBR1M9JENGTEFHUwogIAkgICAgZG5sIFRoZSBoZWFkZXJzIG1pZ2h0
 IGJlIGluIGEgZnVubnkgcGxhY2UsIHNvIHdlIG5lZWQgdG8gdXNlIC1JcGF0aAogICAgICAg
 ICAgICAgIENGTEFHUz0iJENGTEFHUyAtTCRURVNUX1BBVEggJExEQVBJTkMiCkBAIC0xOCwz
 ICsxOCwxMiBAQAogICAgICAgICAgICAgIENGTEFHUz0kU0FWRV9DRkxBR1MKICAgICAgICAg
 ICAgICBpZiB0ZXN0IFsgIngkTERBUExJQiIgIT0gInhmYWlsZWQiIF07IHRoZW4KICAgICAg
 ICAgICAgICAgICAgYnJlYWsgMgorQEAgLTI2Miw3ICsyNjIsNyBAQCBpZiAoIHRlc3QgWyAi
 eCRsb29rZm9ybGRhcCIgIT0gInhubyIgXSB8fCB0ZXN0IFsgIngkbG9va2ZvcmF1dGhsZGFw
 IiAhPSAieG5vIiBdCisgICAgICAgICBBQ19NU0dfRVJST1IoW0NvdWxkIG5vdCBmaW5kIExE
 QVAgbGlicmFyeS5dKQorICAgICBlbHNlCisgICAgICAgICBBQ19ERUZJTkUoW0FVVEhMREFQ
 XSwgMSwgW0RlZmluZSBpZiBMREFQIHdpbGwgYmUgdXNlZC5dKQorLSAgICAgICAgQUNfU0VB
 UkNIX0xJQlMobGRhcF9pbml0aWFsaXplLCBsZGFwLCBBQ19ERUZJTkUoW0hBVkVfTERBUF9J
 TklUSUFMSVpFXSwgMSwgW2xkYXBfaW5pdGlhbGl6ZSgpIGNhbiBiZSB1c2VkIGluc3RlYWQg
 b2YgbGRhcF9pbml0KCldKSkKKysgICAgICAgIEFDX1NFQVJDSF9MSUJTKGxkYXBfaW5pdGlh
 bGl6ZSwgbGRhcF9yLCBBQ19ERUZJTkUoW0hBVkVfTERBUF9JTklUSUFMSVpFXSwgMSwgW2xk
 YXBfaW5pdGlhbGl6ZSgpIGNhbiBiZSB1c2VkIGluc3RlYWQgb2YgbGRhcF9pbml0KCldKSkK
 KyAgICAgICAgIEFDX1NVQlNUKExEQVBMSUIpCisgICAgICAgICBBQ19TVUJTVChMREFQSU5D
 KQorICAgICAgICAgQVVUSEFMSUI9Im1vZHVsZXMvLmxpYnMvbGliYXV0aF9sZGFwLmEiCmRp
 ZmYgLXVOciAvdXNyL3BvcnRzL21haWwvZGJtYWlsL2ZpbGVzL2V4dHJhLXBhdGNoLWNvbmZp
 Z3VyZSBkYm1haWwvZmlsZXMvZXh0cmEtcGF0Y2gtY29uZmlndXJlCi0tLSBkYm1haWwvZmls
 ZXMvZXh0cmEtcGF0Y2gtY29uZmlndXJlCTIwMTItMDctMTQgMTQ6NTQ6NDguMDAwMDAwMDAw
 ICswMTAwCisrKyBkYm1haWwvZmlsZXMvZXh0cmEtcGF0Y2gtY29uZmlndXJlCTE5NzAtMDEt
 MDEgMDE6MDA6MDAuMDAwMDAwMDAwICswMTAwCkBAIC0xLDI5ICswLDAgQEAKLSsrKyBjb25m
 aWd1cmUub3JpZwkyMDEyLTAzLTExIDA4OjAyOjMwLjAwMDAwMDAwMCArMDAwMAotLS0tIGNv
 bmZpZ3VyZQkyMDEyLTA1LTMxIDEyOjQ3OjIyLjAwMDAwMDAwMCArMDEwMAotQEAgLTQ0MjAs
 NyArNDQyMCw3IEBACi0gICBjYXQgPj5jb25mZGVmcy5oIDw8X0FDRU9GCi0gI2RlZmluZSBI
 QVZFX0xEQVBfSCAxCi0gX0FDRU9GCi0tIExEQVBMSUI9Ii1sbGRhcCIKLSsgTERBUExJQj0i
 LWxsZGFwX3IiCi0gZWxzZQotICAgTERBUExJQj0iZmFpbGVkIgotIGZpCi1AQCAtNDQ0Myw3
 ICs0NDQzLDcgQEAKLSAgIGNhdCA+PmNvbmZkZWZzLmggPDxfQUNFT0YKLSAjZGVmaW5lIEhB
 VkVfTERBUF9IIDEKLSBfQUNFT0YKLS0gTERBUExJQj0iLUwkVEVTVF9QQVRIIC1sbGRhcCIK
 LSsgTERBUExJQj0iLUwkVEVTVF9QQVRIIC1sbGRhcF9yIgotIGVsc2UKLSAgIExEQVBMSUI9
 ImZhaWxlZCIKLSBmaQotQEAgLTQ0ODksNyArNDQ4OSw3IEBACi0gICByZXR1cm4gMDsKLSB9
 Ci0gX0FDRU9GCi0tZm9yIGFjX2xpYiBpbiAnJyBsZGFwOyBkbwotK2ZvciBhY19saWIgaW4g
 JycgbGRhcF9yOyBkbwotICAgaWYgdGVzdCAteiAiJGFjX2xpYiI7IHRoZW4KLSAgICAgYWNf
 cmVzPSJub25lIHJlcXVpcmVkIgotICAgZWxzZQpkaWZmIC11TnIgL3Vzci9wb3J0cy9tYWls
 L2RibWFpbC9maWxlcy9wYXRjaC1hY2luY2x1ZGUubTQgZGJtYWlsL2ZpbGVzL3BhdGNoLWFj
 aW5jbHVkZS5tNAotLS0gZGJtYWlsL2ZpbGVzL3BhdGNoLWFjaW5jbHVkZS5tNAkxOTcwLTAx
 LTAxIDAxOjAwOjAwLjAwMDAwMDAwMCArMDEwMAorKysgZGJtYWlsL2ZpbGVzL3BhdGNoLWFj
 aW5jbHVkZS5tNAkyMDEzLTA1LTMxIDE0OjQ1OjU5LjAwMDAwMDAwMCArMDEwMApAQCAtMCww
 ICsxLDU4IEBACistLS0gYWNpbmNsdWRlLm00Lm9yaWcJMjAxMy0wNS0zMSAxNDowMzo1OS4w
 MDAwMDAwMDAgKzAxMDAKKysrKyBhY2luY2x1ZGUubTQJMjAxMy0wNS0zMSAxNDo0NTo0OS4w
 MDAwMDAwMDAgKzAxMDAKK0BAIC0yMyw3ICsyMyw3IEBACisgIFNPQ0tFVFM6ICAgICAgICAg
 ICAgICAgICAgICRTT0NLRVRMSUIKKyAgTUFUSDogICAgICAgICAgICAgICAgICAgICAgJE1B
 VEhMSUIKKyAgTUhBU0g6ICAgICAgICAgICAgICAgICAgICAgJE1IQVNITElCCistIExJQkVW
 RU5UOiAgICAgICAgICAgICAgICAgICRFVkVOVExJQgorKyBMSUJFVkVOVDogICAgICAgICAg
 ICAgICAgICAkYWNfZXZlbnRfbGlicworICBPUEVOU1NMOiAgICAgICAgICAgICAgICAgICAk
 U1NMTElCCisgIFpEQjogICAgICAgICAgICAgICAgICAgICAgICRaREJMSUIKKyAgSkVNQUxM
 T0M6ICAgICAgICAgICAgICAgICAgJEpFTUFMTE9DTElCCitAQCAtMzQyLDEzICszNDIsNDAg
 QEAKKyAJZmkKKyBdKQorIAorLUFDX0RFRlVOKFtETV9DSEVDS19FVkVOVF0sIFsKKy0JQUNf
 Q0hFQ0tfSEVBREVSUyhbZXZlbnQuaF0sIFtFVkVOVExJQj0iLWxldmVudF9wdGhyZWFkcyAt
 bGV2ZW50Il0sW0VWRU5UTElCPSJmYWlsZWQiXSwgWyNpbmNsdWRlIDxldmVudDIvZXZlbnQu
 aD5dKQorLQlpZiB0ZXN0IFsgIngkRVZFTlRMSUIiID0gInhmYWlsZWQiIF07IHRoZW4KKy0J
 CUFDX01TR19FUlJPUihbQ291bGQgbm90IGZpbmQgRVZFTlQgbGlicmFyeS5dKQorLQllbHNl
 CistCQlMREZMQUdTPSIkTERGTEFHUyAkRVZFTlRMSUIiCisrQUNfREVGVU4oW0RNX0NIRUNL
 X0VWRU5UXSwgW2RubAorK0FDX1BBVEhfUFJPRyhldmVudGNvbmZpZyxwa2ctY29uZmlnKQor
 K2lmIHRlc3QgWyAteiAiJGV2ZW50Y29uZmlnIiBdCisrdGhlbgorKwlBQ19NU0dfRVJST1Io
 W3BrZy1jb25maWcgZXhlY3V0YWJsZSBub3QgZm91bmQuIE1ha2Ugc3VyZSBwa2ctY29uZmln
 IGlzIGluIHlvdXIgcGF0aF0pCisrZWxzZQorKwlBQ19NU0dfQ0hFQ0tJTkcoW0V2ZW50IGhl
 YWRlcnNdKQorKwlhY19ldmVudF9jZmxhZ3M9YCR7ZXZlbnRjb25maWd9IC0tY2ZsYWdzIGxp
 YmV2ZW50X3B0aHJlYWRzYAorKwlpZiB0ZXN0IC16ICIkYWNfZXZlbnRfY2ZsYWdzIgorKwl0
 aGVuCisrCQlBQ19NU0dfUkVTVUxUKFtub10pCisrCQlBQ19NU0dfRVJST1IoW1VuYWJsZSB0
 byBsb2NhdGUgZXZlbnQgZGV2ZWxvcG1lbnQgZmlsZXNdKQorKwlmaQorKyAKKysJQ0ZMQUdT
 PSIkQ0ZMQUdTICRhY19ldmVudF9jZmxhZ3MiCisrCUFDX01TR19SRVNVTFQoWyRhY19ldmVu
 dF9jZmxhZ3NdKQorKyAgICAgICAgQUNfTVNHX0NIRUNLSU5HKFtFdmVudCBsaWJyYXJpZXNd
 KQorKwlhY19ldmVudF9saWJzPWAke2V2ZW50Y29uZmlnfSAtLWxpYnMgbGliZXZlbnRfcHRo
 cmVhZHNgCisrCWlmIHRlc3QgLXogIiRhY19ldmVudF9saWJzIgorKwl0aGVuCisrCQlBQ19N
 U0dfUkVTVUxUKFtub10pCisrCQlBQ19NU0dfRVJST1IoW1VuYWJsZSB0byBsb2NhdGUgZXZl
 bnQgbGliYXJpZXNdKQorIAlmaQorKyAJYWNfZXZlbnRfbWludmVycz0iMi4wIgorKwlBQ19N
 U0dfQ0hFQ0tJTkcoW0V2ZW50IHZlcnNpb24gPj0gJGFjX2V2ZW50X21pbnZlcnNdKQorKwlh
 Y19ldmVudF92ZXJzPWAke2V2ZW50Y29uZmlnfSAgLS1hdGxlYXN0LXZlcnNpb249JGFjX2V2
 ZW50X21pbnZlcnMgbGliZXZlbnRfcHRocmVhZHM+L2Rldi9udWxsICYmIGVjaG8geWVzYAor
 KwlpZiB0ZXN0IC16ICIkYWNfZXZlbnRfdmVycyIKKysJdGhlbgorKwkJQUNfTVNHX0VSUk9S
 KFtBdCBsZWFzdCBFdmVudCB2ZXJzaW9uICRhY19ldmVudF9taW52ZXJzIGlzIHJlcXVpcmVk
 Ll0pCisrCWZpCisrCisrCUxERkxBR1M9IiRMREZMQUdTICRhY19ldmVudF9saWJzIgorKyAg
 ICAgICAgQUNfTVNHX1JFU1VMVChbJGFjX2V2ZW50X2xpYnNdKQorK2ZpCisgXSkKKyAKKyBB
 Q19ERUZVTihbRE1fQ0hFQ0tfU1NMXSwgWwpkaWZmIC11TnIgL3Vzci9wb3J0cy9tYWlsL2Ri
 bWFpbC9maWxlcy9wYXRjaC1zcmNfY2xpZW50YmFzZS5jIGRibWFpbC9maWxlcy9wYXRjaC1z
 cmNfY2xpZW50YmFzZS5jCi0tLSBkYm1haWwvZmlsZXMvcGF0Y2gtc3JjX2NsaWVudGJhc2Uu
 YwkyMDEyLTA3LTE0IDE0OjU0OjQ4LjAwMDAwMDAwMCArMDEwMAorKysgZGJtYWlsL2ZpbGVz
 L3BhdGNoLXNyY19jbGllbnRiYXNlLmMJMjAxMy0wNy0yMyAxMzoyMTo0NC4wMDAwMDAwMDAg
 KzAxMDAKQEAgLTEsMjAgKzEsMjggQEAKLS0tLSBzcmMvY2xpZW50YmFzZS5jLm9yaWcJMjAx
 Mi0wNi0xOSAxNzo0OTo1MC4wMDAwMDAwMDAgKzAxMDAKLSsrKyBzcmMvY2xpZW50YmFzZS5j
 CTIwMTItMDYtMTkgMTc6NTA6MjkuMDAwMDAwMDAwICswMTAwCi1AQCAtMTYwLDcgKzE2MCw3
 IEBACistLS0gc3JjL2NsaWVudGJhc2UuYy5vcmlnCTIwMTMtMDctMjIgMjA6MDM6MzYuMDAw
 MDAwMDAwICswMTAwCisrKysgc3JjL2NsaWVudGJhc2UuYwkyMDEzLTA3LTIzIDEzOjE0OjU2
 LjAwMDAwMDAwMCArMDEwMAorQEAgLTE1OSwxNCArMTU5LDE0IEBACisgCQljbGllbnQtPnR4
 CQk9IFNURE9VVF9GSUxFTk87CiAgCX0gZWxzZSB7CiAgCQkvKiBzZXJ2ZXItc2lkZSAqLwot
 IAkJVFJBQ0UoVFJBQ0VfREVCVUcsInNhZGRyIFslcF0gc2FfZmFtaWx5IFslZF0gbGVuIFsl
 ZF0iLCBjLT5zYWRkciwgYy0+c2FkZHItPnNhX2ZhbWlseSwgYy0+c2FkZHJfbGVuKTsKIC0J
 CWlmICgoc2VyciA9IGdldG5hbWVpbmZvKGMtPnNhZGRyLCBjLT5zYWRkcl9sZW4sIGNsaWVu
 dC0+ZHN0X2lwLCBOSV9NQVhIT1NULCBjbGllbnQtPmRzdF9wb3J0LCBOSV9NQVhTRVJWLCAK
 ICsJCWlmICgoc2VyciA9IGdldG5hbWVpbmZvKGMtPnNhZGRyLCBjLT5zYWRkci0+c2FfbGVu
 LCBjbGllbnQtPmRzdF9pcCwgTklfTUFYSE9TVCwgY2xpZW50LT5kc3RfcG9ydCwgTklfTUFY
 U0VSViwgCiAgCQkJCQkJTklfTlVNRVJJQ0hPU1QgfCBOSV9OVU1FUklDU0VSVikpKSB7CiAg
 CQkJVFJBQ0UoVFJBQ0VfSU5GTywgImdldG5hbWVpbmZvOjplcnJvciBbJXNdIiwgZ2FpX3N0
 cmVycm9yKHNlcnIpKTsKICAJCX0KLUBAIC0xNjgsNyArMTY4LDcgQEAKICAKICAJCS8qIGNs
 aWVudC1zaWRlICovCi0gCQlUUkFDRShUUkFDRV9ERUJVRywiY2FkZHIgWyVwXSBzYV9mYW1p
 bHkgWyVkXSBsZW4gWyVkXSIsIGMtPmNhZGRyLCBjLT5jYWRkci0+c2FfZmFtaWx5LCBjLT5j
 YWRkcl9sZW4pOwotLQkJaWYgKChzZXJyID0gZ2V0bmFtZWluZm8oYy0+Y2FkZHIsIGMtPmNh
 ZGRyX2xlbiwgY2xpZW50LT5zcmNfaXAsIE5JX01BWEhPU1QsIGNsaWVudC0+c3JjX3BvcnQs
 IE5JX01BWFNFUlYsCi0rCQlpZiAoKHNlcnIgPSBnZXRuYW1laW5mbyhjLT5jYWRkciwgYy0+
 Y2FkZHItPnNhX2xlbiwgY2xpZW50LT5zcmNfaXAsIE5JX01BWEhPU1QsIGNsaWVudC0+c3Jj
 X3BvcnQsIE5JX01BWFNFUlYsCi0gCQkJCQkJTklfTlVNRVJJQ0hPU1QgfCBOSV9OVU1FUklD
 U0VSVikpKSB7Ci0gCQkJVFJBQ0UoVFJBQ0VfRU1FUkcsICJnZXRuYW1laW5mbzplcnJvciBb
 JXNdIiwgZ2FpX3N0cmVycm9yKHNlcnIpKTsKLSAJCX0gCisgCQlpZiAoc2VydmVyX2NvbmYt
 PnJlc29sdmVJUCkgeworLQkJCWlmICgoc2VyciA9IGdldG5hbWVpbmZvKGMtPmNhZGRyLCBj
 LT5jYWRkcl9sZW4sIGNsaWVudC0+Y2xpZW50bmFtZSwgTklfTUFYSE9TVCwgTlVMTCwgMCwK
 KysJCQlpZiAoKHNlcnIgPSBnZXRuYW1laW5mbyhjLT5jYWRkciwgYy0+Y2FkZHItPnNhX2xl
 biwgY2xpZW50LT5jbGllbnRuYW1lLCBOSV9NQVhIT1NULCBOVUxMLCAwLAorIAkJCQkJCSAg
 ICAgICAJTklfTkFNRVJFUUQpKSkgeworIAkJCQlUUkFDRShUUkFDRV9JTkZPLCAiZ2V0bmFt
 ZWluZm86ZXJyb3IgWyVzXSIsIGdhaV9zdHJlcnJvcihzZXJyKSk7CisgCQkJfSAKK0BAIC0x
 NzcsNyArMTc3LDcgQEAKKyAJCQkJCWNsaWVudC0+Y2xpZW50bmFtZVswXSA/IGNsaWVudC0+
 Y2xpZW50bmFtZSA6ICJMb29rdXAgZmFpbGVkIik7CisgCQl9IGVsc2UgeworIAorLQkJCWlm
 ICgoc2VyciA9IGdldG5hbWVpbmZvKGMtPmNhZGRyLCBjLT5jYWRkcl9sZW4sIGNsaWVudC0+
 c3JjX2lwLCBOSV9NQVhIT1NULCBjbGllbnQtPnNyY19wb3J0LAorKwkJCWlmICgoc2VyciA9
 IGdldG5hbWVpbmZvKGMtPmNhZGRyLCBjLT5jYWRkci0+c2FfbGVuLCBjbGllbnQtPnNyY19p
 cCwgTklfTUFYSE9TVCwgY2xpZW50LT5zcmNfcG9ydCwKKyAJCQkJCQkgICAgICAgCU5JX01B
 WFNFUlYsIE5JX05VTUVSSUNIT1NUIHwgTklfTlVNRVJJQ1NFUlYpKSkgeworIAkJCQlUUkFD
 RShUUkFDRV9JTkZPLCAiZ2V0bmFtZWluZm86ZXJyb3IgWyVzXSIsIGdhaV9zdHJlcnJvcihz
 ZXJyKSk7CisgCQkJfSAKZGlmZiAtdU5yIC91c3IvcG9ydHMvbWFpbC9kYm1haWwvZmlsZXMv
 cGF0Y2gtc3JjX2RibWFpbC5oLmluIGRibWFpbC9maWxlcy9wYXRjaC1zcmNfZGJtYWlsLmgu
 aW4KLS0tIGRibWFpbC9maWxlcy9wYXRjaC1zcmNfZGJtYWlsLmguaW4JMjAxMi0wNy0xNCAx
 NDo1NDo0OC4wMDAwMDAwMDAgKzAxMDAKKysrIGRibWFpbC9maWxlcy9wYXRjaC1zcmNfZGJt
 YWlsLmguaW4JMjAxMy0wNi0wNCAxMjoxOTo0Ni4wMDAwMDAwMDAgKzAxMDAKQEAgLTEsNiAr
 MSwyMiBAQAotLS0tIHNyYy9kYm1haWwuaC5pbi5vcmlnCTIwMTItMDUtMzEgMTM6MDY6MjYu
 MDAwMDAwMDAwICswMTAwCi0rKysgc3JjL2RibWFpbC5oLmluCTIwMTItMDUtMzEgMTM6MDc6
 MDEuMDAwMDAwMDAwICswMTAwCi1AQCAtMTUwLDYgKzE1MCwxMCBAQAorLS0tIHNyYy9kYm1h
 aWwuaC5pbi5vcmlnCisrKysgc3JjL2RibWFpbC5oLmluCitAQCAtODMsOCArODMsMTQgQEAK
 KyAjaW5jbHVkZSA8bWhhc2guaD4KKyAjaW5jbHVkZSA8c3lzL3F1ZXVlLmg+CisgI2luY2x1
 ZGUgPGV2ZW50Mi9ldmVudC5oPgorKyNpbmNsdWRlIDxldmVudDIvZXZlbnRfY29tcGF0Lmg+
 CisgI2luY2x1ZGUgPGV2ZW50Mi90aHJlYWQuaD4KKy0jaW5jbHVkZSA8ZXZodHRwLmg+Cisr
 I2luY2x1ZGUgPGV2ZW50Mi9odHRwLmg+CisrI2luY2x1ZGUgPGV2ZW50Mi9odHRwX3N0cnVj
 dC5oPgorKyNpbmNsdWRlIDxldmVudDIvaHR0cF9jb21wYXQuaD4KKysjaW5jbHVkZSA8ZXZl
 bnQyL2J1ZmZlci5oPgorKyNpbmNsdWRlIDxldmVudDIvYnVmZmVyX2NvbXBhdC5oPgorKyNp
 bmNsdWRlIDxldmVudDIva2V5dmFscV9zdHJ1Y3QuaD4KKyAjaW5jbHVkZSA8bWF0aC5oPgor
 ICNpbmNsdWRlIDxvcGVuc3NsL3NzbC5oPgorIAorQEAgLTE1NCw2ICsxNjAsMTEgQEAKICAj
 aW5jbHVkZSA8ZW5kaWFuLmg+CiAgI2VuZGlmCiAgCkBAIC04LDYgKzI0LDcgQEAKICsjaW5j
 bHVkZSAiY29uZmlnLmgiCiArI2VuZGlmCiArCisrCiAgI2RlZmluZSBHRVRDT05GSUdWQUxV
 RShrZXksIHNlY3QsIHZhcikgXAotIAljb25maWdfZ2V0X3ZhbHVlKGtleSwgc2VjdCwgdmFy
 KTsgXAotIAlpZiAoc3RybGVuKHZhcikgPiAwKSBcCisgICAgICAgIGNvbmZpZ19nZXRfdmFs
 dWUoa2V5LCBzZWN0LCB2YXIpOyBcCisgICAgICAgIGlmIChzdHJsZW4odmFyKSA+IDApIFwK
 ZGlmZiAtdU5yIC91c3IvcG9ydHMvbWFpbC9kYm1haWwvcGtnLXBsaXN0IGRibWFpbC9wa2ct
 cGxpc3QKLS0tIGRibWFpbC9wa2ctcGxpc3QJMjAxMi0wNy0xNCAxNDo1NDo0OC4wMDAwMDAw
 MDAgKzAxMDAKKysrIGRibWFpbC9wa2ctcGxpc3QJMjAxMy0wNy0yMyAxMzozNTo0NC4wMDAw
 MDAwMDAgKzAxMDAKQEAgLTEsMTkgKzEsMTUgQEAKIEB1bmV4ZWMgaWYgY21wIC1zICVEL2V0
 Yy9kYm1haWwuY29uZi1kaXN0ICVEL2V0Yy9kYm1haWwuY29uZjsgdGhlbiBybSAtZiAlRC9l
 dGMvZGJtYWlsLmNvbmY7IGZpCiBldGMvZGJtYWlsLmNvbmYtZGlzdAogQGV4ZWMgaWYgWyAh
 IC1mICVEL2V0Yy9kYm1haWwuY29uZiBdIDsgdGhlbiBjcCAtcCAlRC8lRiAlQi9kYm1haWwu
 Y29uZjsgZmkKLSUlTERBUCUlbGliL2RibWFpbC9saWJhdXRoX2xkYXAuYQogJSVMREFQJSVs
 aWIvZGJtYWlsL2xpYmF1dGhfbGRhcC5sYQogJSVMREFQJSVsaWIvZGJtYWlsL2xpYmF1dGhf
 bGRhcC5zbwogJSVMREFQJSVsaWIvZGJtYWlsL2xpYmF1dGhfbGRhcC5zby4wCi1saWIvZGJt
 YWlsL2xpYmF1dGhfc3FsLmEKIGxpYi9kYm1haWwvbGliYXV0aF9zcWwubGEKIGxpYi9kYm1h
 aWwvbGliYXV0aF9zcWwuc28KIGxpYi9kYm1haWwvbGliYXV0aF9zcWwuc28uMAotbGliL2Ri
 bWFpbC9saWJkYm1haWwuYQogbGliL2RibWFpbC9saWJkYm1haWwubGEKIGxpYi9kYm1haWwv
 bGliZGJtYWlsLnNvCiBsaWIvZGJtYWlsL2xpYmRibWFpbC5zby4wCi0lJVNJRVZFJSVsaWIv
 ZGJtYWlsL2xpYnNvcnRfc2lldmUuYQogJSVTSUVWRSUlbGliL2RibWFpbC9saWJzb3J0X3Np
 ZXZlLmxhCiAlJVNJRVZFJSVsaWIvZGJtYWlsL2xpYnNvcnRfc2lldmUuc28KICUlU0lFVkUl
 JWxpYi9kYm1haWwvbGlic29ydF9zaWV2ZS5zby4wCkBAIC0zNSw2ICszMSw3IEBACiAlJURB
 VEFESVIlJS9teXNxbC8yXzNfNC0yXzNfNS5teXNxbAogJSVEQVRBRElSJSUvbXlzcWwvMl8z
 XzUtMl8zXzYubXlzcWwKICUlREFUQURJUiUlL215c3FsLzJfM182LTNfMF8wLm15c3FsCisl
 JURBVEFESVIlJS9teXNxbC8zXzBfMi0zXzFfMC5teXNxbAogJSVEQVRBRElSJSUvbXlzcWwv
 Y3JlYXRlX3RhYmxlcy5teXNxbAogJSVEQVRBRElSJSUvbXlzcWwvZml4X2ZvcmVpZ25fa2V5
 cy5teXNxbAogJSVEQVRBRElSJSUvbXlzcWwvbWlncmF0ZV9mcm9tXzEueF90b18yLjBfaW5u
 b2RiLm15c3FsCkBAIC00OSw2ICs0Niw3IEBACiAlJURBVEFESVIlJS9wb3N0Z3Jlc3FsLzJf
 M180LTJfM181LnBnc3FsCiAlJURBVEFESVIlJS9wb3N0Z3Jlc3FsLzJfM181LTJfM182LnBn
 c3FsCiAlJURBVEFESVIlJS9wb3N0Z3Jlc3FsLzJfM182LTNfMF8wLnBnc3FsCislJURBVEFE
 SVIlJS9wb3N0Z3Jlc3FsLzNfMF8yLTNfMV8wLnBzcWwKICUlREFUQURJUiUlL3Bvc3RncmVz
 cWwvY3JlYXRlX3RhYmxlcy5wZ3NxbAogJSVEQVRBRElSJSUvcG9zdGdyZXNxbC9taWdyYXRl
 X2Zyb21fMS54X3RvXzIuMC5wZ3NxbAogJSVEQVRBRElSJSUvcG9zdGdyZXNxbC9taWdyYXRl
 X2Zyb21fMi4wX3RvXzIuMi5wZ3NxbApAQCAtNTgsNiArNTYsNyBAQAogJSVEQVRBRElSJSUv
 c3FsaXRlLzJfM180LTJfM181LnNxbGl0ZQogJSVEQVRBRElSJSUvc3FsaXRlLzJfM181LTJf
 M182LnNxbGl0ZQogJSVEQVRBRElSJSUvc3FsaXRlLzJfM182LTNfMF8wLnNxbGl0ZQorJSVE
 QVRBRElSJSUvc3FsaXRlLzNfMF8yLTNfMV8wLnNxbGl0ZQogJSVEQVRBRElSJSUvc3FsaXRl
 L2NyZWF0ZV90YWJsZXMuc3FsaXRlCiAlJURBVEFESVIlJS9zcWxpdGUvdHJpZ2dlci50bXBs
 LnNxbAogQGRpcnJtICUlREFUQURJUiUlL3NxbGl0ZQo=
 --------------020801060603090504010903--
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Thu Jul 25 19:57:15 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180768 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Thu Jul 25 19:58:29 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180768: commit references a PR
Date: Thu, 25 Jul 2013 19:58:33 +0000 (UTC)

 Author: wg
 Date: Thu Jul 25 19:58:17 2013
 New Revision: 323664
 URL: http://svnweb.freebsd.org/changeset/ports/323664
 
 Log:
   mail/dbmail: update to 3.1.1
   
   - Update to 3.1.1 [1]
   - Remove leading article from COMMENT
   
   Check share/doc/dbmail/UPGRADING for upgrading details.
   
   Changes: http://git.dbmail.eu/paul/dbmail/log/
   
   PR:		ports/180768
   Submitted by:	Alan Hicks <ahicks p-o.co.uk> (maintainer)
 
 Added:
   head/mail/dbmail/files/patch-acinclude.m4   (contents, props changed)
 Deleted:
   head/mail/dbmail/files/extra-patch-configure
 Modified:
   head/mail/dbmail/Makefile
   head/mail/dbmail/distinfo
   head/mail/dbmail/files/extra-patch-acinclude.m4
   head/mail/dbmail/files/patch-src_clientbase.c
   head/mail/dbmail/files/patch-src_dbmail.h.in
   head/mail/dbmail/pkg-plist   (contents, props changed)
 
 Modified: head/mail/dbmail/Makefile
 ==============================================================================
 --- head/mail/dbmail/Makefile	Thu Jul 25 19:07:37 2013	(r323663)
 +++ head/mail/dbmail/Makefile	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -2,20 +2,19 @@
  # $FreeBSD$
  
  PORTNAME=	dbmail
 -PORTVERSION=	3.0.2
 -PORTREVISION=	7
 +PORTVERSION=	3.1.1
  CATEGORIES=	mail
 -MASTER_SITES=	http://www.dbmail.org/download/3.0/
 +MASTER_SITES=	http://www.dbmail.org/download/3.1/
  
  MAINTAINER=	ahicks@p-o.co.uk
 -COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 +COMMENT=	SQL database-based mail system (POP3 and IMAP)
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	gmime-2.4:${PORTSDIR}/mail/gmime24 \
 +LIB_DEPENDS=	gmime-2.6:${PORTSDIR}/mail/gmime26 \
  		zdb:${PORTSDIR}/databases/libzdb \
  		mhash:${PORTSDIR}/security/mhash \
 -		event:${PORTSDIR}/devel/libevent
 +		event-2:${PORTSDIR}/devel/libevent2
  
  CONFLICTS=	dbmail-2.*
  
 @@ -26,19 +25,20 @@ SIEVE_DESC=	Build with support for Sieve
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MDOCS}
 -BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 +BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
  		xmlto:${PORTSDIR}/textproc/xmlto
  .endif
  
 -USE_AUTOTOOLS=	libtool
 +USE_AUTOTOOLS=	libtool autoheader autoconf
  USE_GMAKE=	yes
  USE_LDCONFIG=	${PREFIX}/lib/dbmail
  USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
  USE_OPENSSL=	yes
  USES=	shebangfix
  SHEBANG_FILES=	man/fixsp.pl
 +WITH_DEBUG=	yes
  
 -CFLAGS+=	-fPIC ${PTHREAD_CFLAGS}
 +CFLAGS+=	-fPIC ${PTHREAD_CFLAGS} -DDEBUG
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
  CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
 @@ -87,7 +87,6 @@ PLIST_SUB+=	LDAP="@comment "
  
  .if ${PORT_OPTIONS:MTHREADS}
  EXTRA_PATCHES=	${FILESDIR}/extra-patch-acinclude.m4
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
  .endif
  
  .if ${PORT_OPTIONS:MDOCS}
 
 Modified: head/mail/dbmail/distinfo
 ==============================================================================
 --- head/mail/dbmail/distinfo	Thu Jul 25 19:07:37 2013	(r323663)
 +++ head/mail/dbmail/distinfo	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -1,2 +1,2 @@
 -SHA256 (dbmail-3.0.2.tar.gz) = 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e
 -SIZE (dbmail-3.0.2.tar.gz) = 867560
 +SHA256 (dbmail-3.1.1.tar.gz) = 4df9f3a8d13af3a5f41dfab480f89a9e338b025e36e42cb76dc4f34b242ac1e0
 +SIZE (dbmail-3.1.1.tar.gz) = 2398581
 
 Modified: head/mail/dbmail/files/extra-patch-acinclude.m4
 ==============================================================================
 --- head/mail/dbmail/files/extra-patch-acinclude.m4	Thu Jul 25 19:07:37 2013	(r323663)
 +++ head/mail/dbmail/files/extra-patch-acinclude.m4	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -1,6 +1,6 @@
 ---- acinclude.m4.orig	2012-05-30 16:42:44.000000000 +0100
 -+++ acinclude.m4	2012-05-30 16:44:28.000000000 +0100
 -@@ -235,7 +235,7 @@
 +--- acinclude.m4.orig
 ++++ acinclude.m4
 +@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
           dnl See if we already have the paths we need in the environment.
   	dnl ...but only if --with-ldap was given without a specific path.
           if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
 @@ -9,7 +9,7 @@
               if test [ "x$LDAPLIB" != "xfailed" ]; then
                   break
               fi
 -@@ -247,7 +247,7 @@
 +@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
               SAVE_CFLAGS=$CFLAGS
   	    dnl The headers might be in a funny place, so we need to use -Ipath
               CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
 @@ -18,3 +18,12 @@
               CFLAGS=$SAVE_CFLAGS
               if test [ "x$LDAPLIB" != "xfailed" ]; then
                   break 2
 +@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
 +         AC_MSG_ERROR([Could not find LDAP library.])
 +     else
 +         AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])
 +-        AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
 ++        AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
 +         AC_SUBST(LDAPLIB)
 +         AC_SUBST(LDAPINC)
 +         AUTHALIB="modules/.libs/libauth_ldap.a"
 
 Added: head/mail/dbmail/files/patch-acinclude.m4
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/dbmail/files/patch-acinclude.m4	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -0,0 +1,58 @@
 +--- acinclude.m4.orig	2013-05-31 14:03:59.000000000 +0100
 ++++ acinclude.m4	2013-05-31 14:45:49.000000000 +0100
 +@@ -23,7 +23,7 @@
 +  SOCKETS:                   $SOCKETLIB
 +  MATH:                      $MATHLIB
 +  MHASH:                     $MHASHLIB
 +- LIBEVENT:                  $EVENTLIB
 ++ LIBEVENT:                  $ac_event_libs
 +  OPENSSL:                   $SSLLIB
 +  ZDB:                       $ZDBLIB
 +  JEMALLOC:                  $JEMALLOCLIB
 +@@ -342,13 +342,40 @@
 + 	fi
 + ])
 + 
 +-AC_DEFUN([DM_CHECK_EVENT], [
 +-	AC_CHECK_HEADERS([event.h], [EVENTLIB="-levent_pthreads -levent"],[EVENTLIB="failed"], [#include <event2/event.h>])
 +-	if test [ "x$EVENTLIB" = "xfailed" ]; then
 +-		AC_MSG_ERROR([Could not find EVENT library.])
 +-	else
 +-		LDFLAGS="$LDFLAGS $EVENTLIB"
 ++AC_DEFUN([DM_CHECK_EVENT], [dnl
 ++AC_PATH_PROG(eventconfig,pkg-config)
 ++if test [ -z "$eventconfig" ]
 ++then
 ++	AC_MSG_ERROR([pkg-config executable not found. Make sure pkg-config is in your path])
 ++else
 ++	AC_MSG_CHECKING([Event headers])
 ++	ac_event_cflags=`${eventconfig} --cflags libevent_pthreads`
 ++	if test -z "$ac_event_cflags"
 ++	then
 ++		AC_MSG_RESULT([no])
 ++		AC_MSG_ERROR([Unable to locate event development files])
 ++	fi
 ++ 
 ++	CFLAGS="$CFLAGS $ac_event_cflags"
 ++	AC_MSG_RESULT([$ac_event_cflags])
 ++        AC_MSG_CHECKING([Event libraries])
 ++	ac_event_libs=`${eventconfig} --libs libevent_pthreads`
 ++	if test -z "$ac_event_libs"
 ++	then
 ++		AC_MSG_RESULT([no])
 ++		AC_MSG_ERROR([Unable to locate event libaries])
 + 	fi
 ++ 	ac_event_minvers="2.0"
 ++	AC_MSG_CHECKING([Event version >= $ac_event_minvers])
 ++	ac_event_vers=`${eventconfig}  --atleast-version=$ac_event_minvers libevent_pthreads>/dev/null && echo yes`
 ++	if test -z "$ac_event_vers"
 ++	then
 ++		AC_MSG_ERROR([At least Event version $ac_event_minvers is required.])
 ++	fi
 ++
 ++	LDFLAGS="$LDFLAGS $ac_event_libs"
 ++        AC_MSG_RESULT([$ac_event_libs])
 ++fi
 + ])
 + 
 + AC_DEFUN([DM_CHECK_SSL], [
 
 Modified: head/mail/dbmail/files/patch-src_clientbase.c
 ==============================================================================
 --- head/mail/dbmail/files/patch-src_clientbase.c	Thu Jul 25 19:07:37 2013	(r323663)
 +++ head/mail/dbmail/files/patch-src_clientbase.c	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -1,20 +1,28 @@
 ---- src/clientbase.c.orig	2012-06-19 17:49:50.000000000 +0100
 -+++ src/clientbase.c	2012-06-19 17:50:29.000000000 +0100
 -@@ -160,7 +160,7 @@
 +--- src/clientbase.c.orig	2013-07-22 20:03:36.000000000 +0100
 ++++ src/clientbase.c	2013-07-23 13:14:56.000000000 +0100
 +@@ -159,14 +159,14 @@
 + 		client->tx		= STDOUT_FILENO;
   	} else {
   		/* server-side */
 - 		TRACE(TRACE_DEBUG,"saddr [%p] sa_family [%d] len [%d]", c->saddr, c->saddr->sa_family, c->saddr_len);
  -		if ((serr = getnameinfo(c->saddr, c->saddr_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV, 
  +		if ((serr = getnameinfo(c->saddr, c->saddr->sa_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV, 
   						NI_NUMERICHOST | NI_NUMERICSERV))) {
   			TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
   		}
 -@@ -168,7 +168,7 @@
   
   		/* client-side */
 - 		TRACE(TRACE_DEBUG,"caddr [%p] sa_family [%d] len [%d]", c->caddr, c->caddr->sa_family, c->caddr_len);
 --		if ((serr = getnameinfo(c->caddr, c->caddr_len, client->src_ip, NI_MAXHOST, client->src_port, NI_MAXSERV,
 -+		if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->src_ip, NI_MAXHOST, client->src_port, NI_MAXSERV,
 - 						NI_NUMERICHOST | NI_NUMERICSERV))) {
 - 			TRACE(TRACE_EMERG, "getnameinfo:error [%s]", gai_strerror(serr));
 - 		} 
 + 		if (server_conf->resolveIP) {
 +-			if ((serr = getnameinfo(c->caddr, c->caddr_len, client->clientname, NI_MAXHOST, NULL, 0,
 ++			if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->clientname, NI_MAXHOST, NULL, 0,
 + 						       	NI_NAMEREQD))) {
 + 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
 + 			} 
 +@@ -177,7 +177,7 @@
 + 					client->clientname[0] ? client->clientname : "Lookup failed");
 + 		} else {
 + 
 +-			if ((serr = getnameinfo(c->caddr, c->caddr_len, client->src_ip, NI_MAXHOST, client->src_port,
 ++			if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->src_ip, NI_MAXHOST, client->src_port,
 + 						       	NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) {
 + 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
 + 			} 
 
 Modified: head/mail/dbmail/files/patch-src_dbmail.h.in
 ==============================================================================
 --- head/mail/dbmail/files/patch-src_dbmail.h.in	Thu Jul 25 19:07:37 2013	(r323663)
 +++ head/mail/dbmail/files/patch-src_dbmail.h.in	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -1,6 +1,22 @@
 ---- src/dbmail.h.in.orig	2012-05-31 13:06:26.000000000 +0100
 -+++ src/dbmail.h.in	2012-05-31 13:07:01.000000000 +0100
 -@@ -150,6 +150,10 @@
 +--- src/dbmail.h.in.orig
 ++++ src/dbmail.h.in
 +@@ -83,8 +83,14 @@
 + #include <mhash.h>
 + #include <sys/queue.h>
 + #include <event2/event.h>
 ++#include <event2/event_compat.h>
 + #include <event2/thread.h>
 +-#include <evhttp.h>
 ++#include <event2/http.h>
 ++#include <event2/http_struct.h>
 ++#include <event2/http_compat.h>
 ++#include <event2/buffer.h>
 ++#include <event2/buffer_compat.h>
 ++#include <event2/keyvalq_struct.h>
 + #include <math.h>
 + #include <openssl/ssl.h>
 + 
 +@@ -154,6 +160,11 @@
   #include <endian.h>
   #endif
   
 @@ -8,6 +24,7 @@
  +#include "config.h"
  +#endif
  +
 ++
   #define GETCONFIGVALUE(key, sect, var) \
 - 	config_get_value(key, sect, var); \
 - 	if (strlen(var) > 0) \
 +        config_get_value(key, sect, var); \
 +        if (strlen(var) > 0) \
 
 Modified: head/mail/dbmail/pkg-plist
 ==============================================================================
 --- head/mail/dbmail/pkg-plist	Thu Jul 25 19:07:37 2013	(r323663)
 +++ head/mail/dbmail/pkg-plist	Thu Jul 25 19:58:17 2013	(r323664)
 @@ -1,19 +1,15 @@
  @unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi
  etc/dbmail.conf-dist
  @exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
 -%%LDAP%%lib/dbmail/libauth_ldap.a
  %%LDAP%%lib/dbmail/libauth_ldap.la
  %%LDAP%%lib/dbmail/libauth_ldap.so
  %%LDAP%%lib/dbmail/libauth_ldap.so.0
 -lib/dbmail/libauth_sql.a
  lib/dbmail/libauth_sql.la
  lib/dbmail/libauth_sql.so
  lib/dbmail/libauth_sql.so.0
 -lib/dbmail/libdbmail.a
  lib/dbmail/libdbmail.la
  lib/dbmail/libdbmail.so
  lib/dbmail/libdbmail.so.0
 -%%SIEVE%%lib/dbmail/libsort_sieve.a
  %%SIEVE%%lib/dbmail/libsort_sieve.la
  %%SIEVE%%lib/dbmail/libsort_sieve.so
  %%SIEVE%%lib/dbmail/libsort_sieve.so.0
 @@ -35,6 +31,7 @@ sbin/dbmail-util
  %%DATADIR%%/mysql/2_3_4-2_3_5.mysql
  %%DATADIR%%/mysql/2_3_5-2_3_6.mysql
  %%DATADIR%%/mysql/2_3_6-3_0_0.mysql
 +%%DATADIR%%/mysql/3_0_2-3_1_0.mysql
  %%DATADIR%%/mysql/create_tables.mysql
  %%DATADIR%%/mysql/fix_foreign_keys.mysql
  %%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
 @@ -49,6 +46,7 @@ sbin/dbmail-util
  %%DATADIR%%/postgresql/2_3_4-2_3_5.pgsql
  %%DATADIR%%/postgresql/2_3_5-2_3_6.pgsql
  %%DATADIR%%/postgresql/2_3_6-3_0_0.pgsql
 +%%DATADIR%%/postgresql/3_0_2-3_1_0.psql
  %%DATADIR%%/postgresql/create_tables.pgsql
  %%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql
  %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
 @@ -58,6 +56,7 @@ sbin/dbmail-util
  %%DATADIR%%/sqlite/2_3_4-2_3_5.sqlite
  %%DATADIR%%/sqlite/2_3_5-2_3_6.sqlite
  %%DATADIR%%/sqlite/2_3_6-3_0_0.sqlite
 +%%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite
  %%DATADIR%%/sqlite/create_tables.sqlite
  %%DATADIR%%/sqlite/trigger.tmpl.sql
  @dirrm %%DATADIR%%/sqlite
 _______________________________________________
 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:
