PERFORCE change 15052 for review
Robert Watson
rwatson at freebsd.org
Sun Jul 28 15:16:57 GMT 2002
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15052
Change 15052 by rwatson at rwatson_paprika on 2002/07/28 08:16:38
IFC the trustedbsd base branch a little further to pick up some of
the manual TrustedBSD MAC merges from yesterday.
Affected files ...
.. //depot/projects/trustedbsd/base/bin/test/test.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/CHANGES#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/FILES#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/FREEBSD-upgrade#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/INSTALL#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/Makefile.in#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/README#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/VERSION#3 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/aclocal.m4#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/config.guess#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/config.sub#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/configure#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/configure.in#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-generic.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-linux.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-mib.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-socket.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/ifaddrlist.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/ifaddrlist.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/install-sh#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/lbl/os-solaris2.h#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/lbl/os-sunos4.h#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/strerror.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#3 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/traceroute/usleep.c#1 branch
.. //depot/projects/trustedbsd/base/etc/rc.d/bgfsck#2 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#3 integrate
.. //depot/projects/trustedbsd/base/etc/rc.diskless1#7 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#16 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate
.. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#6 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#2 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#2 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/extern.h#2 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/rule.c#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/release.7#5 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#8 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/si/si.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/si/si_isa.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#17 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/exception.s#5 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/net/netisr.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netipx/spx_debug.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_lib.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#12 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/cpu.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/tlb.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.s#11 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mutex.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/ucred.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_readwrite.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#9 integrate
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.music#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/lock/lock.1#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/lock/lock.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/getextattr/getextattr.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/setkey/setkey.8#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/traceroute/Makefile#3 integrate
Differences ...
==== //depot/projects/trustedbsd/base/bin/test/test.c#10 (text+ko) ====
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.49 2002/07/05 10:27:34 maxim Exp $");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.50 2002/07/27 22:53:44 dwmalone Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -521,19 +521,21 @@
{
struct stat b1, b2;
- return (stat (f1, &b1) == 0 &&
- stat (f2, &b2) == 0 &&
- b1.st_mtime > b2.st_mtime);
+ if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
+ return 0;
+
+ if (b1.st_mtimespec.tv_sec > b2.st_mtimespec.tv_sec)
+ return 1;
+ if (b1.st_mtimespec.tv_sec < b2.st_mtimespec.tv_sec)
+ return 0;
+
+ return (b1.st_mtimespec.tv_nsec > b2.st_mtimespec.tv_nsec);
}
static int
olderf (const char *f1, const char *f2)
{
- struct stat b1, b2;
-
- return (stat (f1, &b1) == 0 &&
- stat (f2, &b2) == 0 &&
- b1.st_mtime < b2.st_mtime);
+ return (newerf(f2, f1));
}
static int
==== //depot/projects/trustedbsd/base/contrib/traceroute/CHANGES#2 (text+ko) ====
@@ -1,4 +1,86 @@
-@(#) $Header: CHANGES,v 1.12 96/09/28 18:24:35 leres Exp $ (LBL)
+@(#) $Id: CHANGES,v 1.23 2000/12/14 06:53:11 leres Exp $ (LBL)
+
+v1.4 Wed Dec 13 22:50:35 PST 2000
+
+- Add an option to use icmp echo instead of udp datagrams.
+
+- Add HPUX and Linux support.
+
+- Handle hex argument values as suggested by John Hawkinson
+ (jhawk at mit.edu)
+
+- Added flags to set the first ttl and to set the don't fragment bit.
+
+- Add a local autoconf macro to check for routines in libraries; the
+ autoconf version is broken (it only puts the library name in the
+ cache variable name). Thanks to John Hawkinson.
+
+- Add a local autoconf macro to check for types; the autoconf version
+ is broken (it uses grep instead of actually compiling a code fragment).
+
+- Attempt to detect "egcs" versions of gcc.
+
+- Fix problems caused by savestr().
+
+- Detect when there are more interfaces than we can deal with. Thanks
+ to Guy Harris guy at netapp.com.
+
+- Accommodate changes made to FreeBSD 3.2-RELEASE network headers files.
+
+- The ip header offset needs to be byte swapped under Solaris on the
+ intel as well. Reported by John McDermott (jjm at jkintl.com) Also byte
+ ip length and offset for linux.
+
+- In wait_for_reply(), use passed socket instead of global one. Thanks
+ to Richard Kettlewell (richard.kettlewell at kewill.com)
+
+- Check for IFF_LOOPBACK as a define or an enum (concession to linux).
+ Reported by Robert Bihlmeyer (robbe at orcus.priv.at)
+
+- Increase size of SIOCGIFCONF buffer to accommodate systems with lots
+ of virtual interfaces. Ignore sun virtual interfaces. Suggested by
+ Ian Donaldson (iand at aone.com.au)
+
+- Always calculate icmp checksums when using -I. Reported by Soumen
+ (sbiswas at novell.com)
+
+- Documentation fix for description of -p. Thanks to Jeffrey C Honig
+ (jch at bsdi.com)
+
+- Enable ip checksums for Solaris 2.6 and higher (since they seem to
+ work correctly now).
+
+- Avoid problems when broken routers return 0.0.0.0 as their source
+ address. Thanks to John Hawkinson (jhawk at bbnplanet.com)
+
+- Canonicalize hostname if gethostname() doesn't return a domain.
+
+- Add -z flag (pause msecs) to allow optional pause between probes.
+ Suggested by Dave Morrison (drmorris at uplanet.com)
+
+- Fix max packet length test.
+
+- Use "/dev/null" instead of "." for file descriptor fodder.
+ Suggested by Tim Robbins (fyre at box3n.gumbynet.org)
+
+- Watch for a NULL argv[0]. Suggested by Tim Robbins.
+
+- Be careful with hostname legnths.
+
+- Print RFC1191 Path MTU Discovery value on "needfrag" unreachables.
+
+- Limit port size to 16 bits. Suggested by Tim Robbins.
+
+- Limit wait time to 24 hours.
+
+- Modified linux specific struct ipovly definition to avoid problems
+ with 64 bit systems. Problem reported by Uros Prestor
+ (uros at turbolinux.com)
+
+- Use kernel routing tables to determine correct source address.
+ Three styles are supported: bsd/socket, solaris/mib and linux.
+
+- Fix configure to recognize older versions of Solaris.
v1.3.2 Thu Sep 26 18:06:16 PDT 1996
==== //depot/projects/trustedbsd/base/contrib/traceroute/FILES#2 (text+ko) ====
@@ -4,15 +4,28 @@
Makefile.in
README
VERSION
-acsite.m4
+aclocal.m4
config.guess
config.sub
configure
configure.in
+findsaddr-generic.c
+findsaddr-linux.c
+findsaddr-mib.c
+findsaddr-socket.c
+findsaddr.h
+ifaddrlist.c
+ifaddrlist.h
install-sh
lbl/gnuc.h
lbl/os-solaris2.h
lbl/os-sunos4.h
+linux-include/netinet/in_systm.h
+linux-include/netinet/ip.h
+linux-include/netinet/ip_icmp.h
+linux-include/netinet/ip_var.h
+linux-include/netinet/udp.h
+linux-include/netinet/udp_var.h
mean.awk
median.awk
mkdep
@@ -20,3 +33,5 @@
strerror.c
traceroute.8
traceroute.c
+traceroute.h
+usleep.c
==== //depot/projects/trustedbsd/base/contrib/traceroute/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.2 1999/12/20 16:07:53 phantom Exp $
+$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.3 2002/07/28 02:26:31 fenner Exp $
This directory contains virgin copies of the original distribution files
on a "vendor" branch. Do not, under any circumstances, attempt to upgrade
@@ -10,11 +10,13 @@
[Do not make ANY changes to the files.]
2. Use the command:
- cvs import -m 'Virgin import of LBL traceroute v<version>' \
+ cvs import -I linux-include \
+ -m 'Virgin import of LBL traceroute v<version>' \
src/contrib/traceroute LBL v<version>
For example, to do the import of version 1.3.2, I might have typed:
- cvs import -m 'Virgin import of LBL traceroute v1.3.2' \
+ cvs import -I linux-include \
+ -m 'Virgin import of LBL traceroute v1.3.2' \
src/contrib/traceroute LBL v1_3_2
3. Follow the instructions printed out in step 2 to resolve any
@@ -30,4 +32,7 @@
(The "SANE_PRECISION" patch has been submitted and rejected.)
+(The extensive modifications for TCP and GRE probes have not been
+submitted.)
+
fenner at freebsd.org - 30 Sep 1996
==== //depot/projects/trustedbsd/base/contrib/traceroute/INSTALL#2 (text+ko) ====
@@ -1,4 +1,4 @@
-@(#) $Header: INSTALL,v 1.7 96/09/18 21:09:56 leres Exp $ (LBL)
+@(#) $Id: INSTALL,v 1.13 2000/11/23 20:07:29 leres Exp $ (LBL)
Traceroute is known to build and run under SunOS 4.1.4 and Solaris 5.4.
If you are running a really old kernel, see the instructions under the
@@ -20,6 +20,20 @@
ftp://prep.ai.mit.edu/pub/gnu/gcc-*.tar.gz
+If you get the error message:
+
+ traceroute: unknown protocol icmp
+
+it usually means you're missing the icmp line in /etc/protocols.
+
+If you are using Solaris 2.5.1 (and possibly higher), traceroute cannot
+calculate checksums; configure automatically changes the default to
+reflect this. The kernel updates the ip_id field with some unknown
+value and the ip_off field with the IP_DF bit. Also, if the the udp
+uh_sum field is non-zero, it gets updated with the value of the uh_ulen
+field... This means that the icmp echo option (-I flag) is not as
+useful.
+
KERNEL MODIFICATIONS
--------------------
If yor have a really old system, it may be necessary to modify your
@@ -65,18 +79,27 @@
Makefile.in - compilation rules (input to the configure script)
README - description of distribution
VERSION - version of this release
-acsite.m4 - autoconf macros
+aclocal.m4 - autoconf macros
config.guess - autoconf support
config.sub - autoconf support
configure - configure script (run this first)
configure.in - configure script source
+findsaddr-generic.c - generic source address code
+findsaddr-linux.c - linux source address code
+findsaddr-socket.c - socket based soruce address code
+findsaddr.h - source address prototypes
+ifaddrlist.c - inet address routines
+ifaddrlist.h - inet address prototypes
install-sh - BSD style install script
lbl/gnuc.h - gcc macros and defines
lbl/os-*.h - os dependent defines and prototypes
+linux-include/* - network include files missing on Linux
mean.awk - awk script to print out the mean time along a route
median.awk - awk script to print out the median time along a route
mkdep - construct Makefile dependency list
rip_output.c - sample rip_output() from /sys/netinet/raw_ip.c
+strerror.c - emulation routine
traceroute.8 - manual entry
traceroute.c - main program
-strerror.c - emulation routine
+traceroute.h - global prototypes
+usleep.c - missing system call emulation
==== //depot/projects/trustedbsd/base/contrib/traceroute/Makefile.in#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# Copyright (c) 1988, 1989, 1990, 1991, 1992, 1995, 1996
+# Copyright (c) 1988, 1989, 1990, 1991, 1992, 1995, 1996, 1997, 1998, 1999, 2000
# The Regents of the University of California. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#) $Header: Makefile.in,v 1.21 96/09/16 18:49:46 leres Exp $ (LBL)
+# @(#) $Id: Makefile.in,v 1.28 2000/11/23 20:05:14 leres Exp $ (LBL)
#
# Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -57,19 +57,20 @@
# problem if you don't own the file but can write to the directory.
.c.o:
@rm -f $@
- $(CC) $(CFLAGS) -c $*.c
+ $(CC) $(CFLAGS) -c $(srcdir)/$*.c
-CSRC = traceroute.c
+CSRC = traceroute.c ifaddrlist.c @V_FINDSADDR@
GENSRC = version.c
SRC = $(CSRC) $(GENSRC)
+HDR = findsaddr.h ifaddrlist.h
TAGHDR = \
/usr/include/netinet/in.h \
/usr/include/netinet/ip_icmp.h \
/usr/include/netinet/udp.h
-TAGFILES = $(SRC) $(TAGHDR)
+TAGFILES = $(SRC) $(HDR) $(TAGHDR)
# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
# hack the extra indirection
@@ -77,6 +78,8 @@
CLEANFILES = $(OBJ) traceroute $(GENSRC)
+all: traceroute
+
traceroute: $(OBJ)
@rm -f $@
$(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
@@ -92,7 +95,7 @@
install-man: force
$(INSTALL) -m 444 -o bin -g bin traceroute.8 $(DESTDIR)$(MANDEST)/man8
-lint: $(GENSRC) force
+lint: $(GENSRC) force
lint -hbxn $(SRC) | \
grep -v 'struct/union .* never defined' | \
grep -v 'possible pointer alignment problem'
@@ -104,23 +107,23 @@
rm -f $(CLEANFILES) Makefile config.cache config.log config.status \
gnuc.h os-proto.h
-tags: $(TAGFILES)
+tags: $(TAGFILES)
ctags -wtd $(TAGFILES)
-tar: force
- @cwd=`pwd` ; dir=`basename $$cwd` ; name=traceroute-`cat VERSION` ; \
- list="" ; tar="tar chFFf" ; \
+tar: force
+ @cwd=`pwd` ; name=traceroute-`cat VERSION` ; \
+ list="" ; tar="tar chf" ; temp="$$name.tar.gz" ; \
for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \
echo \
- "rm -f ../$$name; ln -s $$dir ../$$name" ; \
- rm -f ../$$name; ln -s $$dir ../$$name ; \
+ "rm -f $$name; ln -s . $$name" ; \
+ rm -f $$name; ln -s . $$name ; \
echo \
- "(cd .. ; $$tar - [lots of files]) | compress > /tmp/$$name.tar.Z" ; \
- (cd .. ; $$tar - $$list) | compress > /tmp/$$name.tar.Z ; \
+ "$$tar - [lots of files] | gzip > $$temp" ; \
+ $$tar - $$list | gzip > $$temp ; \
echo \
- "rm -f ../$$name" ; \
- rm -f ../$$name
+ "rm -f $$name" ; \
+ rm -f $$name
-force: /tmp
-depend: $(GENSRC) force
+force: /tmp
+depend: $(GENSRC) force
./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)
==== //depot/projects/trustedbsd/base/contrib/traceroute/README#2 (text+ko) ====
@@ -1,10 +1,10 @@
-@(#) $Header: README,v 1.7 96/07/06 02:08:32 leres Exp $ (LBL)
+@(#) $Id: README,v 1.9 2000/09/16 05:32:01 leres Exp $ (LBL)
-TRACEROUTE 1.3
+TRACEROUTE 1.4
Lawrence Berkeley National Laboratory
Network Research Group
traceroute at ee.lbl.gov
-ftp://ftp.ee.lbl.gov/traceroute.tar.Z
+ftp://ftp.ee.lbl.gov/traceroute.tar.gz
Traceroute is a system administrators utility to trace the route
ip packets from the current system take in getting to some
@@ -19,7 +19,7 @@
to each hop, respectively. I've found that something like
traceroute -q 7 foo.somewhere >t
- awk -f median.awk t | graph
+ awk -f median.awk t | xgraph
can give you a quick picture of the bad spots on a long path (median is
usually a better noise filter than mean).
==== //depot/projects/trustedbsd/base/contrib/traceroute/VERSION#3 (text+ko) ====
@@ -1,2 +1,2 @@
-1.3.2+FreeBSD
-$FreeBSD: src/contrib/traceroute/VERSION,v 1.2 2002/07/23 00:56:52 fenner Exp $
+1.4a12+FreeBSD
+$FreeBSD: src/contrib/traceroute/VERSION,v 1.3 2002/07/28 02:26:31 fenner Exp $
==== //depot/projects/trustedbsd/base/contrib/traceroute/config.guess#2 (text+ko) ====
@@ -67,21 +67,28 @@
amiga:NetBSD:*:*)
echo m68k-cbm-netbsd${UNAME_RELEASE}
exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-cbm-openbsd${UNAME_RELEASE}
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
- Pyramid*:OSx*:*:*)
+ Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+ # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3
else
echo pyramid-pyramid-bsd
fi
exit 0 ;;
- sun4*:SunOS:5.*:*)
+ NILE:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
i86pc:SunOS:5.*:*)
- echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -101,25 +108,60 @@
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
atari*:NetBSD:*:*)
echo m68k-atari-netbsd${UNAME_RELEASE}
exit 0 ;;
+ atari*:OpenBSD:*:*)
+ echo m68k-atari-openbsd${UNAME_RELEASE}
+ exit 0 ;;
sun3*:NetBSD:*:*)
echo m68k-sun-netbsd${UNAME_RELEASE}
exit 0 ;;
+ sun3*:OpenBSD:*:*)
+ echo m68k-sun-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mac68k:NetBSD:*:*)
echo m68k-apple-netbsd${UNAME_RELEASE}
exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-apple-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
exit 0 ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
exit 0 ;;
- mips:*:4*:UMIPS)
- echo mips-mips-riscos4sysv
- exit 0 ;;
- mips:*:5*:RISCos)
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ sed 's/^ //' << EOF >dummy.c
+ int main (argc, argv) int argc; char **argv; {
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ ${CC-cc} dummy.c -o dummy \
+ && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && rm dummy.c dummy && exit 0
+ rm -f dummy.c dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
@@ -137,7 +179,7 @@
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
+ if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-o ${TARGET_BINARY_INTERFACE}x = x ] ; then
echo m88k-dg-dgux${UNAME_RELEASE}
@@ -163,10 +205,10 @@
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
exit 0 ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i[34]86:AIX:*:*)
+ i?86:AIX:*:*)
echo i386-ibm-aix
exit 0 ;;
*:AIX:2:3)
@@ -211,7 +253,7 @@
echo romp-ibm-bsd4.4
exit 0 ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -229,7 +271,7 @@
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
+ 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
9000/8?? ) HP_ARCH=hppa1.0 ;;
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -277,6 +319,13 @@
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
exit 0 ;;
+ i?86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
@@ -304,17 +353,33 @@
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE}
exit 0 ;;
- CRAY*C90:*:*:*)
- echo c90-cray-unicos${UNAME_RELEASE}
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ exit 0 ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE}
exit 0 ;;
CRAY-2:*:*:*)
echo cray2-cray-unicos
exit 0 ;;
+ F300:UNIX_System_V:*:*)
+ FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ F301:UNIX_System_V:*:*)
+ echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+ exit 0 ;;
hp3[0-9][05]:NetBSD:*:*)
echo m68k-hp-netbsd${UNAME_RELEASE}
exit 0 ;;
- i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ hp3[0-9][05]:OpenBSD:*:*)
+ echo m68k-hp-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ i?86:BSD/386:*:* | *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
@@ -322,8 +387,11 @@
*:NetBSD:*:*)
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
i*:CYGWIN*:*)
- echo i386-unknown-cygwin32
+ echo i386-pc-cygwin32
exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin32
@@ -338,23 +406,27 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
- echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
- echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
- echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
+ echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
- echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+ echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
- echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+ echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
+ echo "powerpc-unknown-linux-gnu" ; exit 0
elif test "${UNAME_MACHINE}" = "alpha" ; then
- echo alpha-unknown-linux ; exit 0
+ echo alpha-unknown-linux-gnu ; exit 0
+ elif test "${UNAME_MACHINE}" = "sparc" ; then
+ echo sparc-unknown-linux-gnu ; exit 0
else
- # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
- # useful --help. Gcc wants to distinguish between linuxoldld and linuxaout.
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
+ # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
test ! -d /usr/lib/ldscripts/. \
- && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
+ && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
# Determine whether the default compiler is a.out or elf
cat >dummy.c <<EOF
main(argc, argv)
@@ -362,9 +434,9 @@
char *argv[];
{
#ifdef __ELF__
- printf ("%s-unknown-linux\n", argv[1]);
+ printf ("%s-pc-linux-gnu\n", argv[1]);
#else
- printf ("%s-unknown-linuxaout\n", argv[1]);
+ printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
@@ -374,32 +446,32 @@
fi ;;
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
# are messed up and put the nodename in both sysname and nodename.
- i[34]86:DYNIX/ptx:4*:*)
+ i?86:DYNIX/ptx:4*:*)
echo i386-sequent-sysv4
exit 0 ;;
- i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+ i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
else
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
exit 0 ;;
- i[34]86:*:3.2:*)
+ i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
- echo ${UNAME_MACHINE}-unknown-sysv32
+ echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
Intel:Mach:3*:*)
- echo i386-unknown-mach3
+ echo i386-pc-mach3
exit 0 ;;
paragon:*:*:*)
echo i860-intel-osf1
@@ -415,28 +487,36 @@
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
- M680[234]0:*:R3V[567]*:*)
+ M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
- uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3 && exit 0 ;;
+ 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- uname -p 2>/dev/null | grep 86 >/dev/null \
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
- m680[234]0:LynxOS:2.[23]*:*)
- echo m68k-lynx-lynxos${UNAME_RELEASE}
+ m68*:LynxOS:2.*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i[34]86:LynxOS:2.[23]*:*)
- echo i386-lynx-lynxos${UNAME_RELEASE}
+ i?86:LynxOS:2.*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- TSUNAMI:LynxOS:2.[23]*:*)
- echo sparc-lynx-lynxos${UNAME_RELEASE}
+ rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- rs6000:LynxOS:2.[23]*:*)
- echo rs6000-lynx-lynxos${UNAME_RELEASE}
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
exit 0 ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
@@ -449,16 +529,29 @@
echo ns32k-sni-sysv
fi
exit 0 ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes at openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
+ *:*:*:FTX*)
+ # From seanf at swdc.stratus.com.
+ echo i860-stratus-sysv4
+ exit 0 ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
exit 0 ;;
- R3000:*System_V*:*:*)
+ R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit 0 ;;
+ PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -502,7 +595,7 @@
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3");
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
@@ -519,7 +612,7 @@
#endif
#if defined (__386BSD__)
- printf ("i386-unknown-bsd\n"); exit (0);
+ printf ("i386-pc-bsd\n"); exit (0);
#endif
#if defined (sequent)
==== //depot/projects/trustedbsd/base/contrib/traceroute/config.sub#2 (text+ko) ====
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
+# can handle that machine. It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -41,6 +41,8 @@
# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
if [ x$1 = x ]
@@ -62,11 +64,21 @@
;;
esac
-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ linux-gnu*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
### Let's recognize common machines as not being operating systems so
### that things like config.sub decstation-3100 work. We also
@@ -81,38 +93,43 @@
-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple)
os=
basic_machine=$1
;;
-hiux*)
os=-hiuxwe2
;;
+ -sco5)
+ os=sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco4)
os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-lynx*)
os=-lynxos
@@ -123,35 +140,44 @@
-windowsnt*)
os=`echo $os | sed -e 's/windowsnt/winnt/'`
;;
+ -psos*)
+ os=-psos
+ ;;
esac
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list