Update to 1.2.5:

    * New --ask-cert-level/--no-ask-cert-level option to turn on and
      off the prompt for signature level when signing a key.  Defaults
      to on.

    * New --min-cert-level option to disregard key signatures that are
      under a specified level.  Defaults to 1 (i.e. don't disregard
      anything).

    * New --max-output option to limit the amount of plaintext output
      generated by GnuPG.  This option can be used by programs which
      call GnuPG to process messages that may result in plaintext
      larger than the calling program is prepared to handle.  This is
      sometimes called a "Decompression Bomb".

    * New --list-config command for frontends and other programs that
      call GnuPG.  See doc/DETAILS for the specifics of this.

    * New --gpgconf-list command for internal use by the gpgconf
      utility from gnupg 1.9.x.

    * Some performance improvements with large keyrings.  See
      --enable-key-cache=SIZE in the README file for details.

    * Some portability fixes for the OpenBSD/i386, HPPA, and AIX
      platforms.

    * Simplified Chinese translation.

5 files changed, 26 insertions, 48 deletions

diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index cf7ba875a60..c5dbb32a6b4 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2004/03/01 19:12:25 wiz Exp $
+$NetBSD: patch-ab,v 1.23 2004/07/28 15:17:42 wiz Exp $
 
---- mpi/config.links.orig	Wed Dec  3 11:10:16 2003
+--- mpi/config.links.orig	2004-01-13 12:21:39.000000000 +0100
 +++ mpi/config.links
-@@ -200,6 +200,14 @@ case "${target}" in
+@@ -197,6 +197,14 @@ case "${target}" in
  	cat  $srcdir/mpi/m68k/syntax.h	    >>./mpi/asm-syntax.h
  	path="m68k"
  	;;
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
index 6789dc9dbca..909de271793 100644
--- a/security/gnupg/patches/patch-ac
+++ b/security/gnupg/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.14 2003/12/25 14:05:02 wiz Exp $
+$NetBSD: patch-ac,v 1.15 2004/07/28 15:17:42 wiz Exp $
 
 ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
 
---- config.h.in.orig	Tue Dec 23 20:28:49 2003
+--- config.h.in.orig	2004-07-26 14:26:11.000000000 +0200
 +++ config.h.in
-@@ -553,3 +553,4 @@
+@@ -616,3 +616,4 @@
  
  #include "g10defs.h"
  
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
index 4d911bf1d69..14dbbf4ea89 100644
--- a/security/gnupg/patches/patch-ae
+++ b/security/gnupg/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2003/12/25 14:05:02 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2004/07/28 15:17:42 wiz Exp $
 
---- configure.ac.orig	Tue Dec 23 20:20:58 2003
+--- configure.ac.orig	2004-07-26 14:18:06.000000000 +0200
 +++ configure.ac
-@@ -609,7 +609,7 @@ AC_CHECK_FUNCS(strerror stpcpy strsep st
+@@ -633,7 +633,7 @@ AC_CHECK_FUNCS(strerror stpcpy strsep st
  AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid times)
  AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
  AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
diff --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af
index 674d92b612c..046eeedcbf0 100644
--- a/security/gnupg/patches/patch-af
+++ b/security/gnupg/patches/patch-af
@@ -1,28 +1,9 @@
-$NetBSD: patch-af,v 1.5 2004/03/30 15:13:12 tv Exp $
+$NetBSD: patch-af,v 1.6 2004/07/28 15:17:42 wiz Exp $
 
-Parts from:
 ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
 
 --- configure.orig	Tue Dec 23 14:28:22 2003
 +++ configure
-@@ -4601,7 +4601,7 @@ extern "C" {
- 
- EOF
-         # Now generate the symbol file.
--        sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
-+        sed 's/^.* _\{0,1\}\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
- 
-         cat <<EOF >> conftest.c
- #if defined (__STDC__) && __STDC__
-@@ -4621,7 +4621,7 @@ struct {
- dld_preloaded_symbols[] =
- {
- EOF
--        sed 's/^_\?\(.*\) _\?\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-+        sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-         cat <<\EOF >> conftest.c
-   {0, (__ptr_t) 0}
- };
 @@ -13579,7 +13579,7 @@ done
  
  
diff --git a/security/gnupg/patches/patch-ag b/security/gnupg/patches/patch-ag
index 748002eb618..2a082dac2b0 100644
--- a/security/gnupg/patches/patch-ag
+++ b/security/gnupg/patches/patch-ag
@@ -1,22 +1,19 @@
-$NetBSD: patch-ag,v 1.1 2004/03/30 15:13:12 tv Exp $
+$NetBSD: patch-ag,v 1.2 2004/07/28 15:17:42 wiz Exp $
 
---- acinclude.m4.orig	Tue Apr 15 08:16:18 2003
-+++ acinclude.m4
-@@ -588,7 +588,7 @@ extern "C" {
+--- po/Makefile.in.in.orig	2002-06-29 15:43:03.000000000 +0200
++++ po/Makefile.in.in
+@@ -23,13 +23,13 @@ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
  
- EOF
-         # Now generate the symbol file.
--        sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
-+        sed 's/^.* _\{0,1\}\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*|../*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_srcdir)/$(MKINSTALLDIRS)" ;; esac`
  
-         cat <<EOF >> conftest.c
- #if defined (__STDC__) && __STDC__
-@@ -610,7 +610,7 @@ dld_preloaded_symbols[] =
- changequote([,])dnl
- {
- EOF
--        sed 's/^_\?\(.*\) _\?\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-+        sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-         cat <<\EOF >> conftest.c
-   {0, (__ptr_t) 0}
- };
+ CC = @CC@
+ GMSGFMT = @GMSGFMT@