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.

1 files changed, 35 insertions, 22 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"