Depend on errno.h included from config.h to provide errno.

3 files changed, 45 insertions, 31 deletions

diff --git a/sysutils/tcx/distinfo b/sysutils/tcx/distinfo
index 09fb0dad9b3..828ad81f3d4 100644
--- a/sysutils/tcx/distinfo
+++ b/sysutils/tcx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:58 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/10 16:30:04 joerg Exp $
 
 SHA1 (tcx-linux.tar.gz) = 73c112fc39cbfb794fe0f6b0d2e15739ee1c9f5a
 RMD160 (tcx-linux.tar.gz) = e331acb338582391909d39fbe69f252370b81abc
 Size (tcx-linux.tar.gz) = 21028 bytes
 SHA1 (patch-aa) = 2e03b68d4c4ed05757fe788649eede461a11a4e5
 SHA1 (patch-ab) = 5e7e7247783090e3029504f80440b6faebe1d1dd
-SHA1 (patch-ac) = df9ef3447b471085b15f37ed0f9c0a58375a4e8d
-SHA1 (patch-ad) = b77a957357f65f33fc8e64377ac12568f078eeb6
+SHA1 (patch-ac) = 793c6dc9d706cf8ccf3bbed6f5c285661b104241
+SHA1 (patch-ad) = 5d78624ca3bad845bc952dc09cb802bf6dc30131
diff --git a/sysutils/tcx/patches/patch-ac b/sysutils/tcx/patches/patch-ac
index 886240b9816..a6302b18230 100644
--- a/sysutils/tcx/patches/patch-ac
+++ b/sysutils/tcx/patches/patch-ac
@@ -1,10 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2003/09/23 08:46:46 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2005/11/10 16:30:04 joerg Exp $
 
-Minor security audit - the world has moved on since 1994.
-
---- untcx.c.orig	Sun Jan  9 22:47:53 1994
-+++ untcx.c	Tue Sep 23 09:22:19 2003
-@@ -166,9 +166,9 @@
+--- untcx.c.orig	1994-01-09 22:47:53.000000000 +0000
++++ untcx.c
+@@ -48,7 +48,6 @@ pstat	*pihash[MAXOPENFILES];
+ void	update_pstat_info();
+ #endif
+ 
+-extern	int	errno;
+ path	*worklist = NULL, *freelist = NULL;
+ 
+ 
+@@ -166,9 +165,9 @@ int	local;
  
  	/* Set global paths */
  
@@ -17,7 +23,7 @@ Minor security audit - the world has moved on since 1994.
  
  	/* Check and start tcxd as required */
  
-@@ -185,7 +185,7 @@
+@@ -185,16 +184,16 @@ int	local;
  
  	/* Grab argv[0] and resolve to full path name via getwd() */
  
@@ -26,7 +32,6 @@ Minor security audit - the world has moved on since 1994.
  	{
  		(void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
  		exit(-1);
-@@ -192,9 +192,9 @@
  	}
  
  	if(*argv[0] == '/')
@@ -38,7 +43,7 @@ Minor security audit - the world has moved on since 1994.
  	for(;;)
  	{
  		if((c = strrchr(realdir, '/')) == NULL)
-@@ -203,7 +203,7 @@
+@@ -203,7 +202,7 @@ int	local;
  			exit(-1);
  		}
  		c++;
@@ -47,7 +52,7 @@ Minor security audit - the world has moved on since 1994.
  		*c = '\0';
  
  		if(chdir(realdir) < 0)	/* Oops. Failed. Report and quit. */
-@@ -212,7 +212,7 @@
+@@ -212,7 +211,7 @@ int	local;
  			exit(-1);
  		}
  
@@ -56,7 +61,7 @@ Minor security audit - the world has moved on since 1994.
  		{
  			(void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
  			exit(-1);
-@@ -238,11 +238,11 @@
+@@ -238,11 +237,11 @@ int	local;
  			}
  			execpath[len] = '\0';
  			if(execpath[0] == '/')
@@ -71,7 +76,7 @@ Minor security audit - the world has moved on since 1994.
  			}
  			continue;
  		}
-@@ -291,8 +291,8 @@
+@@ -291,8 +290,8 @@ int	local;
  #else
  		if(setreuid(getuid(), getuid()) < 0) { perror("setreuid"); exit(-1); }
  #endif
@@ -82,7 +87,7 @@ Minor security audit - the world has moved on since 1994.
  		just_untcx(tcxtarg, untcxtmp);
  		exit(0);
  	}
-@@ -302,8 +302,8 @@
+@@ -302,8 +301,8 @@ int	local;
  
  	if(local)
  	{
@@ -93,7 +98,7 @@ Minor security audit - the world has moved on since 1994.
  		untcx_and_exec_local(tcxtarg, untcxtmp, &(argv[1]));
  	}
  #endif
