>Number:         25287
>Category:       pkg
>Synopsis:       new pkg, security/gnupg13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 22 23:37:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Krüger
>Release:        NetBSD 2.0D
>Organization:
	
>Environment:
	
	
System: NetBSD dsl-62-220-19-96.berlikomm.net 2.0D NetBSD 2.0D (PLUTO) #0: Thu Apr 22 15:29:45 CEST 2004 space7@dsl-62-220-19-96.berlikomm.net:/usr/obj/cvsroot/src/sys/arch/i386/compile/PLUTO i386
Architecture: i386
Machine: i386
>Description:
	"The latest release from the development branch of GnuPG is ready for
	 public consumption." well then let's consume it :-)

	You'll find the announcement ->
	  http://lists.gnupg.org/pipermail/gnupg-announce/2004q1/000165.html

	Compiled fine, make test was successful, I've test-build with
	USE_I586 and USE_IDEA, USE_OPENLDAP untested.

	Makefile, DESCR and patches/ mostly taken from security/gnupg,
	with some tweaking by me, since there's so much common code I'm
	sure it can be abstracted into Makefile.common but that's beyond
	my scope :-(
>How-To-Repeat:
	cd /usr/pkgsrc/security/gnupg_newer_than_1_2; make ;-)
>Fix:
	cd ../pkgsrc/security
	cp -R gnupg gnupg13
	patch -E < 
diff -uNr --exclude CVS gnupg/Makefile gnupg13/Makefile
--- gnupg/Makefile	2004-04-14 12:39:54.000000000 +0200
+++ gnupg13/Makefile	2004-04-23 01:13:27.000000000 +0200
@@ -1,13 +1,11 @@
 # $NetBSD: Makefile,v 1.65 2004/04/09 00:36:06 reed Exp $
 
-DISTNAME=	gnupg-1.2.4
-PKGREVISION=	1
+DISTNAME=	gnupg-1.3.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
-		ftp://ftp.planetmirror.com/pub/gnupg/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/
+MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/ \
+		ftp://gd.tuwien.ac.at/privacy/gnupg/alpha/gnupg/ \
+		ftp://ftp.jyu.fi/pub/crypt/gcrypt/alpha/gnupg/ \
+		ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/alpha/gnupg/
 EXTRACT_SUFX=	.tar.bz2
 # don't remove this -- we may add idea.c.gz to it below
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -16,13 +14,15 @@
 HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	Privacy Guard, public-Key encryption and digital signatures
 
+CONFLICTS=	gnupg-1.2.[1-9]*
+
 BUILD_USES_MSGFMT=	yes
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
 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
 
@@ -36,11 +36,13 @@
 
 .if defined(USE_I586) && ${USE_I586} == YES
 # use assembler routines optimized for i586
+# only define this when you want to use gpg on a Pentium/AMD K6 cpu,
+# this code is slower on faster machines!
 ONLY_FOR_PLATFORM=	*-*-i386
 MACHINE_GNU_ARCH=	i586
 .endif
 
-.if defined(M68060) && ${M68060} == YES 
+.if defined(M68060) && ${M68060} == YES
 # be more efficient on M68060 machines
 CONFIGURE_ENV+=                M68060=${M68060}
 CFLAGS+=                       -m68060
diff -uNr --exclude CVS gnupg/PLIST gnupg13/PLIST
--- gnupg/PLIST	2004-03-18 19:02:48.000000000 +0100
+++ gnupg13/PLIST	2004-04-23 00:27:50.000000000 +0200
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2004/03/09 23:04:37 seb Exp $
+@comment $NetBSD$
 bin/gpg
 bin/gpgsplit
 bin/gpgv
+lib/charset.alias
+libexec/gnupg/gpgkeys_hkp
 libexec/gnupg/gpgkeys_mailto
 ${OPENLDAP}libexec/gnupg/gpgkeys_ldap
 man/man1/gpg.1
