add IPv6 support. bump PKGREVISION

6 files changed, 89 insertions, 3 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index bca9a427b84..a9ef948496d 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2003/08/09 11:21:55 seb Exp $
+# $NetBSD: Makefile,v 1.51 2003/08/15 07:02:22 itojun Exp $
 
 DISTNAME=	gnupg-1.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
 		ftp://ftp.planetmirror.com/pub/gnupg/gnupg/ \
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index ead6d36fd4c..aa750e5e23c 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.19 2003/08/09 09:12:41 wiz Exp $
+$NetBSD: distinfo,v 1.20 2003/08/15 07:02:22 itojun Exp $
 
 SHA1 (gnupg-1.2.2.tar.bz2) = 8f620b67dad86577cf77d7b43ba2ae43e204b5bc
 Size (gnupg-1.2.2.tar.bz2) = 2225034 bytes
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
 Size (idea.c.gz) = 5216 bytes
+SHA1 (gnupg-1.2.2-IPv6.diff.gz) = c9ca0ddc2016fe9b08ed829dbe7c9577c2561d21
+Size (gnupg-1.2.2-IPv6.diff.gz) = 963 bytes
 SHA1 (patch-aa) = 56601df46f7f93626d82293b4062e15ab645cc40
 SHA1 (patch-ab) = 8c58e4bfafbd2c151ee03b12e354782330df7b07
+SHA1 (patch-ac) = ce5bbc1bb648f782ffc93704532fc8ca7f8a9524
+SHA1 (patch-ad) = 2783ded1fa83c755b4fe8a544066da631b88db8e
+SHA1 (patch-ae) = 5d998893f6718361651ff85be491d8fa5966f1c2
+SHA1 (patch-af) = 0ddc5ad0692b365236e6bf643b44d8f70c5b6dd0
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
new file mode 100644
index 00000000000..2164e752c43
--- /dev/null
+++ b/security/gnupg/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.13 2003/08/15 07:02:23 itojun Exp $
+
+ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
+
+diff -u -r1.1.1.1 -r1.2
+--- config.h.in	15 Aug 2003 05:12:06 -0000	1.1.1.1
++++ config.h.in	15 Aug 2003 06:44:46 -0000	1.2
+@@ -537,3 +537,4 @@
+ 
+ #include "g10defs.h"
+ 
++#undef HAVE_GETADDRINFO
diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
new file mode 100644
index 00000000000..cf38f216181
--- /dev/null
+++ b/security/gnupg/patches/patch-ad
@@ -0,0 +1,36 @@
+$NetBSD: patch-ad,v 1.4 2003/08/15 07:02:23 itojun Exp $
+
+ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
+
+diff -u -r1.1.1.1 -r1.2
+--- util/http.c	15 Aug 2003 05:12:28 -0000	1.1.1.1
++++ util/http.c	15 Aug 2003 06:44:46 -0000	1.2
+@@ -753,6 +753,28 @@
+         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 --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
new file mode 100644
index 00000000000..c5d23aa6da3
--- /dev/null
+++ b/security/gnupg/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.4 2003/08/15 07:02:23 itojun Exp $
+
+ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
+
+diff -u -r1.1.1.1 -r1.3
+--- configure.ac	15 Aug 2003 05:12:08 -0000	1.1.1.1
++++ configure.ac	15 Aug 2003 06:47:49 -0000	1.3
+@@ -586,7 +586,7 @@
+ AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid)
+ 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)
+ 
+ #
diff --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af
new file mode 100644
index 00000000000..73b2de7c858
--- /dev/null
+++ b/security/gnupg/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.3 2003/08/15 07:02:23 itojun Exp $
+
+ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
+
+diff -u -r1.1.1.1 -r1.2
+--- configure	15 Aug 2003 05:12:08 -0000	1.1.1.1
++++ configure	15 Aug 2003 06:47:49 -0000	1.2
+@@ -13111,7 +13111,7 @@
+ 
+ 
+ 
+-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