upgrade to 1.2.0, from skrueger@europe.com

2002-09-21  Werner Koch  <wk@gnupg.org>
        Released 1.2.0.
	* configure.ac: Bumbed version number and set development version
	to no.
2002-09-19  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Try linking LDAP as just -lldap as it seems very
	recent OpenLDAPs (>=2.0.23) support that.
2002-09-14  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Try linking LDAP without -lresolv first, just in
	case the platform has libresolv, but doesn't actually need it to
	use LDAP.
2002-09-12  David Shaw  <dshaw@jabberwocky.com>
	* NEWS: Note that the old IDEA plugin won't work with post-1.1.90
	gpg.
2002-09-11  Werner Koch  <wk@gnupg.org>
	Released 1.1.92.
	* configure.ac (random_modules): The default random module for
	system lacking a /dev/random is now auto selected at runtime.
2002-09-09  David Shaw  <dshaw@jabberwocky.com>
	* NEWS: typo.
	* configure.ac: Add a link test for LDAP without -lresolv for
	HPUX.  Remove "hstrerror" test as it is no longer needed.
2002-09-02  Werner Koch  <wk@gnupg.org>
	* README: Removed the note about a development version so that we
	later don't forget this.  Minor other changes.
2002-08-29  Werner Koch  <wk@gnupg.org>
	* configure.ac (random_modules): Reworked the code to select the
	random module.  Define USE_ALL_RANDOM_MODULES for value all.
2002-08-27  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Check type of mode_t.
	* NEWS: Clarify that --libexecdir is a configure option.
	* configure.ac: Check for hstrerror.
2002-08-19  David Shaw  <dshaw@jabberwocky.com>
	* NEWS: Document new ways to enable MDC, and change in automatic
	compression disabling.
	* configure.ac: No such thing as the "none" random gather any
	longer.
2002-08-08  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Add an --enable-tiger.
	* NEWS: Clarify new permission checks.
2002-08-07  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: If the static IDEA cipher is present, disable
	dynamic loading.  Also fix backwards grammar of keyserver
	exec-path CHECKING message.
2002-08-05  Werner Koch  <wk@gnupg.org>
	* configure.ac: Bumbed version number.
2002-08-04  Werner Koch  <wk@gnupg.org>
	Released 1.1.91.
	* configure.ac (ALL_LINGUAS): Added Catalan.
2002-08-02  Werner Koch  <wk@gnupg.org>
	* configure.ac: Removed all extension stuff but keep the tests for
	dlopen.  We don't need to figure out the flags required.  All
	stuff is now statically loaded.
2002-07-30  David Shaw  <dshaw@jabberwocky.com>
	* README, configure.ac: --with-exec-path is now clarified into
	--disable-keyserver-path
	* NEWS: changes since 1.1.90.
2002-07-24  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Include a GNUPG_LIBEXECDIR in g10defs.h, as well
	as a SUBST for Makefiles.
2002-07-22  Timo Schulz  <ts@winpt.org>
	* configure.ac: Replace the 'c:/' variables with 'c:\' due
	to the fact we already use '\' in the remaining code.
2002-07-08  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Add --with-mailprog to override the use of
	sendmail with another MTA.  We can use anything that follows the
	"$MAILPROG -t" convention.
2002-07-04  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: --enable-exec-path should be a 'with'.  Fix 'no'
	cases of --with-exec-path and --with-photo-viewer.
	* README: Document --disable-exec, --disable-photo-viewers,
	--disable-keyserver-helpers, --enable-exec-path, and
	--with-photo-viewer.
	* configure.ac: Add --with-photo-viewer to lock the viewer at
	compile time and --disable-keyserver-helpers and
	--disable-photo-viewers to allow disabling one without disabling
	the other.
2002-07-03  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Allow setting USE_EXEC_PATH to lock the exec-path
	to a fixed value.
2002-07-01  Werner Koch  <wk@gnupg.org>
	* configure.ac: Set version number to 1.1.91.
        Released 1.1.90.
	* INSTALL: Replaced by generic install file.
	* README: Marked as development version and moved most stuff of
	the old INSTALL file to here.
2002-06-30  Werner Koch  <wk@gnupg.org>
	* configure.ac: Link W32 version against libwsock32.
2002-06-29  Werner Koch  <wk@gnupg.org>
	* configure.ac (development_version): New.
	(HAVE_DEV_RANDOM_IOCTL): Removed test for it; it was never used.
	* BUGS, AUTHORS: Add a note on how to send security related bug
	reports.
2002-06-20  David Shaw  <dshaw@jabberwocky.com>
	* NEWS: changes since 1.0.7.
	* configure.ac: Set new version number (1.1.90), and fix Solaris
	compiler flags for shared objects.
2002-06-11  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Move -lsocket and -lnsl checks before LDAP link
	tests so they work properly on Solaris.  Noted by David Champion.
	Also, check for the Mozilla LDAP library if the OpenLDAP library
	check fails.  Put -lsocket and -lnsl in NETLIBS rather than LIBS
	so not all programs are forced to link to them.
2002-06-05  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Add a switch for the experimental external HKP
	keyserver interface.
2002-05-22  Werner Koch  <wk@gnupg.org>
	* configure.ac: Check for strcasecmp and strncasecmp.  Removed
	stricmp and memicmp checks.
2002-05-08  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: If LDAP comes up unusable, try #including <lber.h>
	before giving up.  Old versions of OpenLDAP require that.
2002-05-03  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: In g10defs.h, use \ for the directory separator
	when HAVE_DOSISH_SYSTEM is on.
	* configure.ac: Add --disable-exec flag to disable all remote
	program execution.  --disable-exec implies --disable-ldap and
	--disable-mailto.  Also look in /usr/lib for sendmail.  If
	sendmail is not found, do not default - just fail.
2002-04-30  David Shaw  <dshaw@jabberwocky.com>
	* configure.ac: Try and link to a sample LDAP program to check if
	the LDAP we're about to use is really sane.  The most common
	problem (using a very old OpenLDAP), could be fixed with an extra
	#include, but this would not be very portable to other LDAP
	libraries.

9 files changed, 89 insertions, 143 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 9255abe9235..0fe94ff96e7 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,11 +1,17 @@
-# $NetBSD: Makefile,v 1.34 2002/10/01 19:53:54 chris Exp $
+# $NetBSD: Makefile,v 1.35 2002/10/09 14:16:55 itojun Exp $
 #
 
-DISTNAME=	gnupg-1.0.7
-PKGREVISION=	2
+DISTNAME=	gnupg-1.2.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
-# don't remove this -- we may add idea.c to it below
+MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
+		ftp://ftp.planetmirror.com/pub/gnupg/ \
+		ftp://ftp.ring.gr.jp/pub/pgp/ \
+		ftp://gd.tuwien.ac.at/privacy/gnupg/ \
+		ftp://ftp.jyu.fi/pub/crypt/gcrypt/ \
+		ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/ \
+		ftp://hal.csd.auth.gr/mirrors/gnupg/
+EXTRACT_SUFX=	.tar.bz2
+# don't remove this -- we may add idea.c.gz to it below
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	wiz@netbsd.org
@@ -13,41 +19,48 @@ HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	Privacy Guard, a public-Key encryption and digital signature utility
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK2=	yes
 
 CRYPTO=		yes
 GNU_CONFIGURE=	yes
+USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
+CONFIGURE_ARGS+=--enable-tiger --with-static-rnd=auto
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-INFO_FILES=	gpgv.info
+INFO_FILES=	gpg.info gpgv.info
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	USE_IDEA
+BUILD_DEFS+=	USE_I586 USE_IDEA USE_OPENLDAP
+
+.if defined(USE_I586) && ${USE_I586} == YES
+# use assembler routines optimized for i586
+ONLY_FOR_PLATFORM=	*-*-i386
+MACHINE_GNU_ARCH=	i586
+.endif
 
 .if defined(USE_IDEA) && ${USE_IDEA} == YES
 # use of IDEA as crypto function
-LICENCE=        fee-based-commercial-use
-MASTER_SITES+=	ftp://ftp.gnupg.org/pub/gcrypt/contrib/
-DISTFILES+=	idea.c.20010605
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-PLIST_SUBST+=	IDEA=""
-
-post-extract:
-	${CP} ${_DISTDIR}/idea.c.20010605 ${WRKSRC}/idea.c
+LICENCE=	fee-based-commercial-use
+DISTFILES+=	idea.c.gz
+SITES_idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/
 
-post-build:
-	cd ${WRKSRC} &&							\
-	${BUILDLINK_CC} ${CFLAGS} -shared -Wl,-Bshareable -fPIC -o idea idea.c
+pre-configure:
+	${GZCAT} ${DISTDIR}/idea.c.gz > ${WRKSRC}/cipher/idea.c
+.endif
 
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/idea ${PREFIX}/lib/gnupg
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
+.include "../../databases/openldap/buildlink2.mk"
+PLIST_SUBST+=	OPENLDAP=""
 .else
-PLIST_SUBST+=	IDEA="@comment "
+CONFIGURE_ARGS+=--disable-ldap
+PLIST_SUBST+=	OPENLDAP="@comment "
 .endif
 