@@ -11,31 +13,9 @@
 share/gnupg/FAQ
 share/gnupg/faq.html
 share/gnupg/options.skel
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnupg.mo
-${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
-${PKGLOCALEDIR}/locale/el/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
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnupg.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnupg.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnupg.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnupg.mo
-${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
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnupg.mo
-${PKGLOCALEDIR}/locale/ru/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
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/locale.alias
 @dirrm share/gnupg
 @dirrm libexec/gnupg
diff -uNr --exclude CVS gnupg/distinfo gnupg13/distinfo
--- gnupg/distinfo	2004-04-01 20:45:51.000000000 +0200
+++ gnupg13/distinfo	2004-04-22 23:46:44.000000000 +0200
@@ -1,14 +1,11 @@
 $NetBSD: distinfo,v 1.27 2004/03/30 15:13:12 tv Exp $
 
-SHA1 (gnupg-1.2.4.tar.bz2) = 10972d11aeb9f88369557f351f0e9d95542e778b
-Size (gnupg-1.2.4.tar.bz2) = 2377277 bytes
+SHA1 (gnupg-1.3.5.tar.bz2) = 9a30a69a1fb6a7049f2f451bd97e6425393e34cb
+Size (gnupg-1.3.5.tar.bz2) = 1513059 bytes
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
 Size (idea.c.gz) = 5216 bytes
 SHA1 (patch-aa) = 3babbdc4386f0edaed4a6e1bb851312528d6ff9e
 SHA1 (patch-ab) = 074bdc631b1558d11b4b640ea3aa6a9be04a9368
-SHA1 (patch-ac) = bf663caa3d7f9b9bb8c4b3f698038efc0683f9cd
-SHA1 (patch-ad) = fc9e85c88e53738faa47f55b769e98dce2c190dc
-SHA1 (patch-ae) = 287a24a881d6886e8a6be5f2826ffa2ea85aadbf
-SHA1 (patch-af) = f794a577f42f80cf1b7d0149bdc7d932f6607f24
+SHA1 (patch-af) = e60daf5b5b0eebc53383c09ac6de823f7d242804
 SHA1 (patch-ag) = 1553d3919211a1a43ea2afe56a046580208fb096
 SHA1 (patch-ak) = bf0d2648382f8737bdda4eac486f23ee76f43b4f
diff -uNr --exclude CVS gnupg/patches/patch-ac gnupg13/patches/patch-ac
--- gnupg/patches/patch-ac	2004-01-20 20:14:04.000000000 +0100
+++ gnupg13/patches/patch-ac	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2003/12/25 14:05:02 wiz Exp $
-
-ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
-
---- config.h.in.orig	Tue Dec 23 20:28:49 2003
-+++ config.h.in
-@@ -553,3 +553,4 @@
- 
- #include "g10defs.h"
- 
-+#undef HAVE_GETADDRINFO
diff -uNr --exclude CVS gnupg/patches/patch-ad gnupg13/patches/patch-ad
--- gnupg/patches/patch-ad	2004-01-20 20:14:04.000000000 +0100
+++ gnupg13/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 --exclude CVS gnupg/patches/patch-ae gnupg13/patches/patch-ae
--- gnupg/patches/patch-ae	2004-01-20 20:14:04.000000000 +0100
+++ gnupg13/patches/patch-ae	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/12/25 14:05:02 wiz Exp $
-
---- configure.ac.orig	Tue Dec 23 20:20:58 2003
-+++ configure.ac
-@@ -609,7 +609,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 --exclude CVS gnupg/patches/patch-af gnupg13/patches/patch-af
--- gnupg/patches/patch-af	2004-04-01 20:45:51.000000000 +0200
+++ gnupg13/patches/patch-af	2004-04-22 23:38:57.000000000 +0200
@@ -23,12 +23,3 @@
          cat <<\EOF >> conftest.c
    {0, (__ptr_t) 0}
  };
-@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: