Changes 2.0.17:

* Allow more hash algorithms with the OpenPGP v2 card.
* The gpg-agent now tests for a new gpg-agent.conf on a HUP.
* Fixed output of "gpgconf --check-options".
* Fixed a bug where Scdaemon sends a signal to Gpg-agent running in
  non-daemon mode.
* Fixed TTY management for pinentries and session variable update
  problem.

9 files changed, 40 insertions, 59 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 163b60bb5b0..ada961542aa 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,29 +1,26 @@
-# $NetBSD: Makefile,v 1.32 2010/09/02 06:58:35 obache Exp $
-#
+# $NetBSD: Makefile,v 1.33 2011/01/20 08:54:56 adam Exp $
 
-DISTNAME=		gnupg-2.0.16
-PKGNAME=		${DISTNAME:S/gnupg/gnupg2/}
-PKGREVISION=		1
-CATEGORIES=		security
-MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/gnupg/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	gnupg-2.0.17
+PKGNAME=	${DISTNAME:S/gnupg/gnupg2/}
+CATEGORIES=	security
+MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		shannonjr@NetBSD.org
-HOMEPAGE=		http://www.gnupg.org/
-COMMENT=		GNUpg with OpenPGP and S/MIME capabilities
-LICENSE=		gnu-gpl-v3
+MAINTAINER=	shannonjr@NetBSD.org
+HOMEPAGE=	http://www.gnupg.org/
+COMMENT=	GNUpg with OpenPGP and S/MIME capabilities
+LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
 INFO_FILES=		yes
-USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-
-CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-pinentry-pgm=${BUILDLINK_PREFIX.pinentry}/bin/pinentry
@@ -36,15 +33,16 @@ TEST_TARGET=		check
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
 BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.2
 
-.include "../../devel/pth/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pth/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libassuan2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
-.include "../../security/libassuan2/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
 .include "../../security/pinentry/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm
index 71202ba7532..6ec5908dd91 100644
--- a/security/gnupg2/PLIST.gpgsm
+++ b/security/gnupg2/PLIST.gpgsm
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gpgsm,v 1.10 2010/09/02 06:58:35 obache Exp $
+@comment $NetBSD: PLIST.gpgsm,v 1.11 2011/01/20 08:54:56 adam Exp $
 bin/gpg-connect-agent
 bin/gpg2
 bin/gpgconf
@@ -46,7 +46,6 @@ share/doc/gnupg/examples/gpgconf.conf
 share/doc/gnupg/examples/pwpattern.list
 share/doc/gnupg/examples/scd-event
 share/doc/gnupg/examples/trustlist.txt
-share/doc/gnupg/faq.html
 share/gnupg/com-certs.pem
 share/gnupg/gpg-conf.skel
 share/gnupg/help.be.txt
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 2f87ba39bc2..383bebfdc42 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.20 2010/09/02 06:58:35 obache Exp $
+$NetBSD: distinfo,v 1.21 2011/01/20 08:54:56 adam Exp $
 
-SHA1 (gnupg-2.0.16.tar.bz2) = e7eb4f60026884bd90803b531472bc518804b95d
-RMD160 (gnupg-2.0.16.tar.bz2) = 3a0ed7a3ebb28fdb875533ff3368f6af3a0bb742
-Size (gnupg-2.0.16.tar.bz2) = 4004033 bytes
+SHA1 (gnupg-2.0.17.tar.bz2) = 41ef5460417ca0a1131fc730849fe3afd49ad2de
+RMD160 (gnupg-2.0.17.tar.bz2) = f919947a1896ac20c455534d91a3e2d3e5b60c1f
+Size (gnupg-2.0.17.tar.bz2) = 3997356 bytes
 SHA1 (patch-ah) = 0c9e061611ebfe22441a161aca016436a70ccc60
-SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78
-SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e
-SHA1 (patch-ak) = 0480f4be019de80e2683d6edb9beeecf27c26d9c
+SHA1 (patch-ai) = 4445d30150518f71f996e3b368a81523daded2e2
+SHA1 (patch-aj) = bfd21504e0d55f99df543912b1cdf2c573de2f98
+SHA1 (patch-ak) = 2eeb4e8a51ae569867730fa8f0bafd27c56a6f16
 SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4
-SHA1 (patch-an) = 17e6f789af2853884eb6dd8488a2b91c9b06188d
-SHA1 (patch-ao) = e8433f99da5e8b8e63239389513f0e352c0020f0
+SHA1 (patch-ao) = a4040ac226d93d7bbf406ef2233f096dd8100ba2
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index 6acf77fd55a..5369cbd0245 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2009/12/18 17:49:51 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2011/01/20 08:54:56 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
 PKG_SUPPORTED_OPTIONS=	gpgsm
