From owner-svn-ports-all@FreeBSD.ORG  Thu May 29 14:53:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6072212D;
 Thu, 29 May 2014 14:53:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DD5A22BC;
 Thu, 29 May 2014 14:53:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TErmNE047509;
 Thu, 29 May 2014 14:53:48 GMT
 (envelope-from kuriyama@svn.freebsd.org)
Received: (from kuriyama@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4TErliP047507;
 Thu, 29 May 2014 14:53:47 GMT
 (envelope-from kuriyama@svn.freebsd.org)
Message-Id: <201405291453.s4TErliP047507@svn.freebsd.org>
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Thu, 29 May 2014 14:53:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355706 - in head/security/gnupg1: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 May 2014 14:53:48 -0000

Author: kuriyama
Date: Thu May 29 14:53:47 2014
New Revision: 355706
URL: http://svnweb.freebsd.org/changeset/ports/355706
QAT: https://qat.redports.org/buildarchive/r355706/

Log:
  Fix fatal error at exit regarding missing trustdb although key is imported.
  
  Submitted by:	des, philip
  References:	https://bugs.gnupg.org/gnupg/issue1622
  References:	http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=23191d7851eae2217ecdac6484349849a24fd94a

Added:
  head/security/gnupg1/files/patch-g10-trustdb.c   (contents, props changed)
Modified:
  head/security/gnupg1/Makefile

Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile	Thu May 29 14:52:36 2014	(r355705)
+++ head/security/gnupg1/Makefile	Thu May 29 14:53:47 2014	(r355706)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg

Added: head/security/gnupg1/files/patch-g10-trustdb.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/gnupg1/files/patch-g10-trustdb.c	Thu May 29 14:53:47 2014	(r355706)
@@ -0,0 +1,15 @@
+Index: security/gnupg1/files/patch-g10-trustdb.c
+===================================================================
+--- security/gnupg1/files/patch-g10-trustdb.c	(revision 0)
++++ security/gnupg1/files/patch-g10-trustdb.c	(working copy)
+@@ -0,0 +1,10 @@
++--- g10/trustdb.c.orig	2013-12-13 08:28:22.000000000 +0100
+++++ g10/trustdb.c	2014-05-17 19:47:21.125216457 +0200
++@@ -927,6 +927,7 @@
++   TRUSTREC rec;
++   int rc;
++ 
+++  init_trustdb();
++   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
++     return 0;
++