7 files changed, 11 insertions, 85 deletions
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
index 45bd3fce2e0..3989b307889 100644
--- a/security/gnupg/patches/patch-aa
+++ b/security/gnupg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/08/25 21:25:25 itojun Exp $
+$NetBSD: patch-aa,v 1.10 2004/12/25 02:54:13 wiz Exp $
 
---- 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 --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index c5dbb32a6b4..35edcd63aa4 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.23 2004/07/28 15:17:42 wiz Exp $
+$NetBSD: patch-ab,v 1.24 2004/12/25 02:54:13 wiz Exp $
 
---- 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 --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
deleted file mode 100644
index 909de271793..00000000000
--- a/security/gnupg/patches/patch-ac
+++ /dev/null
@@ -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 --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
deleted file mode 100644
index 984a339f55e..00000000000
--- a/security/gnupg/patches/patch-ad
+++ /dev/null
@@ -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 --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
deleted file mode 100644
index 14dbbf4ea89..00000000000
--- a/security/gnupg/patches/patch-ae
+++ /dev/null
@@ -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 --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af
deleted file mode 100644
index 046eeedcbf0..00000000000
--- a/security/gnupg/patches/patch-af
+++ /dev/null
@@ -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 --git a/security/gnupg/patches/patch-ak b/security/gnupg/patches/patch-ak
index f8bb135e776..b36907ce81a 100644
--- a/security/gnupg/patches/patch-ak
+++ b/security/gnupg/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2003/12/01 14:16:17 he Exp $
+$NetBSD: patch-ak,v 1.2 2004/12/25 02:54:13 wiz Exp $
 
---- 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;