>Number:         28738
>Category:       pkg
>Synopsis:       security/gnupg outdated, patch included
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 21 19:21:00 +0000 2004
>Originator:     Stefan Krüger
>Release:        NetBSD 2.99.11
>Organization:
	
>Environment:
	
	
System: NetBSD dsl-82-144-47-203.berlikomm.net 2.99.11 NetBSD 2.99.11 (PLUTO) #0: Tue Dec 21 18:41:35 CET 2004 space7@dsl-82-144-47-203.berlikomm.net:/usr/obj/cvsroot/src/sys/arch/i386/compile/PLUTO i386
Architecture: i386
Machine: i386
>Description:
GnuPG stable 1.4 released

see http://lists.gnupg.org/pipermail/gnupg-announce/2004q4/000186.html

>How-To-Repeat:
cd ../pkgsrc/security/gnupg && make ;-)
>Fix:
hm should we keep gnupg-1.2.x?
maybe rename security/gnupg to security/gnupg12?

when you close this PR, please also close pkg/25287, thx!

diff -uNr gnupg.old/Makefile gnupg/Makefile
--- gnupg.old/Makefile	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/Makefile	2004-12-21 20:15:00.000000000 +0100
@@ -1,13 +1,14 @@
 # $NetBSD: Makefile,v 1.71 2004/11/08 21:17:01 tv Exp $
 
-DISTNAME=	gnupg-1.2.6
-PKGREVISION=	1
+DISTNAME=	gnupg-1.4.0
+#PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
-		ftp://ftp.planetmirror.com/pub/gnupg/gnupg/ \
+		ftp://ftp.planetmirror.com/pub/gnupg/ \
 		ftp://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \
 		ftp://ftp.jyu.fi/pub/crypt/gcrypt/gnupg/ \
-		ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/gnupg/
+		ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/gnupg \
+		ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
 EXTRACT_SUFX=	.tar.bz2
 # don't remove this -- we may add idea.c.gz to it below
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -24,7 +25,7 @@
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
-CONFIGURE_ARGS+=	--enable-tiger --with-static-rnd=auto
+CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--with-mailprog=/usr/sbin/sendmail
 TEST_TARGET=		check
 
@@ -37,7 +38,7 @@
 BUILD_DEFS+=	USE_I586 USE_IDEA USE_OPENLDAP M68060
 
 .if defined(USE_I586) && ${USE_I586} == YES
-# use assembler routines optimized for i586
+# use assembler routines optimized for, and only for!, i586
 ONLY_FOR_PLATFORM=	*-*-i386
 MACHINE_GNU_ARCH=	i586
 .endif
diff -uNr gnupg.old/PLIST gnupg/PLIST
--- gnupg.old/PLIST	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/PLIST	2004-12-21 19:37:10.000000000 +0100
@@ -2,9 +2,13 @@
 bin/gpg
 bin/gpgsplit
 bin/gpgv
+libexec/gnupg/gpgkeys_finger
+libexec/gnupg/gpgkeys_hkp
+libexec/gnupg/gpgkeys_http
 libexec/gnupg/gpgkeys_mailto
 ${OPENLDAP}libexec/gnupg/gpgkeys_ldap
 man/man1/gpg.1
+man/man1/gpg.ru.1
 man/man1/gpgv.1
 man/man7/gnupg.7
 share/gnupg/DETAILS
@@ -17,6 +21,8 @@
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnupg.mo
@@ -27,7 +33,6 @@
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnupg.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnupg.mo
-${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
diff -uNr gnupg.old/distinfo gnupg/distinfo
--- gnupg.old/distinfo	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/distinfo	2004-12-21 19:31:37.000000000 +0100
@@ -1,13 +1,7 @@
 $NetBSD: distinfo,v 1.31 2004/08/26 13:39:05 lukem Exp $
 
-SHA1 (gnupg-1.2.6.tar.bz2) = 4bc72a7307c4d57618cdba48ad0c6148c1f00a74
-Size (gnupg-1.2.6.tar.bz2) = 2550665 bytes
-SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
-Size (idea.c.gz) = 5216 bytes
-SHA1 (patch-aa) = 3babbdc4386f0edaed4a6e1bb851312528d6ff9e
-SHA1 (patch-ab) = af66565a44b5db979dc1362733193f3d6888a34f
-SHA1 (patch-ac) = cc029e0b2dcc18b1d8de0c1145719bb2bf329467
-SHA1 (patch-ad) = fc9e85c88e53738faa47f55b769e98dce2c190dc
-SHA1 (patch-ae) = 827cdfbc4ed04c382f593051188a5aad0977b0ed
-SHA1 (patch-af) = bdc03318447a78ac52b3dbefc59f90fcebc0b20d
-SHA1 (patch-ak) = bf0d2648382f8737bdda4eac486f23ee76f43b4f
+SHA1 (gnupg-1.4.0.tar.bz2) = 0054635a131b7af383e956fa9e1520ac44cad116
+Size (gnupg-1.4.0.tar.bz2) = 2722669 bytes
+SHA1 (patch-aa) = 2916ba7403fea027d872fe62ce271c2e8b8ac3be
+SHA1 (patch-ab) = 29a7d0b736322eb1ecf0925a2419b513f323000e
+SHA1 (patch-ak) = d6a13c41905c7d0c5bf883add227bc7d5267dc06
diff -uNr gnupg.old/patches/patch-aa gnupg/patches/patch-aa
--- gnupg.old/patches/patch-aa	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-aa	2004-12-21 19:29:52.000000000 +0100
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/08/25 21:25:25 itojun Exp $
+$NetBSD$
 
---- 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 @@
+--- cipher/idea-stub.c.orig	2004-11-17 16:50:56.000000000 +0100
++++ cipher/idea-stub.c
+@@ -132,9 +132,9 @@ load_module (const char *name)
      }
  
    sym = dlsym (handle, "idea_get_info");