-@@ -315,7 +315,7 @@
+@@ -315,7 +314,7 @@ int	local;
  	for(c = realdir; *c ; c++)
  		if(*c == '/')
  			*c = '=';
@@ -102,7 +107,7 @@ Minor security audit - the world has moved on since 1994.
  	if(mkdir(tcxtarg, 0777) < 0)
  		if(errno != EEXIST)
  		{
-@@ -323,9 +323,9 @@
+@@ -323,9 +322,9 @@ int	local;
  			exit(-1);
  		}
  	(void)chmod(tcxtarg, 0777);
@@ -115,7 +120,7 @@ Minor security audit - the world has moved on since 1994.
  
  	untcx_and_exec_nfs(argv[0], untcxtmp, tcxtarg, &(argv[1]));
  
-@@ -415,7 +415,7 @@
+@@ -415,7 +414,7 @@ int	lastoff;
  
  	/* Write our process id to the lock file. Don't really care if fails. */
  
@@ -124,7 +129,7 @@ Minor security audit - the world has moved on since 1994.
  	(void)write(lkfd, spid, strlen(spid));
  
  #ifdef UNPACK_IN_PLACE
-@@ -810,22 +810,22 @@
+@@ -810,30 +809,30 @@ int	len;
  
  	/* resolve first stage of argv[0] */
  
@@ -152,7 +157,6 @@ Minor security audit - the world has moved on since 1994.
  	if(mkdir(linkpath, 0777) < 0)
  	{
  		if(errno != EEXIST) { perror(linkpath); exit(-1); }
-@@ -832,8 +832,8 @@
  	}
  	else
  		(void)chmod(linkpath, 0777);
@@ -163,7 +167,7 @@ Minor security audit - the world has moved on since 1994.
  
  	if(chdir(cwd) < 0) { perror(cwd); exit(-1); }
  	
-@@ -1244,7 +1244,7 @@
+@@ -1244,7 +1243,7 @@ struct	stat	sb;
  			if((curr = (path *)malloc(sizeof(path))) == NULL)
  				continue;
  
@@ -172,7 +176,7 @@ Minor security audit - the world has moved on since 1994.
  #ifdef UNPACK_IN_PLACE
  		curr->pid = -1;
  		(strstr(newpath, ENFSDIR) == newpath) ? (curr->local = 0) : (curr->local = 1);
-@@ -1313,7 +1313,7 @@
+@@ -1313,7 +1312,7 @@ int
  dodecode(int infd, int outfd)
  {
  int	pid;
diff --git a/sysutils/tcx/patches/patch-ad b/sysutils/tcx/patches/patch-ad
index 733c9bb593b..b347c8cf0db 100644
--- a/sysutils/tcx/patches/patch-ad
+++ b/sysutils/tcx/patches/patch-ad
@@ -1,10 +1,20 @@
-$NetBSD: patch-ad,v 1.2 2003/09/23 08:46:46 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2005/11/10 16:30:04 joerg Exp $
 
-Minor security audit
-
---- tcx.c.orig	Mon Dec 27 03:25:17 1993
-+++ tcx.c	Tue Sep 23 09:24:12 2003
-@@ -120,16 +120,16 @@
+--- tcx.c.orig	1993-12-27 03:25:17.000000000 +0000
++++ tcx.c
+@@ -17,11 +17,8 @@
+ /*  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		*/
+ /************************************************************************/
+ 
+-
+ #include	"config.h"
+ 
+-extern	int	errno;
+-
+ int	main(int, char *[]);
+ int	is_tcx(int);
+ int	doencode(int, int);
+@@ -120,16 +117,16 @@ int	islocal;
  	/* If cannot, warn user and quit */
  
  	if(strrchr(argv[1], '/') == NULL)
@@ -25,7 +35,7 @@ Minor security audit
  	}
  
  	lck.l_type = F_WRLCK; lck.l_whence = 0; lck.l_start = 0; lck.l_len = 0;
-@@ -213,7 +213,7 @@
+@@ -213,7 +210,7 @@ int	islocal;
  
  	/* Spit out header and start encoding executable */
  
@@ -34,7 +44,7 @@ Minor security audit
  	if(write(outfd, header, strlen(header)) < 0) { (void)perror("write"); exit(-1); }
  
  	c = 0;	if((write(outfd, &c, 1)) < 0) { (void)perror("write"); exit(-1); }
-@@ -291,7 +291,11 @@
+@@ -291,7 +288,11 @@ int
  doencode(int infd, int outfd)
  {
  int	pid;