Fix errno. Force USE_TERMIO on DragonFly.

Hide ut assignment in utmp.c (patch-aj), it doesn't exist at least in the
code path DragonFly is taking.

14 files changed, 207 insertions, 9 deletions

diff --git a/security/srp_client/distinfo b/security/srp_client/distinfo
index 7caf618dfc5..f6111be58ee 100644
--- a/security/srp_client/distinfo
+++ b/security/srp_client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/05/09 19:24:24 joerg Exp $
 
 SHA1 (srp-1.4.4.tar.gz) = 56b8b3c29bee2b995b74acb5303dab326265f9b3
 RMD160 (srp-1.4.4.tar.gz) = b55cc6c8c0128d1ad49e4a553a696f59fcf838df
@@ -11,4 +11,17 @@ SHA1 (patch-af) = 4a5d21b667f39cfba61478614f4497710463aa06
 SHA1 (patch-ag) = 81eff66b05d11a943e9b66b9e31904d612eca449
 SHA1 (patch-ah) = 914544e6a2ae6c07be03ac8c5c46f9d996e8f3a5
 SHA1 (patch-ai) = ea2f81385d83b36f12ff2a63fc8b9cc9aad68674
-SHA1 (patch-aj) = 2ed42858ea22ef3c83f8ddf53c927f178e4d036a
+SHA1 (patch-aj) = b35e5bd9978636beec36c3d0f96f677ca55284f7
+SHA1 (patch-ak) = 6d54c4826a9c58c779c6db13c31439fa95237dd7
+SHA1 (patch-al) = 175abe5a1d8c1f25927d9eac27137f33d3c000d4
+SHA1 (patch-am) = 5bd30758e27b9e64c08c2b8842c38ca527561184
+SHA1 (patch-an) = 421d3a81506430d28ee3e488857039db8da6e763
+SHA1 (patch-ao) = 9a94713f9e1b737b0d7fe5d249d2cb56e0290e1d
+SHA1 (patch-ap) = 8ae5263217a001e526c727aaee86fb0116382efc
+SHA1 (patch-aq) = 8e4ed900c6558b3fa1177579f06a74f8a813bb7a
+SHA1 (patch-ar) = 81ae924913581f4198e6b63d453c7013691bc866
+SHA1 (patch-as) = b82c64d0e3bfe453b81767c23c07c1dc5841cd96
+SHA1 (patch-at) = 1663ffd586dd1725d59cbf183ccaf2ac9aeb8fa9
+SHA1 (patch-au) = c51a86bac05e36ad355948fdade15830e7ee69c2
+SHA1 (patch-av) = bd368355cbc00aeea3c5649a7a156a881e3b26c1
+SHA1 (patch-aw) = 17674291767be7c1120c706e1f938e6669e69383
diff --git a/security/srp_client/patches/patch-aj b/security/srp_client/patches/patch-aj
index 21af451fc9b..8b69530ae2a 100644
--- a/security/srp_client/patches/patch-aj
+++ b/security/srp_client/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $
+$NetBSD: patch-aj,v 1.3 2006/05/09 19:24:24 joerg Exp $
 
 --- base/libmisc/utmp.c.orig	1998-12-10 14:43:22.000000000 +1300
 +++ base/libmisc/utmp.c
@@ -15,16 +15,18 @@ $NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $
  #include <fcntl.h>
  #include <stdio.h>
  
-@@ -93,6 +99,8 @@ checkutmp (picky)
+@@ -93,6 +99,10 @@ checkutmp (picky)
  #endif
  #endif
  
++#ifdef LOGIN_PROCESS /* USG */
 +	ut = NULL;
++#endif
 +
  #if HAVE_UTMPX_H
  	setutxent ();
  #endif
-@@ -141,17 +149,21 @@ checkutmp (picky)
+@@ -141,17 +151,21 @@ checkutmp (picky)
  		if (utx)
  			utxent = *utx;
  #endif
@@ -46,7 +48,7 @@ $NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $
  
  		if (!ut) {
   			puts(NO_UTENT);
-@@ -188,6 +200,7 @@ checkutmp (picky)
+@@ -188,6 +202,7 @@ checkutmp (picky)
  		if (strncmp(line, "/dev/", 5) == 0)
  			line += 5;
  
@@ -54,7 +56,7 @@ $NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd 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 +219,7 @@ checkutmp (picky)
+@@ -206,6 +221,7 @@ checkutmp (picky)
  		gettimeofday((struct timeval *) &utxent.ut_tv, NULL);
  		utent.ut_time = utxent.ut_tv.tv_sec;
  #endif
@@ -62,7 +64,7 @@ $NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $
  	}
  #else	/* !USG */
  
