Patch #: 174 Type: bug fix Priority: low Affects: sites installing CAP under A/UX Reported: Nobody Bothered Archived: munnari.OZ.AU mac/cap.patches/cap60.patch174 Application: 'cd cap60; patch -p < cap60.patches/cap60.patch174' File: cap60/Configure File: cap60/lib/cap/abauxddp.c File: cap60/applications/aufs/aufs.c *** Configure.orig Wed Nov 24 23:32:38 1993 --- Configure Mon Nov 29 19:05:26 1993 *************** *** 1,7 **** #!/bin/sh ! # $Author: djh $ $Date: 1993/11/24 12:32:24 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.69 1993/11/24 12:32:24 djh Rel djh $ ! # $Revision: 2.69 $ # CAP configuration shell script. This ain't perfect, but it's a start. # Execute with /bin/sh Configure if your system won't run it (ksh is okay too) # --- 1,7 ---- #!/bin/sh ! # $Author: djh $ $Date: 1993/11/29 08:05:10 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.70 1993/11/29 08:05:10 djh Rel djh $ ! # $Revision: 2.70 $ # CAP configuration shell script. This ain't perfect, but it's a start. # Execute with /bin/sh Configure if your system won't run it (ksh is okay too) # *************** *** 1674,1679 **** --- 1674,1686 ---- echo "Generate makefiles by typing: gen.makes (or sh gen.makes) from" echo "the top level directory" echo + case ${os} in + "aux") + echo "WARNING: remove old 'Makefiles' by typing: 'make spotless'" + echo "then re-run 'gen.makes' to create new small-m 'makefiles'" + echo + ;; + esac echo "MAKE SURE YOU HAVE READ NOTES. There are machine dependencies" echo "that are not handled by Configure!!!!!" echo *** lib/cap/abauxddp.c.orig Thu Feb 28 23:42:54 1991 --- lib/cap/abauxddp.c Mon Nov 29 17:49:15 1993 *************** *** 1,8 **** /* ! * $Author: djh $ $Date: 91/02/15 22:46:43 $ ! * $Header: abauxddp.c,v 2.1 91/02/15 22:46:43 djh Rel $ ! * $Revision: 2.1 $ ! */ /* * abauxddp.c - Datagram Delivery Protocol for native appletalk under A/UX --- 1,9 ---- /* ! * $Author: djh $ $Date: 1993/11/29 06:48:59 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abauxddp.c,v 2.2 1993/11/29 06:48:59 djh Rel djh $ ! * $Revision: 2.2 $ ! * ! */ /* * abauxddp.c - Datagram Delivery Protocol for native appletalk under A/UX *************** *** 23,28 **** --- 24,30 ---- * another module (interface dep) and drop out part of DDP into it. * * 1990 William Roberts Add support for A/UX native appletalk + * */ #include *************** *** 51,58 **** #else # define DO_CHKSUM 0 #endif ! boolean dochecksum = DO_CHKSUM; /* can be patched if necessary */ extern int errno; --- 53,61 ---- #else # define DO_CHKSUM 0 #endif ! boolean dochecksum = DO_CHKSUM; /* can be patched if necessary */ + short lap_proto = LAP_KERNEL; /* kernel appletalk support */ extern int errno; *** applications/aufs/aufs.c.orig Tue Sep 7 11:42:48 1993 --- applications/aufs/aufs.c Mon Nov 29 17:56:10 1993 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1993/09/07 01:42:37 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/aufs.c,v 2.21 1993/09/07 01:42:37 djh Rel djh $ ! * $Revision: 2.21 $ * */ --- 1,7 ---- /* ! * $Author: djh $ $Date: 1993/11/29 06:55:58 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/aufs.c,v 2.22 1993/11/29 06:55:58 djh Rel djh $ ! * $Revision: 2.22 $ * */ *************** *** 54,59 **** --- 54,65 ---- # define DORUSAGE #endif NOWAIT3 + #ifdef aux + # ifdef DORUSAGE + # undef DORUSAGE + # endif DORUSAGE + #endif aux + #ifdef NOPGRP # ifdef xenix5 # define killpg(pid,sig) kill(-(pid),sig) *************** *** 1102,1108 **** bcopy(&status, &cp->status, sizeof(status)); /* copy status */ #ifdef DORUSAGE bcopy(&rusage, &cp->rusage, sizeof(rusage)); ! #endif ctp_stack[ctp_stack_cnt++] = i; /* mark cno */ logit(0,"Recorded terminated inferior Aufs PID %d", pid); break; --- 1108,1114 ---- bcopy(&status, &cp->status, sizeof(status)); /* copy status */ #ifdef DORUSAGE bcopy(&rusage, &cp->rusage, sizeof(rusage)); ! #endif DORUSAGE ctp_stack[ctp_stack_cnt++] = i; /* mark cno */ logit(0,"Recorded terminated inferior Aufs PID %d", pid); break; *************** *** 1184,1190 **** ((float)cp->rusage.ru_utime.tv_usec)/1000000.0, ((float)cp->rusage.ru_stime.tv_sec)+ ((float)cp->rusage.ru_stime.tv_usec)/1000000.0); ! #endif logit(0,"Process %d terminated", cp->pid); cp->state = CP_NOTINUSE; cp->pid = -1; /* make -1 to speed up sigchld handler */ --- 1190,1196 ---- ((float)cp->rusage.ru_utime.tv_usec)/1000000.0, ((float)cp->rusage.ru_stime.tv_sec)+ ((float)cp->rusage.ru_stime.tv_usec)/1000000.0); ! #endif DORUSAGE logit(0,"Process %d terminated", cp->pid); cp->state = CP_NOTINUSE; cp->pid = -1; /* make -1 to speed up sigchld handler */ *** lib/cap/abversion.c.orig Fri Nov 26 00:02:42 1993 --- lib/cap/abversion.c Mon Nov 29 17:52:48 1993 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1993/11/25 13:02:37 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.73 1993/11/25 13:02:37 djh Rel djh $ ! * $Revision: 2.73 $ * */ --- 1,7 ---- /* ! * $Author: djh $ $Date: 1993/11/29 06:52:40 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.74 1993/11/29 06:52:40 djh Rel djh $ ! * $Revision: 2.74 $ * */ *************** *** 32,38 **** myversion.cv_name = "CAP"; myversion.cv_version = 6; myversion.cv_subversion = 0; ! myversion.cv_patchlevel = 173; myversion.cv_rmonth = "November"; myversion.cv_ryear = "1993"; switch (lap_proto) { --- 32,38 ---- myversion.cv_name = "CAP"; myversion.cv_version = 6; myversion.cv_subversion = 0; ! myversion.cv_patchlevel = 174; myversion.cv_rmonth = "November"; myversion.cv_ryear = "1993"; switch (lap_proto) { *** README.orig Fri Nov 26 00:04:22 1993 --- README Mon Nov 29 17:58:11 1993 *************** *** 2,8 **** CAP - Columbia AppleTalk Package for UNIX o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 173, November 1993 Notice ------ --- 2,8 ---- CAP - Columbia AppleTalk Package for UNIX o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 174, November 1993 Notice ------