@@ -11,16 +11,16 @@ PKG_SUGGESTED_OPTIONS=	gpgsm
 ## is sufficient for OpenPGP/MIME support in Kmail
 ## SMIME support is provided by gpgsm. This support is
 ## in the alpha stage of development.
-PLIST_SRC=      ${.CURDIR}/PLIST
+PLIST_SRC=	${.CURDIR}/PLIST
 
 # XXX It looks like that gpgsm support could be split into its own package,
 # according to the configure script.  If that's true, this use of the options
 # framework is incorrect and should be fixed.
 .if empty(PKG_OPTIONS:Mgpgsm)
-CONFIGURE_ARGS+=        --enable-agent-only
+CONFIGURE_ARGS+=	--enable-agent-only
 .else
 CONFIGURE_ARGS+=	--enable-gpgsm
 CONFIGURE_ARGS+=	--with-dirmngr-pgm=${BUILDLINK_PREFIX.dirmngr}/bin/dirmngr
-PLIST_SRC+=     ${.CURDIR}/PLIST.gpgsm
+PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
 .  include "../../security/dirmngr/buildlink3.mk"
 .endif
diff --git a/security/gnupg2/patches/patch-ai b/security/gnupg2/patches/patch-ai
index 718d05171be..671b4cc6c82 100644
--- a/security/gnupg2/patches/patch-ai
+++ b/security/gnupg2/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2007/08/04 12:00:03 shannonjr Exp $
+$NetBSD: patch-ai,v 1.4 2011/01/20 08:54:56 adam Exp $
 
 --- autogen.sh.orig	2007-06-22 10:18:30.000000000 -0600
 +++ autogen.sh
-@@ -183,9 +183,9 @@ fi
+@@ -184,9 +184,9 @@ fi
  if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
    check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
  fi
diff --git a/security/gnupg2/patches/patch-aj b/security/gnupg2/patches/patch-aj
index 66298ada742..97268cbcdcf 100644
--- a/security/gnupg2/patches/patch-aj
+++ b/security/gnupg2/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/05/12 11:08:31 shannonjr Exp $
+$NetBSD: patch-aj,v 1.3 2011/01/20 08:54:56 adam Exp $
 
 --- po/Makefile.in.in.orig	2007-05-07 11:56:51.000000000 -0600
 +++ po/Makefile.in.in
-@@ -38,7 +38,7 @@ INSTALL_DATA = @INSTALL_DATA@
+@@ -39,7 +39,7 @@ INSTALL_DATA = @INSTALL_DATA@
  # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
  # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
  # versions, $(mkinstalldirs) and $(install_sh) are unused.
diff --git a/security/gnupg2/patches/patch-ak b/security/gnupg2/patches/patch-ak
index 86d1ac655e5..14619723a2c 100644
--- a/security/gnupg2/patches/patch-ak
+++ b/security/gnupg2/patches/patch-ak
@@ -1,11 +1,11 @@
-$NetBSD: patch-ak,v 1.2 2010/09/02 06:58:35 obache Exp $
+$NetBSD: patch-ak,v 1.3 2011/01/20 08:54:56 adam Exp $
 
 gpg-zip script will not be installed, so man page also should not be installed.
 If will introduce conflict with security/gnupg.
 
 --- doc/Makefile.am.orig	2009-12-16 18:23:55.000000000 +0000
 +++ doc/Makefile.am
-@@ -67,7 +67,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
+@@ -65,7 +65,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
  myman_pages   = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
                  watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
  		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
diff --git a/security/gnupg2/patches/patch-an b/security/gnupg2/patches/patch-an
deleted file mode 100644
index 73c412d49b4..00000000000
--- a/security/gnupg2/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1 2010/08/03 19:14:42 drochner Exp $
-
-http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html
-(CVE-2010-2547)
-
---- kbx/keybox-blob.c.orig	2009-09-21 16:53:44.000000000 +0000
-+++ kbx/keybox-blob.c
-@@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_
-               rc = gpg_error_from_syserror ();
-               goto leave;
-             }
-+	  names = tmp;
-         }
-       names[blob->nuids++] = p;
-       if (!i && (p=x509_email_kludge (p)))
diff --git a/security/gnupg2/patches/patch-ao b/security/gnupg2/patches/patch-ao
index 946df1aadd5..053d79ac1e3 100644
--- a/security/gnupg2/patches/patch-ao
+++ b/security/gnupg2/patches/patch-ao
@@ -1,10 +1,10 @@
-$NetBSD: patch-ao,v 1.1 2010/09/02 06:58:35 obache Exp $
+$NetBSD: patch-ao,v 1.2 2011/01/20 08:54:56 adam Exp $
 
 from patch-ak
 
 --- doc/Makefile.in.orig	2010-07-19 07:05:40.000000000 +0000
 +++ doc/Makefile.in
-@@ -353,7 +353,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
+@@ -351,7 +351,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
  myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
                  watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
  		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \