update to 2.0.13

changes: many fixes and improvements

reviewed by John R. Shannon

pkgsrc notes:
-since S/MIME support is the biggest difference in functionality over
 gnupg1, enable it per default -- my tests (with the s/mime plugin
 of claws-mail) worked
-left the build against a private libassuan with GNU-pth support
 alone for now, just updated libassuan to 1.0.5. We might build
 pkgsrc/libassuan against pkgsrc/pth at some point, but this needs
 to be checked for side effects. (As this pkg doesn't export a library
 which might propagate the pth dependency, the possibility of
 pthread-pth conflicts should be limited. Other uses of libassuan
 need to be checked.)

7 files changed, 73 insertions, 39 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 8c0b2772625..f5e49fc2df6 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/12/15 20:10:40 drochner Exp $
 #
 
-DISTNAME=		gnupg-2.0.9
+DISTNAME=		gnupg-2.0.13
 #PKGREVISION=		3
 PKGNAME=		${DISTNAME:S/gnupg/gnupg2/}
 CATEGORIES=		security
@@ -10,8 +10,8 @@ EXTRACT_SUFX=		.tar.bz2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		pth-2.0.7.tar.gz
 SITES.pth-2.0.7.tar.gz=	${MASTER_SITE_GNU:=pth/}
-DISTFILES+=		libassuan-1.0.4.tar.bz2
-SITES.libassuan-1.0.4.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
+DISTFILES+=		libassuan-1.0.5.tar.bz2
+SITES.libassuan-1.0.5.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 
 MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		http://www.gnupg.org/
@@ -56,7 +56,7 @@ pre-configure:
 	cd  ${WRKDIR}/pth-2.0.7 && \
 	./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && \
 	${MAKE} install
-	cd  ${WRKDIR}/libassuan-1.0.4 && \
+	cd  ${WRKDIR}/libassuan-1.0.5 && \
 	${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \
 	${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \
 	${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install
diff --git a/security/gnupg2/PLIST b/security/gnupg2/PLIST
index 762bae74672..fba3a244271 100644
--- a/security/gnupg2/PLIST
+++ b/security/gnupg2/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/01 00:12:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/12/15 20:10:41 drochner Exp $
 bin/gpg-agent
 libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
+share/doc/gnupg/README
 share/locale/be/LC_MESSAGES/gnupg2.mo
 share/locale/ca/LC_MESSAGES/gnupg2.mo
 share/locale/cs/LC_MESSAGES/gnupg2.mo
diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm
index 67be52b662b..b57b6206aa6 100644
--- a/security/gnupg2/PLIST.gpgsm
+++ b/security/gnupg2/PLIST.gpgsm
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gpgsm,v 1.6 2009/06/14 18:13:29 joerg Exp $
+@comment $NetBSD: PLIST.gpgsm,v 1.7 2009/12/15 20:10:41 drochner Exp $
 bin/gpg-connect-agent
 bin/gpg2
 bin/gpgconf
@@ -21,6 +21,7 @@ libexec/gpg-check-pattern
 man/man1/gpg-agent.1
 man/man1/gpg-connect-agent.1
 man/man1/gpg-preset-passphrase.1
+man/man1/gpg-zip.1
 man/man1/gpg2.1
 man/man1/gpgconf.1
 man/man1/gpgparsemail.1
@@ -34,8 +35,47 @@ man/man8/addgnupghome.8
 man/man8/applygnupgdefaults.8
 sbin/addgnupghome
 sbin/applygnupgdefaults
-share/gnupg/FAQ
+share/doc/gnupg/DETAILS
+share/doc/gnupg/FAQ
+share/doc/gnupg/HACKING
+share/doc/gnupg/KEYSERVER
+share/doc/gnupg/OpenPGP
+share/doc/gnupg/README
+share/doc/gnupg/TRANSLATE
+share/doc/gnupg/examples/README
+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/faq.html
 share/gnupg/gpg-conf.skel
+share/gnupg/help.be.txt
+share/gnupg/help.ca.txt
+share/gnupg/help.cs.txt
+share/gnupg/help.da.txt
+share/gnupg/help.de.txt
+share/gnupg/help.el.txt
+share/gnupg/help.eo.txt
+share/gnupg/help.es.txt
+share/gnupg/help.et.txt
+share/gnupg/help.fi.txt
+share/gnupg/help.fr.txt
+share/gnupg/help.gl.txt
+share/gnupg/help.hu.txt
+share/gnupg/help.id.txt
+share/gnupg/help.it.txt
+share/gnupg/help.ja.txt
+share/gnupg/help.nb.txt
+share/gnupg/help.pl.txt
+share/gnupg/help.pt.txt
+share/gnupg/help.pt_BR.txt
+share/gnupg/help.ro.txt
+share/gnupg/help.ru.txt
+share/gnupg/help.sk.txt
+share/gnupg/help.sv.txt
+share/gnupg/help.tr.txt
+share/gnupg/help.txt
+share/gnupg/help.zh_CN.txt
+share/gnupg/help.zh_TW.txt
 share/gnupg/qualified.txt
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index e80d8d8ea2e..14ae7dc96af 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.11 2008/04/28 14:54:27 shannonjr Exp $
+$NetBSD: distinfo,v 1.12 2009/12/15 20:10:41 drochner Exp $
 
-SHA1 (gnupg-2.0.9.tar.bz2) = 959bdb934e3a72d256bfbd0122d996a73adb5d1f
-RMD160 (gnupg-2.0.9.tar.bz2) = 175f8d4e83dd6ae8e186b7c09bb8bdbb001a5799
-Size (gnupg-2.0.9.tar.bz2) = 3718925 bytes
-SHA1 (libassuan-1.0.4.tar.bz2) = 4b720706a8e4251d8cb7a0f2336226907df1426c
-RMD160 (libassuan-1.0.4.tar.bz2) = d9c46d02a5c3955f813cdac05953d779ed9f1992
-Size (libassuan-1.0.4.tar.bz2) = 297123 bytes
+SHA1 (gnupg-2.0.13.tar.bz2) = 2ff42aff14cdddafc291d44ac1968af5f09a9d4d
+RMD160 (gnupg-2.0.13.tar.bz2) = a2291f4d5923b50bca980b726e2fe0c31c2589a9
+Size (gnupg-2.0.13.tar.bz2) = 3946616 bytes
+SHA1 (libassuan-1.0.5.tar.bz2) = f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
+RMD160 (libassuan-1.0.5.tar.bz2) = 7c4a75c71a3117cf140ea66ca89765349f39218e
+Size (libassuan-1.0.5.tar.bz2) = 297786 bytes
 SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee
 RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910
 Size (pth-2.0.7.tar.gz) = 652640 bytes
-SHA1 (patch-af) = df9028d8476df0121698d6e89fecf41c63515184
-SHA1 (patch-ah) = 7c000c576a5329ea89df3a38551da46661efa362
+SHA1 (patch-af) = 908fd76d67f837367121e493d239f8b377eb1c3f
+SHA1 (patch-ah) = 0c9e061611ebfe22441a161aca016436a70ccc60
 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78
 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index c211987dd1f..80715b4fad0 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2007/11/07 15:24:27 shannonjr Exp $
+# $NetBSD: options.mk,v 1.3 2009/12/15 20:10:41 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
 PKG_SUPPORTED_OPTIONS=	gpgsm idea
+PKG_SUGGESTED_OPTIONS=	gpgsm
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
diff --git a/security/gnupg2/patches/patch-af b/security/gnupg2/patches/patch-af
index 0e00a648a66..9594c6e44ef 100644
--- a/security/gnupg2/patches/patch-af
+++ b/security/gnupg2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.5 2008/04/28 14:54:27 shannonjr Exp $
+$NetBSD: patch-af,v 1.6 2009/12/15 20:10:41 drochner Exp $
 
---- ../libassuan-1.0.4/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
-+++ ../libassuan-1.0.4/src/Makefile.am
+--- ../libassuan-1.0.5/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
++++ ../libassuan-1.0.5/src/Makefile.am
 @@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c
  
  if HAVE_PTH
diff --git a/security/gnupg2/patches/patch-ah b/security/gnupg2/patches/patch-ah
index 522ed3cc283..8783ef974f8 100644
--- a/security/gnupg2/patches/patch-ah
+++ b/security/gnupg2/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.4 2008/04/28 14:54:27 shannonjr Exp $
+$NetBSD: patch-ah,v 1.5 2009/12/15 20:10:41 drochner Exp $
 
---- ./g10/encr-data.c.orig	2007-12-12 02:43:38.000000000 -0700
-+++ ./g10/encr-data.c
+--- g10/encr-data.c.orig	2009-06-05 13:58:27.000000000 +0000
++++ g10/encr-data.c
 @@ -37,35 +37,14 @@ static int mdc_decode_filter ( void *opa
  static int decode_filter ( void *opaque, int control, IOBUF a,
  					byte *buf, size_t *ret_len);
@@ -53,15 +53,7 @@ $NetBSD: patch-ah,v 1.4 2008/04/28 14:54:27 shannonjr Exp $
    if ( opt.verbose && !dek->algo_info_printed )
      {
        if (!openpgp_cipher_test_algo (dek->algo))
-@@ -100,20 +75,20 @@ decrypt_data( void *procctx, PKT_encrypt
-     goto leave;
-   blocksize = gcry_cipher_get_algo_blklen (dek->algo);
-   if ( !blocksize || blocksize > 16 )
--    log_fatal ("unsupported blocksize %u\n", blocksize );
-+    log_fatal("unsupported blocksize %u\n", blocksize );
-   nprefix = blocksize;
-   if ( ed->len && ed->len < (nprefix+2) )
-     BUG();
+@@ -107,13 +82,13 @@ decrypt_data( void *procctx, PKT_encrypt
  
    if ( ed->mdc_method ) 
      {
@@ -73,11 +65,11 @@ $NetBSD: patch-ah,v 1.4 2008/04/28 14:54:27 shannonjr Exp $
 +        gcry_md_start_debug (dfx.mdc_hash, "checkmdc");
      }
  
--  rc = gcry_cipher_open (&dfx->cipher_hd, dek->algo,
-+  rc = gcry_cipher_open (&dfx.cipher_hd, dek->algo,
-                          GCRY_CIPHER_MODE_CFB,
-                          (GCRY_CIPHER_SECURE
-                           | ((ed->mdc_method || dek->algo >= 100)?
+-  rc = openpgp_cipher_open (&dfx->cipher_hd, dek->algo,
++  rc = openpgp_cipher_open (&dfx.cipher_hd, dek->algo,
+ 			    GCRY_CIPHER_MODE_CFB,
+ 			    (GCRY_CIPHER_SECURE
+ 			     | ((ed->mdc_method || dek->algo >= 100)?
 @@ -127,7 +102,7 @@ decrypt_data( void *procctx, PKT_encrypt