Fix build on Solaris. From Jonathan Perkin in PR 22904.

3 files changed, 34 insertions, 11 deletions

diff --git a/sysutils/tcx/distinfo b/sysutils/tcx/distinfo
index 8cdbfe698a3..2b9b9f5ddf4 100644
--- a/sysutils/tcx/distinfo
+++ b/sysutils/tcx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+$NetBSD: distinfo,v 1.2 2003/09/23 08:46:45 wiz Exp $
 
 SHA1 (tcx-linux.tar.gz) = 73c112fc39cbfb794fe0f6b0d2e15739ee1c9f5a
 Size (tcx-linux.tar.gz) = 21028 bytes
 SHA1 (patch-aa) = 2e03b68d4c4ed05757fe788649eede461a11a4e5
 SHA1 (patch-ab) = 5e7e7247783090e3029504f80440b6faebe1d1dd
-SHA1 (patch-ac) = 9a285e8365a3e0151fd37e2bf86ee8c346599e3b
-SHA1 (patch-ad) = 5ba81fcec1e674054c532fc3c70a8a6d8f17c350
+SHA1 (patch-ac) = df9ef3447b471085b15f37ed0f9c0a58375a4e8d
+SHA1 (patch-ad) = b77a957357f65f33fc8e64377ac12568f078eeb6
diff --git a/sysutils/tcx/patches/patch-ac b/sysutils/tcx/patches/patch-ac
index 2ce1e46145f..886240b9816 100644
--- a/sysutils/tcx/patches/patch-ac
+++ b/sysutils/tcx/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+$NetBSD: patch-ac,v 1.2 2003/09/23 08:46:46 wiz Exp $
 
 Minor security audit - the world has moved on since 1994.
 
---- untcx.c	2003/06/20 07:59:56	1.1
-+++ untcx.c	2003/06/20 08:09:26
+--- untcx.c.orig	Sun Jan  9 22:47:53 1994
++++ untcx.c	Tue Sep 23 09:22:19 2003
 @@ -166,9 +166,9 @@
  
  	/* Set global paths */
@@ -17,7 +17,7 @@ Minor security audit - the world has moved on since 1994.
  
  	/* Check and start tcxd as required */
  
-@@ -185,16 +185,16 @@
+@@ -185,7 +185,7 @@
  
  	/* Grab argv[0] and resolve to full path name via getwd() */
  
@@ -26,6 +26,7 @@ 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] == '/')
@@ -123,7 +124,7 @@ Minor security audit - the world has moved on since 1994.
  	(void)write(lkfd, spid, strlen(spid));
  
  #ifdef UNPACK_IN_PLACE
-@@ -810,30 +810,30 @@
+@@ -810,22 +810,22 @@
  
  	/* resolve first stage of argv[0] */
  
@@ -151,6 +152,7 @@ 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);
@@ -170,3 +172,12 @@ 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 @@
+ dodecode(int infd, int outfd)
+ {
+ int	pid;
+-#if defined(IRIX) || defined(AIX)
++#if defined(IRIX) || defined(AIX) || defined(sun)
+ int	status;
+ #else
+ union wait status;
diff --git a/sysutils/tcx/patches/patch-ad b/sysutils/tcx/patches/patch-ad
index 489002cfcd5..733c9bb593b 100644
--- a/sysutils/tcx/patches/patch-ad
+++ b/sysutils/tcx/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+$NetBSD: patch-ad,v 1.2 2003/09/23 08:46:46 wiz Exp $
 
 Minor security audit
 
---- tcx.c	2003/06/20 10:44:29	1.1
-+++ tcx.c	2003/06/20 10:45:54
+--- tcx.c.orig	Mon Dec 27 03:25:17 1993
++++ tcx.c	Tue Sep 23 09:24:12 2003
 @@ -120,16 +120,16 @@
  	/* If cannot, warn user and quit */
  
@@ -34,3 +34,15 @@ 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 @@
+ doencode(int infd, int outfd)
+ {
+ int	pid;
++#if defined(sun)
++int	status;
++#else
+ union	wait	status;
++#endif
+ 
+ 	pid = fork();
+ 	if(pid < 0) return -1;