Update gnupg to 1.0.4nb2:

Fix a bug in ~/.gnupg creation.
Honor USE_IDEA, and add the IDEA extension in that case.
Addresses pkg/11876.

5 files changed, 46 insertions, 5 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 525df0a7c87..88ef1c9eee5 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2000/11/30 00:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/01/29 11:53:02 wiz Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
 DISTNAME=	gnupg-1.0.4
-PKGNAME=	${DISTNAME}nb1
+PKGNAME=	${DISTNAME}nb2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
+# don't remove this -- we may add idea.c to it below
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.gnupg.org/
@@ -17,9 +19,32 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBINTL=	yes
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=	USE_IDEA
+
+.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
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+PLIST_SUBST+=	IDEA=""
+
+post-extract:
+		${CP} ${_DISTDIR}/idea.c ${WRKSRC}
+
+post-build:
+		cd ${WRKSRC} && 				\
+		${CC} -shared -Wl,-Bshareable -fPIC -o idea idea.c
+
+post-install:
+		${INSTALL_PROGRAM} ${WRKSRC}/idea ${PREFIX}/lib/gnupg
+.else
+PLIST_SUBST+=	IDEA="@comment "
+.endif
 
 .if ${OPSYS} == "SunOS"
 DEPENDS+=	zlib-1.1.3:../../devel/zlib
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index a9a22ad6f91..4577ab26bc5 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.8 2000/11/10 02:35:02 wiz Exp $
+$NetBSD: md5,v 1.9 2001/01/29 11:53:02 wiz Exp $
 
 MD5 (gnupg-1.0.4.tar.gz) = bef2267bfe9b74a00906a78db34437f9
+MD5 (idea.c) = 7d0557459e0a41da099ddbd837d4bd40
diff --git a/security/gnupg/files/patch-sum b/security/gnupg/files/patch-sum
index 46617dc17a7..34c04b66b19 100644
--- a/security/gnupg/files/patch-sum
+++ b/security/gnupg/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.9 2000/11/12 14:28:48 wiz Exp $
+$NetBSD: patch-sum,v 1.10 2001/01/29 11:53:02 wiz Exp $
 
 MD5 (patch-aa) = 4fe53ce94604cb81a997dfe571550308
 MD5 (patch-ab) = 8e1056e7c48bd2cce13b3e4ffb90d945
+MD5 (patch-ac) = b1b05e17d925ddcf7bcc92eca9279ff7
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
new file mode 100644
index 00000000000..44c35b4bdef
--- /dev/null
+++ b/security/gnupg/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.8 2001/01/29 11:53:03 wiz Exp $
+
+--- g10/openfile.c.orig	Tue Sep  5 17:31:57 2000
++++ g10/openfile.c
+@@ -329,7 +329,7 @@
+ 
+     if ( ( *defhome == '~'
+            && ( strlen(fname) >= strlen (defhome+1)
+-                && !strcmp(fname+strlen(defhome+1)-strlen(defhome+1),
++                && !strcmp(fname+strlen(fname)-strlen(defhome+1),
+                            defhome+1 ) ))
+          || ( *defhome != '~'
+               && !compare_filenames( fname, defhome ) )
diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST
index acad1e7ee60..974af4dbf88 100644
--- a/security/gnupg/pkg/PLIST
+++ b/security/gnupg/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2000/11/10 02:35:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/01/29 11:53:03 wiz Exp $
 bin/gpg
 bin/gpgv
+${IDEA}lib/gnupg/idea
 lib/gnupg/rndegd
 lib/gnupg/rndunix
 lib/gnupg/tiger