-@@ -283,6 +297,7 @@ setutmp (name, line)
+@@ -283,6 +299,7 @@ setutmp (name, line)
  			break;
  		}
  	}
@@ -70,7 +72,7 @@ $NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $
  	while (utmp = getutent ()) {
  		if (utmp->ut_pid == pid) {
  			found_utmp = 1;
-@@ -357,6 +372,7 @@ setutmp (name, line)
+@@ -357,6 +374,7 @@ setutmp (name, line)
  
  	utxent = utxline;
  	utent = utline;
diff --git a/security/srp_client/patches/patch-ak b/security/srp_client/patches/patch-ak
new file mode 100644
index 00000000000..87d18421b48
--- /dev/null
+++ b/security/srp_client/patches/patch-ak
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- libsrp/srptest.c.orig	2006-01-20 00:06:08.000000000 +0000
++++ libsrp/srptest.c
+@@ -20,13 +20,12 @@
+  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include "t_defines.h"
+ #include "t_pwd.h"
+ #include "t_sha.h"
+ 
+-extern int errno;
+-
+ main(argc, argv)
+      int argc;
+      char **argv;
diff --git a/security/srp_client/patches/patch-al b/security/srp_client/patches/patch-al
new file mode 100644
index 00000000000..f6f22d215e0
--- /dev/null
+++ b/security/srp_client/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/lib/port.c.orig	2006-01-20 00:09:03.000000000 +0000
++++ base/lib/port.c
+@@ -38,8 +38,6 @@ RCSID("$Id: port.c,v 1.2 1997/05/01 23:1
+ #include "defines.h"
+ #include "port.h"
+ 
+-extern	int	errno;
+-
+ static	FILE	*ports;
+ 
+ /*
diff --git a/security/srp_client/patches/patch-am b/security/srp_client/patches/patch-am
new file mode 100644
index 00000000000..aa2df1f9202
--- /dev/null
+++ b/security/srp_client/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/login_access.c.orig	2006-01-20 00:09:42.000000000 +0000
++++ base/libmisc/login_access.c
+@@ -42,7 +42,6 @@ RCSID("$Id: login_access.c,v 1.2 1997/05
+ #include <stdlib.h>
+ 
+ extern struct group *getgrnam();
+-extern int errno;
+ 
+ #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64)
+ #undef MAXHOSTNAMELEN
diff --git a/security/srp_client/patches/patch-an b/security/srp_client/patches/patch-an
new file mode 100644
index 00000000000..2db3fa76e4d
--- /dev/null
+++ b/security/srp_client/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/xmalloc.c.orig	2006-05-09 18:10:57.000000000 +0000
++++ base/libmisc/xmalloc.c
+@@ -16,8 +16,6 @@ RCSID("$Id: xmalloc.c,v 1.1.1.1 1996/08/
+ 
+ #include "defines.h"
+ 
+-extern char *malloc();
+-
+ char *
+ xmalloc(size)
+ 	unsigned size;
diff --git a/security/srp_client/patches/patch-ao b/security/srp_client/patches/patch-ao
new file mode 100644
index 00000000000..b16645d0c96
--- /dev/null
+++ b/security/srp_client/patches/patch-ao
@@ -0,0 +1,20 @@
+$NetBSD: patch-ao,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/chowntty.c.orig	2006-05-09 18:12:33.000000000 +0000
++++ base/libmisc/chowntty.c
+@@ -35,6 +35,7 @@ RCSID("$Id: chowntty.c,v 1.3 1997/05/01 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include <grp.h>
+ 
+@@ -72,7 +73,6 @@ chown_tty(tty, info)
+ 	const char *tty;
+ 	const struct passwd *info;
+ {
+-	extern	int	errno;
+ 	char	buf[BUFSIZ];
+ 	char	*group;		/* TTY group name or number */
+ 	struct	group	*grent;
diff --git a/security/srp_client/patches/patch-ap b/security/srp_client/patches/patch-ap
new file mode 100644
index 00000000000..eb4ae61d277
--- /dev/null
+++ b/security/srp_client/patches/patch-ap
@@ -0,0 +1,21 @@
+$NetBSD: patch-ap,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/src/tconf.c.orig	2006-05-09 18:13:46.000000000 +0000
++++ base/src/tconf.c
+@@ -20,6 +20,7 @@
+  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <errno.h>
+ #include <unistd.h>	/* close getlogin */
+ #include <stdlib.h>	/* atexit exit */
+ #include <stdio.h>
+@@ -33,8 +34,6 @@
+ extern int  optind;
+ extern char *optarg;
+ 
+-extern int errno;
+-
+ struct pre_struct {
+   char * pre_mod;
+   char * pre_gen;
diff --git a/security/srp_client/patches/patch-aq b/security/srp_client/patches/patch-aq
new file mode 100644
index 00000000000..bf9f94c7a84
--- /dev/null
+++ b/security/srp_client/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- telnet/libtelnet/read_password.c.orig	2006-05-09 18:56:06.000000000 +0000
++++ telnet/libtelnet/read_password.c
+@@ -52,6 +52,10 @@ static char sccsid[] = "@(#)read_passwor
+ 
+ #if	defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) || defined(SRP)
+ 
++#if defined(__DragonFly__)
++#define USE_TERMIO 1
++#endif
++
+ #include <stdio.h>
+ #include <strings.h>
+ #include <sys/ioctl.h>
diff --git a/security/srp_client/patches/patch-ar b/security/srp_client/patches/patch-ar
new file mode 100644
index 00000000000..fd8e1100f18
--- /dev/null
+++ b/security/srp_client/patches/patch-ar
@@ -0,0 +1,24 @@
+$NetBSD: patch-ar,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- telnet/telnet/externs.h.orig	2006-05-09 18:56:33.000000000 +0000
++++ telnet/telnet/externs.h
+@@ -45,7 +45,7 @@
+ #endif
+ 
+ #ifndef	USE_TERMIO
+-# if BSD > 43 || defined(SYSV_TERMIO)
++# if BSD > 43 || defined(SYSV_TERMIO) || defined(__DragonFly__)
+ #  define USE_TERMIO
+ # endif
+ #endif
+@@ -100,10 +100,6 @@ typedef unsigned char cc_t;
+ 
+ #define	SUBBUFSIZE	576
+ 
+-#ifndef CRAY
+-extern int errno;		/* outside this world */
+-#endif /* !CRAY */
+-
+ #if	!defined(P)
+ # ifdef	__STDC__
+ #  define	P(x)	x
diff --git a/security/srp_client/patches/patch-as b/security/srp_client/patches/patch-as
new file mode 100644
index 00000000000..6d4e1e61717
--- /dev/null
+++ b/security/srp_client/patches/patch-as
@@ -0,0 +1,10 @@
+$NetBSD: patch-as,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- telnet/telnetd/telnetd.h.orig	2006-05-09 18:59:33.000000000 +0000
++++ telnet/telnetd/telnetd.h
+@@ -45,5 +45,4 @@
+ 
+ /* other external variables */
+ extern	char **environ;
+-extern	int errno;
+ 
diff --git a/security/srp_client/patches/patch-at b/security/srp_client/patches/patch-at
new file mode 100644
index 00000000000..b82a62baccd
--- /dev/null
+++ b/security/srp_client/patches/patch-at
@@ -0,0 +1,12 @@
+$NetBSD: patch-at,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- ftp/ftp/ftp_var.h.orig	2006-05-09 19:00:49.000000000 +0000
++++ ftp/ftp/ftp_var.h
+@@ -131,7 +131,6 @@ extern char macbuf[4096];
+ 
+ extern	char *tail();
+ extern	char *remglob();
+-extern	int errno;
+ extern	char *mktemp();
+ 
+ #if (defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS))) || defined(HAVE_STDARG_H)
diff --git a/security/srp_client/patches/patch-au b/security/srp_client/patches/patch-au
new file mode 100644
index 00000000000..b2d319f202c
--- /dev/null
+++ b/security/srp_client/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- ftp/ftp/glob.c.orig	2006-05-09 19:03:06.000000000 +0000
++++ ftp/ftp/glob.c
+@@ -76,7 +76,6 @@ static	int tglob();
+ char	**ftpglob();
+ char	*globerr;
+ char	*home;
+-extern	int errno;
+ static	char *strspl(), *strend();
+ char	**copyblk();
+ 
diff --git a/security/srp_client/patches/patch-av b/security/srp_client/patches/patch-av
new file mode 100644
index 00000000000..7b86cf6c499
--- /dev/null
+++ b/security/srp_client/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- ftp/ftpd/ftpd.c.orig	2006-05-09 19:09:46.000000000 +0000
++++ ftp/ftpd/ftpd.c
+@@ -152,7 +152,6 @@ static char *temp_auth_type;
+  * NOT to be used on this machine.
+  * Commonly used to disallow uucp.
+  */
+-extern	int errno;
+ extern	char *crypt();
+ extern	char version[];
+ extern	char *home;		/* pointer to home directory for glob */