diff -uNr gnupg.old/patches/patch-ab gnupg/patches/patch-ab
--- gnupg.old/patches/patch-ab	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-ab	2004-12-21 19:30:07.000000000 +0100
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.23 2004/07/28 15:17:42 wiz Exp $
+$NetBSD$
 
---- mpi/config.links.orig	2004-01-13 12:21:39.000000000 +0100
+--- mpi/config.links.orig	2004-10-26 19:06:47.000000000 +0200
 +++ mpi/config.links
-@@ -197,6 +197,14 @@ case "${target}" in
+@@ -197,6 +197,14 @@ case "${host}" in
  	cat  $srcdir/mpi/m68k/syntax.h	    >>./mpi/asm-syntax.h
  	path="m68k"
  	;;
diff -uNr gnupg.old/patches/patch-ac gnupg/patches/patch-ac
--- gnupg.old/patches/patch-ac	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-ac	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-$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	2004-07-26 14:26:11.000000000 +0200
-+++ config.h.in
-@@ -616,3 +616,4 @@
- 
- #include "g10defs.h"
- 
-+#undef HAVE_GETADDRINFO
diff -uNr gnupg.old/patches/patch-ad gnupg/patches/patch-ad
--- gnupg.old/patches/patch-ad	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-ad	1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/12/25 14:05:02 wiz Exp $
-
-ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
-
---- util/http.c.orig	Tue Dec 23 18:33:34 2003
-+++ util/http.c
-@@ -751,6 +751,28 @@ connect_server( const char *server, usho
-         sock_close (sd);
-         return -1;
-     }
-+#elif defined(HAVE_GETADDRINFO)
-+    struct addrinfo hints, *res0, *res;
-+    char portstr[20];
-+
-+    memset(&hints, 0, sizeof(hints));
-+    hints.ai_socktype = SOCK_STREAM;
-+    snprintf(portstr, sizeof(portstr), "%u", port);
-+    if (getaddrinfo(server, portstr, &hints, &res0) != 0)
-+	return -1;
-+    for (res = res0; res; res = res->ai_next) {
-+	sd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-+	if (sd < 0)
-+	    continue;
-+	if (connect(sd, res->ai_addr, res->ai_addrlen) < 0) {
-+	    close(sd);
-+	    sd = -1;
-+	    continue;
-+	}
-+	break;
-+    }
-+    freeaddrinfo(res0);
-+    return sd;
- #else
-     struct sockaddr_in addr;
-     struct hostent *host;
diff -uNr gnupg.old/patches/patch-ae gnupg/patches/patch-ae
--- gnupg.old/patches/patch-ae	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-ae	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2004/07/28 15:17:42 wiz Exp $
-
---- configure.ac.orig	2004-07-26 14:18:06.000000000 +0200
-+++ configure.ac
-@@ -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)
--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>])
- 
diff -uNr gnupg.old/patches/patch-af gnupg/patches/patch-af
--- gnupg.old/patches/patch-af	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-af	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.6 2004/07/28 15:17:42 wiz Exp $
-
-ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
-
---- configure.orig	Tue Dec 23 14:28:22 2003
-+++ configure
-@@ -13579,7 +13579,7 @@ done
- 
- 
- 
--for ac_func in waitpid wait4 sigaction sigprocmask rand pipe stat
-+for ac_func in waitpid wait4 sigaction sigprocmask rand pipe stat getaddrinfo
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff -uNr gnupg.old/patches/patch-ak gnupg/patches/patch-ak
--- gnupg.old/patches/patch-ak	2004-12-21 19:06:17.000000000 +0100
+++ gnupg/patches/patch-ak	2004-12-21 19:31:29.000000000 +0100
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2003/12/01 14:16:17 he Exp $
+$NetBSD$
 
---- include/types.h.orig	Wed Jul 30 09:44:43 2003
-+++ include/types.h	Sun Nov 30 12:04:15 2003
-@@ -103,7 +103,12 @@
+--- include/types.h.orig	2003-09-28 13:35:29.000000000 +0200
++++ include/types.h
+@@ -103,7 +103,12 @@ typedef unsigned long u32;
  #undef u64	    /* maybe there is a macro with this name */
  #if SIZEOF_UINT64_T == 8
  typedef uint64_t u64;

>Unformatted: