Fix errno.

9 files changed, 95 insertions, 14 deletions

diff --git a/net/traceroute-as/distinfo b/net/traceroute-as/distinfo
index 60d7dbdd069..1880d7e33ec 100644
--- a/net/traceroute-as/distinfo
+++ b/net/traceroute-as/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:14:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/12/18 18:58:29 joerg Exp $
 
 SHA1 (traceroute_991603.tar.Z) = 84a66a5acc87ca74a74c7a091f288f0886d71d2e
 RMD160 (traceroute_991603.tar.Z) = 2b0eea1e0f91373f6554283436545766ace8115e
 Size (traceroute_991603.tar.Z) = 75111 bytes
 SHA1 (patch-aa) = 3370d57975369c049773e8fa1b31bbb5403c0dd9
+SHA1 (patch-ab) = ec3d5a3c76c7cad44fcc24e7855f8e607635aa63
+SHA1 (patch-ac) = 5e7ad798aaacc4198a84e0cf66c200150de12ba9
diff --git a/net/traceroute-as/patches/patch-ab b/net/traceroute-as/patches/patch-ab
new file mode 100644
index 00000000000..1afebce5fdc
--- /dev/null
+++ b/net/traceroute-as/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2005/12/18 18:58:29 joerg Exp $
+
+--- traceroute.c.orig	2005-12-18 18:53:05.000000000 +0000
++++ traceroute.c
+@@ -297,7 +297,6 @@ static char Version[] = "@(#)traceroute.
+ #define EXTERN extern
+ #endif
+ 
+-EXTERN int errno;
+ EXTERN res_state_t _res;	/* defined in res_init.c */
+ extern char *version;		/* program version number */
+ 
diff --git a/net/traceroute-as/patches/patch-ac b/net/traceroute-as/patches/patch-ac
new file mode 100644
index 00000000000..19c844c54e9
--- /dev/null
+++ b/net/traceroute-as/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/12/18 18:58:29 joerg Exp $
+
+--- aslookup.c.orig	2005-12-18 18:54:16.000000000 +0000
++++ aslookup.c
+@@ -49,7 +49,6 @@ static char Version[] = "@(#)aslookup.c	
+ #define EXTERN extern
+ #endif
+ 
+-EXTERN int errno;
+ EXTERN int h_errno;
+ extern char *version;		/* program version number */
+ 
diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index ffbf5e680a5..ab72f5ac65f 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/03/01 16:06:37 wiz Exp $
+$NetBSD: distinfo,v 1.14 2005/12/18 18:54:26 joerg Exp $
 
 SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
 RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd
@@ -17,6 +17,9 @@ SHA1 (patch-ae) = 9abb285c65bb3a764a838f22ee9bdc34371265e4
 SHA1 (patch-af) = 6f9fe289ea5af19ba4c85f63109e8e47e5b21bca
 SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d
 SHA1 (patch-ah) = a5305d6b9f8d3e1145e6951eaf37f0cdd5c98edc
-SHA1 (patch-ai) = 2c866946d003fe474c74a2c1b90b87953bd99902
+SHA1 (patch-ai) = f46979e05d7dcd8568833f56cd6add45fffbc323
 SHA1 (patch-aj) = 65eef2815b2364aaa243cb93ce4a99fdf2eb9f10
-SHA1 (patch-ak) = 6dd173ab0121859bcfa21858762bbad727e98f32
+SHA1 (patch-ak) = 8eca121c737498106a5e829cb166746436a87237
+SHA1 (patch-al) = b537901ac9e267a13247547d621215acd6595502
+SHA1 (patch-am) = 1b1cdf067382fce0cb6aa5e6ff605c15414b26ff
+SHA1 (patch-an) = fd1d50bd28b283df717c1ce5fe2f0d6f3eab4967
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index 51479800c02..8b8c95142cd 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
+$NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
 
---- src/ftpd.c.orig	Tue Sep 23 12:34:51 2003
+--- src/ftpd.c.orig	2005-12-18 18:41:46.000000000 +0000
 +++ src/ftpd.c
 @@ -75,6 +75,7 @@
  #include <grp.h>
@@ -20,7 +20,15 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
  
  #ifdef HAVE_SYS_SYSLOG_H
  #include <sys/syslog.h>
-@@ -2370,7 +2374,8 @@ void end_login(void)
+@@ -214,7 +218,6 @@ int Send(FILE *sockfp, char *format,...)
+ 
+ /* File containing login names NOT to be used on this machine. Commonly used
+  * to disallow uucp. */
+-extern int errno;
+ extern int pidfd;
+ 
+ extern char *ctime(const time_t *);
+@@ -2370,7 +2373,8 @@ void end_login(void)
      (void) seteuid((uid_t) 0);
      if (logged_in)
  	if (wtmp_logging)
@@ -30,7 +38,7 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
      pw = NULL;
  #ifdef AFS_AUTH
      ktc_ForgetAllTokens();
-@@ -2869,7 +2874,8 @@ void pass(char *passwd)
+@@ -2869,7 +2873,8 @@ void pass(char *passwd)
  #ifdef DEBUG
  	syslog(LOG_DEBUG, "about to call wtmp");
  #endif
@@ -40,7 +48,7 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
      }
      logged_in = 1;
  
-@@ -5459,7 +5465,9 @@ void reply(int n, char *fmt,...)
+@@ -5459,7 +5464,9 @@ void reply(int n, char *fmt,...)
  		*p = '\0';
  
  	    /* send a line...(note that this overrides dolreplies!) */
@@ -50,7 +58,7 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
  
  	    if (p)
  		ptr = p + 1;	/* set to the next line... (\0 is handled in the while) */
-@@ -6083,6 +6091,8 @@ void dologout(int status)
+@@ -6083,6 +6090,8 @@ void dologout(int status)
  	(void) seteuid((uid_t) 0);
  	if (wtmp_logging)
  	    wu_logwtmp(ttyline, pw->pw_name, remotehost, 0);
@@ -59,7 +67,7 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
      }
      if (logging)
  	syslog(LOG_INFO, "FTP session closed");
-@@ -7378,7 +7388,7 @@ int SockPrintf(FILE *sockfp, char *forma
+@@ -7378,7 +7387,7 @@ int SockPrintf(FILE *sockfp, char *forma
      char buf[32768];
  
      va_start(ap, format);
diff --git a/net/wu-ftpd/patches/patch-ak b/net/wu-ftpd/patches/patch-ak
index 0de0a228707..f185e0cfd2b 100644
--- a/net/wu-ftpd/patches/patch-ak
+++ b/net/wu-ftpd/patches/patch-ak
@@ -1,8 +1,16 @@
-$NetBSD: patch-ak,v 1.4 2005/03/01 16:06:37 wiz Exp $
+$NetBSD: patch-ak,v 1.5 2005/12/18 18:54:26 joerg Exp $
 
---- src/glob.c.orig	2001-11-29 18:01:38.000000000 +0100
+--- src/glob.c.orig	2001-11-29 17:01:38.000000000 +0000
 +++ src/glob.c
-@@ -437,6 +437,8 @@ static int amatch(char *s, char *p)
+@@ -88,7 +88,6 @@ char **blkcpy(char **, register char **)
+ 
+ char *globerr;
+ char *home;
+-extern int errno;
+ 
+ static int globcnt;
+ 
+@@ -437,6 +436,8 @@ static int amatch(char *s, char *p)
  	    continue;
  
  	case '*':
diff --git a/net/wu-ftpd/patches/patch-al b/net/wu-ftpd/patches/patch-al
new file mode 100644
index 00000000000..c67b69fb93e
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.7 2005/12/18 18:54:26 joerg Exp $
+
+--- support/ftw.c.orig	2005-12-18 18:43:08.000000000 +0000
++++ support/ftw.c
+@@ -55,7 +55,6 @@
+ 	(dp->d_name[0] == '.' && (!dp->d_name[1] || \
+ 	    (dp->d_name[1] == '.' && !dp->d_name[2])))
+ 
+-extern int errno;
+ static int g_fds, (*g_fn) (), g_opts;
+ static char *bp;
+ 
diff --git a/net/wu-ftpd/patches/patch-am b/net/wu-ftpd/patches/patch-am
new file mode 100644
index 00000000000..5bf6bad1fa3
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.6 2005/12/18 18:54:26 joerg Exp $
+
+--- src/ftpcmd.y.orig	2005-12-18 18:44:25.000000000 +0000
++++ src/ftpcmd.y
+@@ -87,7 +87,6 @@ extern int usedefault;
+ extern int transflag;
+ extern char tmpline[];
+ extern int data;
+-extern int errno;
+ extern char *home;
+ 
+ off_t restart_point;
diff --git a/net/wu-ftpd/patches/patch-an b/net/wu-ftpd/patches/patch-an
new file mode 100644
index 00000000000..80044f43e85
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.4 2005/12/18 18:54:26 joerg Exp $
+
+--- src/routevector.c.orig	2005-12-18 18:48:05.000000000 +0000
++++ src/routevector.c
+@@ -88,7 +88,6 @@ extern char hostname[], remotehost[];
+ extern int usedefault;
+ extern int transflag;
+ extern int data;
+-extern int errno;
+ #ifndef MAXHOSTNAMELEN
+ #define MAXHOSTNAMELEN 64
+ #endif