varargs -> stdarg

Don't try and use getutent() on NetBSD's that have utmpx
Fixes problems seen in bulkbuild.

4 files changed, 72 insertions, 20 deletions

diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index ee021c5c94d..cabab84b3dd 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/04/26 04:37:38 snj Exp $
+# $NetBSD: Makefile,v 1.28 2004/09/08 14:30:00 markd Exp $
 
 DISTNAME=		srp-1.4.4
 PKGNAME=		srp-client-1.4.4
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--with-krb4
 
 SED_PATTERN=	-e "s,include/kerberos,include/kerberosIV,"
 .if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == ""
-SED_PATTERN+=	-e "s,-ldes,-ldes -lroken -lcom_err,"
+SED_PATTERN+=	-e "s,-ldes,-ldes -lroken -lcom_err -lcrypt,"
 .else
 SED_PATTERN+=	-e "s,-ldes,-ldes -lcom_err,"
 .endif
diff --git a/security/srp_client/distinfo b/security/srp_client/distinfo
index d9680d260bf..075914cd803 100644
--- a/security/srp_client/distinfo
+++ b/security/srp_client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2002/10/02 22:19:47 wiz Exp $
+$NetBSD: distinfo,v 1.6 2004/09/08 14:30:00 markd Exp $
 
 SHA1 (srp-1.4.4.tar.gz) = 56b8b3c29bee2b995b74acb5303dab326265f9b3
 Size (srp-1.4.4.tar.gz) = 1183636 bytes
 SHA1 (patch-aa) = fefb8a7540c3c7e91b6c407a463a39bef948e0c8
 SHA1 (patch-ab) = cba14830f3dcae42c814d9ccb19cbdb5464eabb0
-SHA1 (patch-ac) = 1d5d56753ad45361351833b951bf7d1f82575955
+SHA1 (patch-ac) = e36400de37b9b8c7f641cdbe44a46253e65a081d
 SHA1 (patch-ad) = d9869838822ab8d43c10dd1d8242f9ee49f857d7
 SHA1 (patch-af) = 4a5d21b667f39cfba61478614f4497710463aa06
 SHA1 (patch-ag) = 81eff66b05d11a943e9b66b9e31904d612eca449
 SHA1 (patch-ah) = 914544e6a2ae6c07be03ac8c5c46f9d996e8f3a5
 SHA1 (patch-ai) = ea2f81385d83b36f12ff2a63fc8b9cc9aad68674
-SHA1 (patch-aj) = aa24ee27daeb0b2cb4e300c84f8902fbba6e41c4
+SHA1 (patch-aj) = 2ed42858ea22ef3c83f8ddf53c927f178e4d036a
diff --git a/security/srp_client/patches/patch-ac b/security/srp_client/patches/patch-ac
index aaddb1d61a7..9c5eb021b3c 100644
--- a/security/srp_client/patches/patch-ac
+++ b/security/srp_client/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/06/18 19:18:18 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2004/09/08 14:30:00 markd Exp $
 
 Rename setmode (and clearmode for consistency) to avoid clash with unistd.h.
 
---- telnet/telnet/commands.c.orig	Thu Dec 10 17:50:48 1998
-+++ telnet/telnet/commands.c	Fri Jun 18 06:59:32 1999
-@@ -64,6 +64,7 @@
+--- telnet/telnet/commands.c.orig	1998-12-11 11:50:48.000000000 +1300
++++ telnet/telnet/commands.c
+@@ -64,11 +64,12 @@ static char sccsid[] = "@(#)commands.c	8
  #include <fcntl.h>
  #endif	/* CRAY */
  
@@ -12,7 +12,23 @@ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h.
  #include <signal.h>
  #include <netdb.h>
  #include <ctype.h>
-@@ -1156,13 +1157,13 @@
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <errno.h>
+ 
+ #include <arpa/telnet.h>
+@@ -110,7 +111,8 @@ extern int isprefix();
+ extern char **genget();
+ extern int Ambiguous();
+ 
+-static call();
++typedef int (*intrtn_t) __P((int, char *[]));
++static call(intrtn_t, ...);
+ 
+ typedef struct {
+ 	char	*name;		/* command name */
+@@ -1156,13 +1158,13 @@ dolmmode(bit, on)
  }
  
      int
