From 7334e5c303799bfe61dbef900f9b8d188a0357c3 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Mon, 31 May 1999 04:47:02 +0000
Subject: Fix build on Alpha.

---
 net/sup/files/patch-aa | 20 +++++++++++++++-----
 net/sup/files/patch-ab | 20 ++++++++++++++++----
 net/sup/files/patch-ac | 27 ++++++++++++++++++++++-----
 3 files changed, 53 insertions(+), 14 deletions(-)

(limited to 'net')

diff --git a/net/sup/files/patch-aa b/net/sup/files/patch-aa
index 751e69ba0188..70e49e6f50ff 100644
--- a/net/sup/files/patch-aa
+++ b/net/sup/files/patch-aa
@@ -1318,10 +1318,20 @@ diff -c /var/tmp/sup/sup.h sup/sup.h
   /* version 3 compatability */
 diff -c /var/tmp/sup/supcdefs.h sup/supcdefs.h
 *** supcdefs.h	Thu Aug 11 06:24:45 1994
---- sup/supcdefs.h	Thu Apr  6 15:32:42 1995
+--- supcdefs.h	Sun May 30 22:13:40 1999
+***************
+*** 98,104 ****
+  extern int errno;
+  extern uid_t getuid();
+  extern gid_t getgid();
+- extern long time();
+  
+  extern int PGMVERSION;
+  
+--- 98,103 ----
 ***************
 *** 118,123 ****
---- 118,124 ----
+--- 117,123 ----
   	char *Clogin;			/* remote login name */
   	char *Cpswd;			/* remote password */
   	char *Ccrypt;			/* data encryption key */
@@ -1350,7 +1360,7 @@ diff -c /var/tmp/sup/supcdefs.h sup/supcdefs.h
   
   /*************************
    ***	M A C R O S    ***
---- 127,146 ----
+--- 126,145 ----
   };
   typedef struct collstruct COLLECTION;
   
@@ -1380,7 +1390,7 @@ diff -c /var/tmp/sup/supcdefs.h sup/supcdefs.h
 ! void	goaway	__P((char *fmt,...));
 ! void	notify	__P((char *fmt,...));
   #endif
---- 151,157 ----
+--- 150,156 ----
    * C prototypes
    */
   #if __STDC__
@@ -2832,7 +2842,7 @@ diff -c /var/tmp/sup/vprintf.c sup/vprintf.c
 +  * SUCH DAMAGE.
 +  *
 +  *	from: "@(#)daemon.c	5.3 (Berkeley) 12/28/90
-+  *	$Id: patch-aa,v 1.2 1995/08/14 08:57:27 gibbs Exp $
++  *	$Id: patch-aa,v 1.3 1998/09/23 05:13:55 imp Exp $
 +  */
 + 
 + #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/net/sup/files/patch-ab b/net/sup/files/patch-ab
index 218db5f9d380..81ee00bc6d62 100644
--- a/net/sup/files/patch-ab
+++ b/net/sup/files/patch-ab
@@ -246,7 +246,8 @@
   	(void) sprintf (tname,"%s.temp",fname);
   	scanF = fopen (tname,"w");
 --- 959,964 ----
---- supscan.c	Sun Dec 10 15:44:22 1995
+*** supscan.c.orig	Fri Aug 20 19:46:35 1993
+--- supscan.c	Sun May 30 22:17:04 1999
 ***************
 *** 25,40 ****
   /*
@@ -296,6 +297,17 @@
   long scantime;				/* time of this scan */
   int newonly = FALSE;			/* new files only */
 ***************
+*** 167,174 ****
+  TREE *listT;		/* final list of files in collection */
+  TREE *refuseT = NULL;	/* list of all files specified by <coll>.list */
+  
+- long time ();
+- 
+  /*************************************
+   ***    M A I N   R O U T I N E    ***
+   *************************************/
+--- 171,176 ----
+***************
 *** 190,196 ****
   			ctime (&scantime));
   		(void) fflush (stdout);
@@ -304,7 +316,7 @@
   			scantime = time ((long *)NULL);
   			printf ("SUP Scan for %s completed at %s",collname,
   				ctime (&scantime));
---- 194,201 ----
+--- 192,199 ----
   			ctime (&scantime));
   		(void) fflush (stdout);
   		if (!setjmp (sjbuf)) {
@@ -324,7 +336,7 @@
   	exit (1);
   }
   
---- 220,238 ----
+--- 218,236 ----
   
   usage ()
   {
@@ -346,7 +358,7 @@
   
 ***************
 *** 243,248 ****
---- 258,280 ----
+--- 256,278 ----
   			--argc;
   			argv++;
   			filename = argv[1];
diff --git a/net/sup/files/patch-ac b/net/sup/files/patch-ac
index 9c8a3dd25b49..1da07266614d 100644
--- a/net/sup/files/patch-ac
+++ b/net/sup/files/patch-ac
@@ -32,7 +32,7 @@ retrieving revision 1.4
 diff -u -r1.3 -r1.4
 --- scan.c	1995/12/26 05:10:59	1.3
 +++ scan.c	1996/09/24 08:08:11	1.4
-@@ -104,8 +110,8 @@
+@@ -93,8 +93,8 @@
  #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/stat.h>
@@ -42,7 +42,16 @@ diff -u -r1.3 -r1.4
  #include "sup.h"
  
  /*************************
-@@ -714,7 +720,7 @@
+@@ -165,8 +165,6 @@
+ extern int trace;			/* trace directories */
+ extern int newonly;			/* new files only */
+ 
+-extern long time();
+-
+ /*************************************************
+  ***   STATIC   R O U T I N E S    ***
+  *************************************************/
+@@ -703,7 +701,7 @@
  char *name;
  int always;
  {
@@ -137,7 +146,7 @@ retrieving revision 1.6
 diff -u -r1.4 -r1.6
 --- supfilesrv.c	1996/02/06 19:03:58	1.4
 +++ supfilesrv.c	1996/09/24 08:43:04	1.6
-@@ -268,7 +288,6 @@
+@@ -254,7 +254,6 @@
  #include <sys/wait.h>
  #include <sys/stat.h>
  #include <sys/file.h>
@@ -145,7 +154,15 @@ diff -u -r1.4 -r1.6
  #if	MACH
  #include <sys/ioctl.h>
  #endif
-@@ -1233,6 +1252,7 @@
+@@ -277,7 +276,6 @@
+ #endif	/* lint */
+ 
+ extern int errno;
+-long time ();
+ uid_t getuid ();
+ 
+ int maxchildren;
+@@ -1218,6 +1216,7 @@
  	register int fdtmp;
  	char sys_com[STRINGLENGTH], temp_file[STRINGLENGTH], rcs_file[STRINGLENGTH];
          union wait status;
@@ -153,7 +170,7 @@ diff -u -r1.4 -r1.6
  	char *uconvert(),*gconvert();
  	int sendfile ();
  
-@@ -1300,15 +1320,54 @@
+@@ -1285,15 +1284,54 @@
  #endif
                          if (fd == -1) {
                                  if (docompress) {
-- 
cgit v1.2.3