+regress:
+		cd ${WRKSRC} && make check
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 72bf5e6f92f..9bf1cd24d09 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,20 +1,22 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:50:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/10/09 14:16:55 itojun Exp $
 bin/gpg
-bin/gpgkeys_mailto
 bin/gpgsplit
 bin/gpgv
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpg.info
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpgv.info
+info/gpg.info
 info/gpgv.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpg.info
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpgv.info
-${IDEA}lib/gnupg/idea
-lib/gnupg/rndegd
-lib/gnupg/rndunix
-lib/gnupg/tiger
+libexec/gnupg/gpgkeys_mailto
+${OPENLDAP}libexec/gnupg/gpgkeys_ldap
 man/man1/gpg.1
 man/man1/gpgv.1
+man/man7/gnupg.7
 share/gnupg/FAQ
 share/gnupg/faq.html
 share/gnupg/options.skel
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg.mo
@@ -34,4 +36,4 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnupg.mo
 @dirrm share/gnupg
-@dirrm lib/gnupg
+@dirrm libexec/gnupg
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index b9acca5a474..b009d8d4d88 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.11 2002/09/30 22:41:30 chris Exp $
+$NetBSD: distinfo,v 1.12 2002/10/09 14:16:55 itojun Exp $
 
-SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e
-Size (gnupg-1.0.7.tar.gz) = 2399025 bytes
-SHA1 (idea.c.20010605) = f6e237b84285964f09b3806b91170b6523384a48
-Size (idea.c.20010605) = 15480 bytes
-SHA1 (patch-aa) = fffd3e55792bb27df002bacbc5d8bf9096d5dd64
-SHA1 (patch-ab) = ce3b5ff0331e51ca6cd11b969e8df3719ca5d547
-SHA1 (patch-ac) = 9e3d0c6a7b828e52f5a773591f87e4a9072ad698
-SHA1 (patch-ad) = 55ca924c9aefe9eeca44b301ac523e7ebb2514e9
-SHA1 (patch-ae) = ff58490a6505e333f776efa7cafaa269c4833597
-SHA1 (patch-af) = 804f28db69c9d0aa7c1cfd3237b9a5adb1e95ad9
+SHA1 (gnupg-1.2.0.tar.bz2) = 67a2cf5d046967b7655890aa67d59f4509fe361e
+Size (gnupg-1.2.0.tar.bz2) = 1849154 bytes
+SHA1 (idea.c.gz) = cd29040234a33cbfa9b87752c8cbb2adbccd9e95
+Size (idea.c.gz) = 4538 bytes
+SHA1 (patch-aa) = 643a69496655af28df525c93d8e57f1b69e55b0d
+SHA1 (patch-ab) = e57e8dc8b79a18f255d99853846528b5b7943388
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
index 906c88fdac5..7c29a444418 100644
--- a/security/gnupg/patches/patch-aa
+++ b/security/gnupg/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.6 2001/05/23 15:35:01 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2002/10/09 14:16:56 itojun Exp $
 
---- cipher/Makefile.am.orig	Thu Mar  8 14:47:11 2001
-+++ cipher/Makefile.am
-@@ -43,7 +43,7 @@
- endif
- 
- 
--DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@
-+DYNLINK_MOD_CFLAGS = -DIS_MODULE -fPIC @DYNLINK_MOD_CFLAGS@
- 
- #libcipher_a_LDFLAGS =
- libcipher_a_SOURCES = cipher.c	\
+--- configure.orig	Sat Sep 21 12:32:56 2002
++++ configure	Sun Sep 29 23:39:25 2002
+@@ -4792,8 +4792,14 @@
+ NAME_OF_DEV_RANDOM="/dev/random"
+ NAME_OF_DEV_URANDOM="/dev/urandom"
+ case "${target}" in
+-    *-openbsd* | *-netbsd*)
++    *-openbsd*)
+         NAME_OF_DEV_RANDOM="/dev/srandom"
++        NAME_OF_DEV_URANDOM="/dev/urandom"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
++        ;;
++
++    *-netbsd*)
++        NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         ;;
+ esac
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index 3bc581e00e3..43ad5db1bfc 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,13 +1,20 @@
-$NetBSD: patch-ab,v 1.13 2002/05/07 18:48:47 wiz Exp $
-
---- cipher/Makefile.in.orig	Mon Apr 29 17:06:11 2002
-+++ cipher/Makefile.in
-@@ -129,7 +129,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
--DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@
-+DYNLINK_MOD_CFLAGS = -DIS_MODULE -fPIC @DYNLINK_MOD_CFLAGS@
- 
- INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
+$NetBSD: patch-ab,v 1.14 2002/10/09 14:16:56 itojun Exp $
  
