Fix compile problem under gcc 3.3.3.

- use <stdarg.h> instead of <varargs.h>
- don't declare errno assuming nicluding <errno.h> is sufficient.
- check strerror(3) and don't use own alternative one.

7 files changed, 119 insertions, 1 deletions

diff --git a/security/AiSSLtelnet/distinfo b/security/AiSSLtelnet/distinfo
index 40e47fcf19d..061a10dc733 100644
--- a/security/AiSSLtelnet/distinfo
+++ b/security/AiSSLtelnet/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.7 2003/09/21 09:03:37 jmc Exp $
+$NetBSD: distinfo,v 1.8 2004/03/25 15:23:40 taca Exp $
 
 SHA1 (AiSSLtelnet-0.15.tar.gz) = 533662049ac44dbf45bb5b53f37eabf269017a79
 Size (AiSSLtelnet-0.15.tar.gz) = 669686 bytes
 SHA1 (patch-aa) = 41235e8073500f8da2e8cf47d05f27af3c88b4e7
+SHA1 (patch-ab) = ab2261a810c63a5b5b2d0d1021de94253bb3bc54
+SHA1 (patch-ac) = 8fcaf2a51d0f9209033072ded426a8fff28588ac
+SHA1 (patch-ad) = 954b02c4d494477062dcb05016e2f7d29c299e48
+SHA1 (patch-ae) = 3b162a664c920ac5897154167871925739745083
+SHA1 (patch-af) = 792a27501e29304265b02ba5a7cfaa68ced916a1
+SHA1 (patch-ag) = ebeb3ce32341d4b4e69c71ab969408ff84a5d309
diff --git a/security/AiSSLtelnet/patches/patch-ab b/security/AiSSLtelnet/patches/patch-ab
new file mode 100644
index 00000000000..be90fdd07bd
--- /dev/null
+++ b/security/AiSSLtelnet/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2004/03/25 15:23:40 taca Exp $
+
+--- aiconfig.h.in.orig	2001-08-02 22:42:20.000000000 +0900
++++ aiconfig.h.in
+@@ -13,6 +13,9 @@
+ /* Define to empty if the keyword does not work.  */
+ #undef const
+ 
++/* Define if you have the strerror function.  */
++#undef HAVE_STRERROR
++
+ /* Define if you have the strftime function.  */
+ #undef HAVE_STRFTIME
+ 
diff --git a/security/AiSSLtelnet/patches/patch-ac b/security/AiSSLtelnet/patches/patch-ac
new file mode 100644
index 00000000000..5eb78b6e28a
--- /dev/null
+++ b/security/AiSSLtelnet/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/03/25 15:23:40 taca Exp $
+
+--- configure.in.orig	2001-08-02 22:42:20.000000000 +0900
++++ configure.in
+@@ -236,7 +236,7 @@ AC_SUBST(LIBOBJS)dnl
+ AC_CHECK_FUNC(inet_ntoa, , [LIBOBJS="$LIBOBJS \$(top_srcdir)/lib/libbsd/inet_addr.o"])
+ AC_SUBST(LIBOBJS)dnl
+ 
+-AC_CHECK_FUNCS(localtime_r getrusage makeutx modutx updwtmpx)
++AC_CHECK_FUNCS(localtime_r getrusage makeutx modutx strerror updwtmpx)
+ 
+ dnl AC_FUNC_MEMCMP
+ dnl AC_TYPE_SIGNAL
diff --git a/security/AiSSLtelnet/patches/patch-ad b/security/AiSSLtelnet/patches/patch-ad
new file mode 100644
index 00000000000..c299b272023
--- /dev/null
+++ b/security/AiSSLtelnet/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/03/25 15:23:40 taca Exp $
+
+--- configure.orig	2001-08-02 22:42:20.000000000 +0900
++++ configure
+@@ -2401,7 +2401,7 @@ LIBOBJS="$LIBOBJS \$(top_srcdir)/lib/lib
+ fi
+ 
+ 
+-for ac_func in localtime_r getrusage makeutx modutx updwtmpx
++for ac_func in localtime_r getrusage makeutx modutx strerror updwtmpx
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:2408: checking for $ac_func" >&5
diff --git a/security/AiSSLtelnet/patches/patch-ae b/security/AiSSLtelnet/patches/patch-ae
new file mode 100644
index 00000000000..1783293d856
--- /dev/null
+++ b/security/AiSSLtelnet/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2004/03/25 15:23:40 taca Exp $
+
+--- lib/libbsd/strerror.c.orig	2001-08-02 22:42:43.000000000 +0900
++++ lib/libbsd/strerror.c
+@@ -35,6 +35,9 @@
+ static char sccsid[] = "@(#)strerror.c	5.6 (Berkeley) 5/4/91";
+ #endif /* LIBC_SCCS and not lint */
+ 
++#include "aiconfig.h"
++#ifndef HAVE_STRERROR
++
+ #include <string.h>
+ 
+ char *
+@@ -65,3 +68,4 @@ strerror(num)
+ 	}
+ 	return(ebuf);
+ }
++#endif
diff --git a/security/AiSSLtelnet/patches/patch-af b/security/AiSSLtelnet/patches/patch-af
new file mode 100644
index 00000000000..9e4fba9d624
--- /dev/null
+++ b/security/AiSSLtelnet/patches/patch-af
@@ -0,0 +1,43 @@
+$NetBSD: patch-af,v 1.1 2004/03/25 15:23:40 taca Exp $
+
+--- telnet/commands.c.orig	2001-08-02 22:42:45.000000000 +0900
++++ telnet/commands.c
+@@ -68,7 +68,7 @@ static char vcid[] = "$Id: commands.c,v 
+ #include <netdb.h>
+ #include <ctype.h>
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <errno.h>
+ 
+ #include <arpa/telnet.h>
+@@ -108,7 +108,9 @@ extern int isprefix();
+ extern char **genget();
+ extern int Ambiguous();
+ 
+-static int call();
++typedef int (*intrtn_t)();
++
++static int call(intrtn_t, ...);
+ 
+ typedef struct {
+ 	char	*name;		/* command name */
+@@ -2663,16 +2665,13 @@ static Command cmdtab2[] = {
+ 
+     /*VARARGS1*/
+     static int
+-call(va_alist)
+-    va_dcl
++call(intrtn_t routine, ...)
+ {
+     va_list ap;
+-    typedef int (*intrtn_t)();
+-    intrtn_t routine;
+     char *args[100];
+     int argno = 0;
+ 
+-    va_start(ap);
++    va_start(ap, routine);
+     routine = (va_arg(ap, intrtn_t));
+     while ((args[argno++] = va_arg(ap, char *)) != 0) {
+ 	;
diff --git a/security/AiSSLtelnet/patches/patch-ag b/security/AiSSLtelnet/patches/patch-ag
new file mode 100644
index 00000000000..2f69b16c3ed
--- /dev/null
+++ b/security/AiSSLtelnet/patches/patch-ag
@@ -0,0 +1,10 @@
+$NetBSD: patch-ag,v 1.1 2004/03/25 15:23:40 taca Exp $
+
+--- telnetd/telnetd.h.orig	2001-08-02 22:42:47.000000000 +0900
++++ telnetd/telnetd.h
+@@ -57,5 +57,3 @@ extern int debug;
+ 
+ /* other external variables */
+ extern	char **environ;
+-extern	int errno;
+-