3 files changed, 90 insertions, 1 deletions
diff --git a/net/socks5/distinfo b/net/socks5/distinfo
index b9cf66b16c7..de7ae30a812 100644
--- a/net/socks5/distinfo
+++ b/net/socks5/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2003/10/11 11:27:56 grant Exp $
+$NetBSD: distinfo,v 1.4 2003/12/19 12:24:25 agc Exp $
 
 SHA1 (socks5-v1_0r2_tar.gz) = 57c6e3a17381ce48bed008a86442385dbc2d11de
 Size (socks5-v1_0r2_tar.gz) = 390331 bytes
 SHA1 (patch-aa) = 5960986bf8aa8e8abf96df90b4b9c1940b1adb98
 SHA1 (patch-ab) = 85e70c3a81ee5dc44af24f48fe4d3869c0985854
 SHA1 (patch-ac) = 296da7096e6c6984714f5aa88e3caab7cd11e309
+SHA1 (patch-ad) = bed5faf67a3d7e15693cd526d9554dca85877d7f
+SHA1 (patch-ae) = ee871fc2b3e1b3e8b9c78ab20fe829929bc98b08
diff --git a/net/socks5/patches/patch-ad b/net/socks5/patches/patch-ad
new file mode 100644
index 00000000000..638ade6a4f8
--- /dev/null
+++ b/net/socks5/patches/patch-ad
@@ -0,0 +1,44 @@
+$NetBSD: patch-ad,v 1.1 2003/12/19 12:24:25 agc Exp $
+
+--- clients/ftp/ftp.c	2003/12/19 12:10:21	1.1
++++ clients/ftp/ftp.c	2003/12/19 12:11:47
+@@ -48,7 +48,7 @@
+ #include <fcntl.h>
+ #endif
+ 
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ #ifdef FASCIST
+ #include <syslog.h>
+@@ -241,9 +241,8 @@
+ }
+ 
+ /*VARARGS*/
+-int command(va_alist) va_dcl {
++int command(char *fmt, ...) {
+     va_list ap;
+-    char *fmt;
+     int r;
+     sig_t oldintr;
+     
+@@ -251,8 +250,7 @@
+     if (debug) {
+ 	printf("---> ");
+ 
+-	va_start(ap);
+-	fmt = va_arg(ap, char *);
++	va_start(ap, fmt);
+ 	if (strncmp("PASS ", fmt, 5) == 0)
+ 	    printf("PASS XXXX");
+ 	else 
+@@ -271,8 +269,7 @@
+ 
+     oldintr = (sig_t)Signal(SIGINT, cmdabort);
+ 
+-    va_start(ap);
+-    fmt = va_arg(ap, char *);
++    va_start(ap, fmt);
+     vfprintf(cout, fmt, ap);
+     va_end(ap);
+ 
diff --git a/net/socks5/patches/patch-ae b/net/socks5/patches/patch-ae
new file mode 100644
index 00000000000..0d806132799
--- /dev/null
+++ b/net/socks5/patches/patch-ae
@@ -0,0 +1,43 @@
+$NetBSD: patch-ae,v 1.1 2003/12/19 12:24:25 agc Exp $
+
+--- clients/telnet/commands.c	2003/12/19 12:14:28	1.1
++++ clients/telnet/commands.c	2003/12/19 12:16:29
+@@ -83,7 +83,7 @@
+ #include <signal.h>
+ #include <ctype.h>
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <errno.h>
+ 
+ #include <arpa/telnet.h>
+@@ -122,7 +122,7 @@
+ extern int Ambiguous();
+ extern void herror();
+ 
+-static call();
++static int call(void *, ...);
+ 
+ typedef struct {
+     char *name;		/* command name */
+@@ -2092,17 +2092,15 @@
+ 
+     /*VARARGS1*/
+     static int
+-call(va_alist)
+-    va_dcl
++call(void *func, ...)
+ {
+     va_list ap;
+     typedef int (*intrtn_t)();
+-    intrtn_t routine;
++    intrtn_t routine = (intrtn_t) func;
+     char *args[100];
+     int argno = 0;
+ 
+-    va_start(ap);
+-    routine = (va_arg(ap, intrtn_t));
++    va_start(ap, func);
+     while ((args[argno++] = va_arg(ap, char *)) != 0) {
+ 	;
+     }