upgrade to 1.2.3.

    * New "--gnupg" option (set by default) that disables --openpgp,
      and the various --pgpX emulation options.  This replaces
      --no-openpgp, and --no-pgpX, and also means that GnuPG has
      finally grown a --gnupg option to make GnuPG act like GnuPG.
    * A number of portability changes to make building GnuPG on
      less-common platforms easier.
    * Romanian translation.
    * Two new %-expandos for use in notation and policy URLs.  "%g"
      expands to the fingerprint of the key making the signature
      (which might be a subkey), and "%p" expands to the fingerprint
      of the primary key that owns the key making the signature.
    * New "tru" record in --with-colons --list-keys listings.  It
      shows the status of the trust database that was used to
      calculate the key validity in the listings.  See doc/DETAILS for
      the specifics of this.
    * New REVKEYSIG status tag for --status-fd.  It indicates a valid
      signature that was issued by a revoked key.  See doc/DETAILS for
      the specifics of this.

6 files changed, 22 insertions, 44 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index a9ef948496d..e7e26169102 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2003/08/15 07:02:22 itojun Exp $
+# $NetBSD: Makefile,v 1.52 2003/08/25 21:25:24 itojun Exp $
 
-DISTNAME=	gnupg-1.2.2
-PKGREVISION=	2
+DISTNAME=	gnupg-1.2.3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
 		ftp://ftp.planetmirror.com/pub/gnupg/gnupg/ \
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 55d104b927b..88c3a8bfd54 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/08/04 23:12:17 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/08/25 21:25:24 itojun Exp $
 bin/gpg
 bin/gpgsplit
 bin/gpgv
@@ -31,6 +31,7 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnupg.mo
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index aa750e5e23c..4dd131fbde9 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.20 2003/08/15 07:02:22 itojun Exp $
+$NetBSD: distinfo,v 1.21 2003/08/25 21:25:24 itojun Exp $
 
-SHA1 (gnupg-1.2.2.tar.bz2) = 8f620b67dad86577cf77d7b43ba2ae43e204b5bc
-Size (gnupg-1.2.2.tar.bz2) = 2225034 bytes
+SHA1 (gnupg-1.2.3.tar.bz2) = 1a5f68b52aa04f7370a80c2dfa708accfc64d854
+Size (gnupg-1.2.3.tar.bz2) = 2294773 bytes
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
 Size (idea.c.gz) = 5216 bytes
-SHA1 (gnupg-1.2.2-IPv6.diff.gz) = c9ca0ddc2016fe9b08ed829dbe7c9577c2561d21
-Size (gnupg-1.2.2-IPv6.diff.gz) = 963 bytes
-SHA1 (patch-aa) = 56601df46f7f93626d82293b4062e15ab645cc40
-SHA1 (patch-ab) = 8c58e4bfafbd2c151ee03b12e354782330df7b07
+SHA1 (patch-aa) = 3babbdc4386f0edaed4a6e1bb851312528d6ff9e
 SHA1 (patch-ac) = ce5bbc1bb648f782ffc93704532fc8ca7f8a9524
 SHA1 (patch-ad) = 2783ded1fa83c755b4fe8a544066da631b88db8e
-SHA1 (patch-ae) = 5d998893f6718361651ff85be491d8fa5966f1c2
+SHA1 (patch-ae) = fdcda5736583ba3c5807928d1b958e10e1d8fc06
 SHA1 (patch-af) = 0ddc5ad0692b365236e6bf643b44d8f70c5b6dd0
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
index f29358a3469..45bd3fce2e0 100644
--- a/security/gnupg/patches/patch-aa
+++ b/security/gnupg/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.8 2002/10/27 02:53:03 chris Exp $
+$NetBSD: patch-aa,v 1.9 2003/08/25 21:25:25 itojun Exp $
 
---- idea-stub.c.orig	Sun Oct 27 02:21:54 2002
-+++ cipher/idea-stub.c	Sun Oct 27 02:22:54 2002
+--- cipher/idea-stub.c.orig	2003-07-31 00:15:51.000000000 +0900
++++ cipher/idea-stub.c	2003-08-26 06:19:38.000000000 +0900
 @@ -131,9 +131,9 @@
      }
  
    sym = dlsym (handle, "idea_get_info");
 -  if (dlerror ())
-+  if ((sym == NULL) && (dlerror ()))
++  if ((sym == NULL) && dlerror ())
      sym = dlsym (handle, "_idea_get_info");
 -  if ((err=dlerror())) 
 +  if ((sym == NULL) && (err=dlerror())) 
-     {
-       log_info ("invalid module `%s': %s\n", name, err);
-       goto failure;
+     goto failure;
+ 
+   return sym;
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
deleted file mode 100644
index d2ee9e61838..00000000000
--- a/security/gnupg/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.20 2003/08/09 09:12:42 wiz Exp $
-
---- checks/defs.inc.orig	Thu May  1 15:17:46 2003
-+++ checks/defs.inc
-@@ -99,9 +99,9 @@ pgmname=`basename $0`
- [ -z "$srcdir" ] && fatal "not called from make"
- 
- # Make sure we have a valid option files even with VPATH builds.
--if [ -f ./options]; then
-+if [ -f ./options ]; then
-   :
--elif [ -f ./gpg.conf]; then
-+elif [ -f ./gpg.conf ]; then
-   :
- elif [ -f $srcdir/options ]; then
-   cat $srcdir/options >gpg.conf
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
index c5d23aa6da3..9b851535d57 100644
--- a/security/gnupg/patches/patch-ae
+++ b/security/gnupg/patches/patch-ae
@@ -1,16 +1,13 @@
-$NetBSD: patch-ae,v 1.4 2003/08/15 07:02:23 itojun Exp $
+$NetBSD: patch-ae,v 1.5 2003/08/25 21:25:26 itojun Exp $
 
-ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
-
-diff -u -r1.1.1.1 -r1.3
---- configure.ac	15 Aug 2003 05:12:08 -0000	1.1.1.1
-+++ configure.ac	15 Aug 2003 06:47:49 -0000	1.3
-@@ -586,7 +586,7 @@
- AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid)
+--- configure.ac.orig	2003-08-22 04:45:43.000000000 +0900
++++ configure.ac	2003-08-26 06:21:17.000000000 +0900
+@@ -602,7 +602,7 @@
+ 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)
 -AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat)
 +AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat getaddrinfo)
  AC_REPLACE_FUNCS(mkdtemp)
+ AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>])
  
- #