@@ -28,7 +44,7 @@ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h.
  {
      return dolmmode(bit, 0);
  }
-@@ -1188,18 +1189,18 @@
+@@ -1188,18 +1190,18 @@ static struct modelist ModeList[] = {
  #endif
      { "", "", 0 },
      { "",	"These require the LINEMODE option to be enabled", 0 },
@@ -59,3 +75,26 @@ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h.
      { "help",	0,				modehelp, 0 },
  #ifdef	KLUDGELINEMODE
      { "kludgeline", 0,				dokludgemode, 1 },
+@@ -2607,19 +2609,14 @@ static Command cmdtab2[] = {
+  * Call routine with argc, argv set from args (terminated by 0).
+  */
+ 
+-    /*VARARGS1*/
+-    static
+-call(va_alist)
+-    va_dcl
++static int
++call(intrtn_t routine, ...)
+ {
+     va_list ap;
+-    typedef int (*intrtn_t)();
+-    intrtn_t routine;
+     char *args[100];
+     int argno = 0;
+ 
+-    va_start(ap);
+-    routine = (va_arg(ap, intrtn_t));
++    va_start(ap, routine);
+     while ((args[argno++] = va_arg(ap, char *)) != 0) {
+ 	;
+     }
diff --git a/security/srp_client/patches/patch-aj b/security/srp_client/patches/patch-aj
index bc0f33174f8..21af451fc9b 100644
--- a/security/srp_client/patches/patch-aj
+++ b/security/srp_client/patches/patch-aj
@@ -1,8 +1,21 @@
-$NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $
+$NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $
 
---- base/libmisc/utmp.c	2002/08/19 08:56:57	1.1
-+++ base/libmisc/utmp.c	2002/08/19 09:02:40
-@@ -93,6 +93,8 @@
+--- base/libmisc/utmp.c.orig	1998-12-10 14:43:22.000000000 +1300
++++ base/libmisc/utmp.c
+@@ -37,6 +37,12 @@
+ #include <utmpx.h>
+ #endif
+ 
++#if HAVE_UTMPX_H && defined(__NetBSD__)
++#undef HAVE_SETUTENT
++#undef HAVE_GETUTENT
++#undef HAVE_ENDUTENT
++#endif
++
+ #include <fcntl.h>
+ #include <stdio.h>
+ 
+@@ -93,6 +99,8 @@ checkutmp (picky)
  #endif
  #endif
  
@@ -11,7 +24,7 @@ $NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $
  #if HAVE_UTMPX_H
  	setutxent ();
  #endif
-@@ -141,17 +143,21 @@
+@@ -141,17 +149,21 @@ checkutmp (picky)
  		if (utx)
  			utxent = *utx;
  #endif
@@ -33,7 +46,7 @@ $NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $
  
  		if (!ut) {
   			puts(NO_UTENT);
-@@ -188,6 +194,7 @@
+@@ -188,6 +200,7 @@ checkutmp (picky)
  		if (strncmp(line, "/dev/", 5) == 0)
  			line += 5;
  
@@ -41,7 +54,7 @@ $NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $
   		strncpy (utent.ut_line, line, sizeof utent.ut_line);
  		if ((ut = getutline(&utent)))
   			strncpy(utent.ut_id, ut->ut_id, sizeof ut->ut_id);
-@@ -206,6 +213,7 @@
+@@ -206,6 +219,7 @@ checkutmp (picky)
  		gettimeofday((struct timeval *) &utxent.ut_tv, NULL);
  		utent.ut_time = utxent.ut_tv.tv_sec;
  #endif
@@ -49,7 +62,7 @@ $NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $
  	}
  #else	/* !USG */
  
-@@ -283,6 +291,7 @@
+@@ -283,6 +297,7 @@ setutmp (name, line)
  			break;
  		}
  	}
@@ -57,7 +70,7 @@ $NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $
  	while (utmp = getutent ()) {
  		if (utmp->ut_pid == pid) {
  			found_utmp = 1;
-@@ -357,6 +366,7 @@
+@@ -357,6 +372,7 @@ setutmp (name, line)
  
  	utxent = utxline;
  	utent = utline;