+--- configure.ac.orig	Sat Sep 21 12:19:15 2002
++++ configure.ac	Sun Sep 29 23:40:20 2002
+@@ -453,8 +453,14 @@
+ NAME_OF_DEV_RANDOM="/dev/random"
+ NAME_OF_DEV_URANDOM="/dev/urandom"
+ case "${target}" in
+-    *-openbsd* | *-netbsd*)
++    *-openbsd*)
+         NAME_OF_DEV_RANDOM="/dev/srandom"
++        NAME_OF_DEV_URANDOM="/dev/urandom"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
++        ;;
++
++    *-netbsd*)
++        NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         ;;
+ esac
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
deleted file mode 100644
index 5e24c169a30..00000000000
--- a/security/gnupg/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2002/05/07 18:48:47 wiz Exp $
-
---- mpi/config.links.orig	Thu Apr 18 12:10:40 2002
-+++ mpi/config.links
-@@ -119,6 +119,12 @@
- 	path="sparc32v8 sparc32"
- 	mpi_extra_modules="udiv"
- 	;;
-+     sparc64-*-netbsd)
-+ 	# There are no sparc64 assembler modules that work, so
-+ 	# just use generic C functions
-+ 	echo '/* configured for sparc64-*-netbsd */' >>./mpi/asm-syntax.h
-+ 	path=""
-+ 	;;
-     sparc64-sun-solaris2*)
- 	# Got a report that udiv is missing, so we try this one
- 	echo '/* configured for sparc64-sun-solaris2 */' >>./mpi/asm-syntax.h
diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
deleted file mode 100644
index b2d69ed793d..00000000000
--- a/security/gnupg/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 21:50:37 jlam Exp $
-
---- configure.orig	Mon Apr 29 16:59:16 2002
-+++ configure
-@@ -3928,8 +3928,14 @@
- NAME_OF_DEV_RANDOM="/dev/random"
- NAME_OF_DEV_URANDOM="/dev/urandom"
- case "${target}" in
--    *-openbsd* | *-netbsd*)
-+    *-openbsd*)
-         NAME_OF_DEV_RANDOM="/dev/srandom"
-+        NAME_OF_DEV_URANDOM="/dev/urandom"
-+        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
-+        ;;
-+
-+    *-netbsd*)
-+        NAME_OF_DEV_RANDOM="/dev/random"
-         NAME_OF_DEV_URANDOM="/dev/urandom"
-         DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
-         ;;
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
deleted file mode 100644
index e7975763ee7..00000000000
--- a/security/gnupg/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/08/25 21:50:38 jlam Exp $
-
---- configure.ac.orig	Mon Apr 29 16:56:08 2002
-+++ configure.ac
-@@ -325,8 +325,14 @@
- NAME_OF_DEV_RANDOM="/dev/random"
- NAME_OF_DEV_URANDOM="/dev/urandom"
- case "${target}" in
--    *-openbsd* | *-netbsd*)
-+    *-openbsd*)
-         NAME_OF_DEV_RANDOM="/dev/srandom"
-+        NAME_OF_DEV_URANDOM="/dev/urandom"
-+        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
-+        ;;
-+
-+    *-netbsd*)
-+        NAME_OF_DEV_RANDOM="/dev/random"
-         NAME_OF_DEV_URANDOM="/dev/urandom"
-         DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
-         ;;
diff --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af
deleted file mode 100644
index c3653f509fa..00000000000
--- a/security/gnupg/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/09/30 22:41:31 chris Exp $
-
---- cipher/dynload.c.orig	Mon Sep 30 23:34:34 2002
-+++ cipher/dynload.c	Mon Sep 30 23:35:18 2002
-@@ -287,7 +287,7 @@
- 	goto failure;
-     }
-     name = (char**)dlsym(el->handle, SYMBOL_VERSION);
--    if( (err=dlerror()) ) {
-+    if( (name == NULL) && (err=dlerror()) ) {
- 	log_error("%s: not a gnupg extension: %s\n", el->name, err );
- 	goto failure;
-     }
-@@ -332,7 +332,7 @@
- 
-   #ifdef HAVE_DL_DLOPEN
-     sym = dlsym(el->handle, SYMBOL_ENUM);
--    if( (err=dlerror()) ) {
-+    if( (sym == NULL) && (err=dlerror()) ) {
- 	log_error("%s: invalid gnupg extension: %s\n", el->name, err );
- 	goto failure;
-     }