Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Feb 2003 13:46:34 -0800 (PST)
From:      Juli Mallett <jmallett@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 25237 for review
Message-ID:  <200302152146.h1FLkYlV091109@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25237

Change 25237 by jmallett@jmallett_dalek on 2003/02/15 13:46:03

	Integrate from trunk.

Affected files ...

.. //depot/projects/mips/Makefile.inc1#8 integrate
.. //depot/projects/mips/UPDATING#8 integrate
.. //depot/projects/mips/bin/sh/machdep.h#2 delete
.. //depot/projects/mips/bin/sh/memalloc.c#2 integrate
.. //depot/projects/mips/bin/sh/nodes.c.pat#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/archive#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/audio#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/compress#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/ctags#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/filesystems#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/flash#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/gringotts#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/hp#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/images#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/lisp#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/msdos#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/python#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/sgml#2 integrate
.. //depot/projects/mips/contrib/file/Magdir/vorbis#2 integrate
.. //depot/projects/mips/contrib/file/Makefile.am#2 integrate
.. //depot/projects/mips/contrib/file/Makefile.in#2 integrate
.. //depot/projects/mips/contrib/file/Makefile.std#2 integrate
.. //depot/projects/mips/contrib/file/README#2 integrate
.. //depot/projects/mips/contrib/file/ascmagic.c#2 integrate
.. //depot/projects/mips/contrib/file/config.h.in#2 integrate
.. //depot/projects/mips/contrib/file/configure#2 integrate
.. //depot/projects/mips/contrib/file/configure.in#2 integrate
.. //depot/projects/mips/contrib/file/file.c#2 integrate
.. //depot/projects/mips/contrib/file/file.h#2 integrate
.. //depot/projects/mips/contrib/file/file.man#2 integrate
.. //depot/projects/mips/contrib/file/magic.man#2 integrate
.. //depot/projects/mips/contrib/file/patchlevel.h#2 integrate
.. //depot/projects/mips/contrib/file/print.c#2 integrate
.. //depot/projects/mips/contrib/file/readelf.c#2 integrate
.. //depot/projects/mips/contrib/file/softmagic.c#2 integrate
.. //depot/projects/mips/contrib/groff/man/groff_out.man#3 integrate
.. //depot/projects/mips/contrib/groff/mdate.sh#2 integrate
.. //depot/projects/mips/contrib/groff/tmac/doc-common#3 integrate
.. //depot/projects/mips/contrib/groff/tmac/doc-ditroff#3 integrate
.. //depot/projects/mips/contrib/groff/tmac/doc-nroff#3 integrate
.. //depot/projects/mips/contrib/groff/tmac/doc-syms#3 integrate
.. //depot/projects/mips/contrib/groff/tmac/strip.sed#2 integrate
.. //depot/projects/mips/contrib/ipfilter/BSD/Makefile#2 integrate
.. //depot/projects/mips/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/mips/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#2 integrate
.. //depot/projects/mips/contrib/ipfilter/HISTORY#2 integrate
.. //depot/projects/mips/contrib/ipfilter/Makefile#2 integrate
.. //depot/projects/mips/contrib/ipfilter/bpf.h#1 branch
.. //depot/projects/mips/contrib/ipfilter/common.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/fils.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ip_lfil.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ip_sfil.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipf.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipfs.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipft_ef.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipft_hx.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipft_pc.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipft_sn.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipft_td.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipft_tx.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/iplang/iplang_y.y#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipmon.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipnat.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/44arp.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/arp.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/ip.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/ipresend.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/ipsend.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/ipsopt.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/iptest.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/iptests.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/lsock.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/resend.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/sirix.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/ipsend/sock.c#3 integrate
.. //depot/projects/mips/contrib/ipfilter/ipt.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/kmem.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipf.5#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipf.8#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipfs.8#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipfstat.8#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipftest.1#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipmon.8#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipnat.5#2 integrate
.. //depot/projects/mips/contrib/ipfilter/man/ipnat.8#2 integrate
.. //depot/projects/mips/contrib/ipfilter/misc.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/mli_ipl.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/mln_ipl.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/natparse.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/opt.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/parse.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/printnat.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/printstate.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/relay.c#2 integrate
.. //depot/projects/mips/contrib/ipfilter/test/Makefile#2 integrate
.. //depot/projects/mips/contrib/ipfilter/test/expected/ipv6.3#1 branch
.. //depot/projects/mips/contrib/ipfilter/test/expected/ni5#2 integrate
.. //depot/projects/mips/contrib/ipfilter/test/input/ipv6.3#1 branch
.. //depot/projects/mips/contrib/ipfilter/test/input/ni5#2 integrate
.. //depot/projects/mips/contrib/ipfilter/test/regress/ipv6.3#1 branch
.. //depot/projects/mips/crypto/kerberosIV/kadmin/kpasswd_standalone.c#2 integrate
.. //depot/projects/mips/crypto/openssh/ssh_config#3 integrate
.. //depot/projects/mips/crypto/openssh/ssh_config.5#3 integrate
.. //depot/projects/mips/crypto/openssh/sshd_config#3 integrate
.. //depot/projects/mips/crypto/openssh/sshd_config.5#3 integrate
.. //depot/projects/mips/etc/defaults/pccard.conf#4 integrate
.. //depot/projects/mips/etc/rc.d/cleanvar#3 integrate
.. //depot/projects/mips/etc/rc.d/devd#4 integrate
.. //depot/projects/mips/etc/rc.d/diskless#4 integrate
.. //depot/projects/mips/etc/rc.d/initdiskless#4 integrate
.. //depot/projects/mips/etc/rc.d/mountcritremote#3 integrate
.. //depot/projects/mips/etc/rc.d/network1#4 integrate
.. //depot/projects/mips/etc/rc.d/pccard#3 integrate
.. //depot/projects/mips/etc/rc.diskless1#3 integrate
.. //depot/projects/mips/games/fortune/datfiles/fortunes#6 integrate
.. //depot/projects/mips/games/fortune/datfiles/freebsd-tips#5 integrate
.. //depot/projects/mips/games/random/Makefile#2 integrate
.. //depot/projects/mips/games/random/random.6#2 integrate
.. //depot/projects/mips/games/random/random.c#2 integrate
.. //depot/projects/mips/games/random/randomize_fd.c#1 branch
.. //depot/projects/mips/games/random/randomize_fd.h#1 branch
.. //depot/projects/mips/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/mips/include/dlfcn.h#2 integrate
.. //depot/projects/mips/lib/compat/compat4x.alpha/Makefile#2 integrate
.. //depot/projects/mips/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu#1 branch
.. //depot/projects/mips/lib/compat/compat4x.alpha/libssl.so.2.gz.uu#1 branch
.. //depot/projects/mips/lib/compat/compat4x.i386/Makefile#3 integrate
.. //depot/projects/mips/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu#1 branch
.. //depot/projects/mips/lib/compat/compat4x.i386/libssl.so.2.gz.uu#1 branch
.. //depot/projects/mips/lib/libc/alpha/gen/isinf.c#2 integrate
.. //depot/projects/mips/lib/libc/gen/Makefile.inc#7 integrate
.. //depot/projects/mips/lib/libc/gen/dlfcn.c#2 integrate
.. //depot/projects/mips/lib/libc/gen/dlinfo.3#1 branch
.. //depot/projects/mips/lib/libc/gen/dlopen.3#3 integrate
.. //depot/projects/mips/lib/libc/gen/fpclassify.3#2 integrate
.. //depot/projects/mips/lib/libc/gen/isgreater.3#1 branch
.. //depot/projects/mips/lib/libc/gen/isinf.3#2 delete
.. //depot/projects/mips/lib/libc/gen/signbit.3#1 branch
.. //depot/projects/mips/lib/libc/gen/signbit.c#1 branch
.. //depot/projects/mips/lib/libc/i386/gen/isinf.c#2 integrate
.. //depot/projects/mips/lib/libc/ia64/gen/isinf.c#2 integrate
.. //depot/projects/mips/lib/libc/powerpc/gen/isinf.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/gen/isinf.c#2 integrate
.. //depot/projects/mips/lib/libc_r/man/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc_r/man/pthread_attr.3#4 integrate
.. //depot/projects/mips/lib/libc_r/man/pthread_attr_get_np.3#4 integrate
.. //depot/projects/mips/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_main_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_multi_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_mutexattr_getkind_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_resume_all_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_resume_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_set_name_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_suspend_all_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_suspend_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/man/pthread_switch_add_np.3#1 branch
.. //depot/projects/mips/lib/libc_r/uthread/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libgeom/Makefile#3 integrate
.. //depot/projects/mips/lib/libgeom/libgeom.3#2 integrate
.. //depot/projects/mips/lib/libpthread/thread/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/msun/src/math.h#5 integrate
.. //depot/projects/mips/lib/msun/src/s_isnan.c#2 integrate
.. //depot/projects/mips/lib/msun/src/s_isnanf.c#2 integrate
.. //depot/projects/mips/libexec/ftpd/ftpd.c#7 integrate
.. //depot/projects/mips/libexec/rtld-elf/Makefile#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/malloc.c#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/rtld.1#3 integrate
.. //depot/projects/mips/libexec/rtld-elf/rtld.c#7 integrate
.. //depot/projects/mips/libexec/rtld-elf/rtld.h#2 integrate
.. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate
.. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate
.. //depot/projects/mips/release/doc/ja_JP.eucJP/early-adopter/article.sgml#4 integrate
.. //depot/projects/mips/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate
.. //depot/projects/mips/sbin/devd/devd.8#5 integrate
.. //depot/projects/mips/sbin/devd/devd.conf.5#5 integrate
.. //depot/projects/mips/sbin/dumpfs/dumpfs.c#8 integrate
.. //depot/projects/mips/sbin/fdisk_pc98/fdisk.c#5 integrate
.. //depot/projects/mips/sbin/fsck_ffs/fsck.h#2 integrate
.. //depot/projects/mips/sbin/gpt/show.c#5 integrate
.. //depot/projects/mips/sbin/md5/md5.c#3 integrate
.. //depot/projects/mips/sbin/newfs/Makefile#4 integrate
.. //depot/projects/mips/sbin/newfs/mkfs.c#7 integrate
.. //depot/projects/mips/sbin/newfs/newfs.c#5 integrate
.. //depot/projects/mips/sbin/newfs/newfs.h#4 integrate
.. //depot/projects/mips/sbin/newfs/ref.test#2 integrate
.. //depot/projects/mips/sbin/routed/main.c#2 integrate
.. //depot/projects/mips/secure/lib/libcrypto/Makefile.asm#3 integrate
.. //depot/projects/mips/share/examples/etc/make.conf#8 integrate
.. //depot/projects/mips/share/examples/ipfw/change_rules.sh#2 integrate
.. //depot/projects/mips/share/man/man4/Makefile#8 integrate
.. //depot/projects/mips/share/man/man4/an.4#2 integrate
.. //depot/projects/mips/share/man/man4/aue.4#2 integrate
.. //depot/projects/mips/share/man/man4/awi.4#2 integrate
.. //depot/projects/mips/share/man/man4/bge.4#2 integrate
.. //depot/projects/mips/share/man/man4/cue.4#2 integrate
.. //depot/projects/mips/share/man/man4/dc.4#2 integrate
.. //depot/projects/mips/share/man/man4/devctl.4#2 integrate
.. //depot/projects/mips/share/man/man4/ed.4#2 integrate
.. //depot/projects/mips/share/man/man4/firewire.4#5 integrate
.. //depot/projects/mips/share/man/man4/fwe.4#3 integrate
.. //depot/projects/mips/share/man/man4/fwohci.4#4 integrate
.. //depot/projects/mips/share/man/man4/fxp.4#2 integrate
.. //depot/projects/mips/share/man/man4/kue.4#2 integrate
.. //depot/projects/mips/share/man/man4/miibus.4#1 branch
.. //depot/projects/mips/share/man/man4/pcn.4#2 integrate
.. //depot/projects/mips/share/man/man4/rl.4#3 integrate
.. //depot/projects/mips/share/man/man4/sbp.4#5 integrate
.. //depot/projects/mips/share/man/man4/sf.4#2 integrate
.. //depot/projects/mips/share/man/man4/sis.4#2 integrate
.. //depot/projects/mips/share/man/man4/ste.4#2 integrate
.. //depot/projects/mips/share/man/man4/tl.4#2 integrate
.. //depot/projects/mips/share/man/man4/txp.4#2 integrate
.. //depot/projects/mips/share/man/man4/usb.4#5 integrate
.. //depot/projects/mips/share/man/man4/vr.4#2 integrate
.. //depot/projects/mips/share/man/man4/wb.4#2 integrate
.. //depot/projects/mips/share/man/man4/wi.4#4 integrate
.. //depot/projects/mips/share/man/man4/xl.4#2 integrate
.. //depot/projects/mips/share/man/man5/make.conf.5#9 integrate
.. //depot/projects/mips/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/mips/sys/alpha/alpha/pmap.c#8 integrate
.. //depot/projects/mips/sys/alpha/conf/GENERIC#7 integrate
.. //depot/projects/mips/sys/boot/Makefile#2 integrate
.. //depot/projects/mips/sys/cam/scsi/scsi_da.c#8 integrate
.. //depot/projects/mips/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/mips/sys/conf/NOTES#12 integrate
.. //depot/projects/mips/sys/conf/files#16 integrate
.. //depot/projects/mips/sys/conf/files.alpha#5 integrate
.. //depot/projects/mips/sys/conf/files.i386#9 integrate
.. //depot/projects/mips/sys/conf/files.pc98#9 integrate
.. //depot/projects/mips/sys/contrib/dev/fla/fla.c#3 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/fil.c#3 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/mips/sys/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/mips/sys/dev/acpica/acpi.c#7 integrate
.. //depot/projects/mips/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/mips/sys/dev/acpica/acpi_battery.c#3 integrate
.. //depot/projects/mips/sys/dev/acpica/acpi_cmbat.c#3 integrate
.. //depot/projects/mips/sys/dev/ata/ata-all.c#7 integrate
.. //depot/projects/mips/sys/dev/cardbus/cardbus.c#8 integrate
.. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#8 integrate
.. //depot/projects/mips/sys/dev/ccd/ccd.c#4 integrate
.. //depot/projects/mips/sys/dev/ep/if_ep_isa.c#2 integrate
.. //depot/projects/mips/sys/dev/exca/exca.c#3 integrate
.. //depot/projects/mips/sys/dev/exca/excareg.h#2 integrate
.. //depot/projects/mips/sys/dev/exca/excavar.h#3 integrate
.. //depot/projects/mips/sys/dev/firewire/firewire.c#9 integrate
.. //depot/projects/mips/sys/dev/firewire/firewirereg.h#6 integrate
.. //depot/projects/mips/sys/dev/firewire/fwohci.c#9 integrate
.. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#8 integrate
.. //depot/projects/mips/sys/dev/firewire/sbp.c#8 integrate
.. //depot/projects/mips/sys/dev/md/md.c#8 integrate
.. //depot/projects/mips/sys/dev/mly/mly.c#6 integrate
.. //depot/projects/mips/sys/dev/pccard/pccarddevs#7 integrate
.. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#7 integrate
.. //depot/projects/mips/sys/dev/pccbb/pccbb.c#6 integrate
.. //depot/projects/mips/sys/dev/sound/pcm/dsp.c#3 integrate
.. //depot/projects/mips/sys/dev/syscons/apm/apm_saver.c#2 integrate
.. //depot/projects/mips/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/mips/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/mips/sys/dev/usb/usbdevs.h#6 integrate
.. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#6 integrate
.. //depot/projects/mips/sys/dev/usb/uvscom.c#5 integrate
.. //depot/projects/mips/sys/dev/vinum/vinum.c#3 integrate
.. //depot/projects/mips/sys/dev/wi/if_wi_pccard.c#5 integrate
.. //depot/projects/mips/sys/fs/specfs/spec_vnops.c#7 integrate
.. //depot/projects/mips/sys/geom/bde/g_bde.c#5 integrate
.. //depot/projects/mips/sys/geom/geom.h#10 integrate
.. //depot/projects/mips/sys/geom/geom_dev.c#9 integrate
.. //depot/projects/mips/sys/geom/geom_disk.c#8 integrate
.. //depot/projects/mips/sys/geom/geom_int.h#4 integrate
.. //depot/projects/mips/sys/geom/geom_io.c#8 integrate
.. //depot/projects/mips/sys/geom/geom_kern.c#8 integrate
.. //depot/projects/mips/sys/geom/geom_mbr.c#6 integrate
.. //depot/projects/mips/sys/geom/geom_slice.c#7 integrate
.. //depot/projects/mips/sys/geom/geom_stats.c#2 integrate
.. //depot/projects/mips/sys/geom/geom_stats.h#2 integrate
.. //depot/projects/mips/sys/geom/geom_subr.c#8 integrate
.. //depot/projects/mips/sys/geom/notes#2 integrate
.. //depot/projects/mips/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/mips/sys/i386/conf/NOTES#8 integrate
.. //depot/projects/mips/sys/i386/conf/OLDCARD#6 integrate
.. //depot/projects/mips/sys/i386/i386/pmap.c#9 integrate
.. //depot/projects/mips/sys/i386/isa/clock.c#5 integrate
.. //depot/projects/mips/sys/ia64/conf/GENERIC#11 integrate
.. //depot/projects/mips/sys/ia64/ia64/pmap.c#11 integrate
.. //depot/projects/mips/sys/kern/init_main.c#8 integrate
.. //depot/projects/mips/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/mips/sys/kern/kern_event.c#4 integrate
.. //depot/projects/mips/sys/kern/kern_exit.c#8 integrate
.. //depot/projects/mips/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/mips/sys/kern/kern_resource.c#6 integrate
.. //depot/projects/mips/sys/kern/kern_shutdown.c#7 integrate
.. //depot/projects/mips/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/mips/sys/kern/kern_synch.c#7 integrate
.. //depot/projects/mips/sys/kern/subr_mbuf.c#5 integrate
.. //depot/projects/mips/sys/kern/subr_mchain.c#5 integrate
.. //depot/projects/mips/sys/kern/subr_rman.c#4 integrate
.. //depot/projects/mips/sys/kern/subr_witness.c#9 integrate
.. //depot/projects/mips/sys/kern/sys_pipe.c#5 integrate
.. //depot/projects/mips/sys/kern/sys_socket.c#5 integrate
.. //depot/projects/mips/sys/kern/uipc_usrreq.c#7 integrate
.. //depot/projects/mips/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/mips/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/mips/sys/kern/vfs_vnops.c#5 integrate
.. //depot/projects/mips/sys/libkern/ia64/__moddi3.S#3 integrate
.. //depot/projects/mips/sys/libkern/ia64/__umoddi3.S#3 integrate
.. //depot/projects/mips/sys/modules/Makefile#10 integrate
.. //depot/projects/mips/sys/modules/agp/Makefile#3 integrate
.. //depot/projects/mips/sys/modules/firewire/firewire/Makefile#5 integrate
.. //depot/projects/mips/sys/net/bridge.c#6 integrate
.. //depot/projects/mips/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/mips/sys/netinet/raw_ip.c#8 integrate
.. //depot/projects/mips/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/mips/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/mips/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/mips/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/mips/sys/netncp/ncp_ncp.c#3 integrate
.. //depot/projects/mips/sys/netsmb/smb_subr.c#4 integrate
.. //depot/projects/mips/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/mips/sys/pc98/conf/GENERIC#10 integrate
.. //depot/projects/mips/sys/pc98/pc98/clock.c#4 integrate
.. //depot/projects/mips/sys/pci/agp.c#4 integrate
.. //depot/projects/mips/sys/pci/agp_i810.c#4 integrate
.. //depot/projects/mips/sys/pci/agpreg.h#2 integrate
.. //depot/projects/mips/sys/pci/if_dc.c#8 integrate
.. //depot/projects/mips/sys/powerpc/conf/GENERIC#8 integrate
.. //depot/projects/mips/sys/powerpc/powerpc/in_cksum.c#2 integrate
.. //depot/projects/mips/sys/sparc64/conf/GENERIC#9 integrate
.. //depot/projects/mips/sys/sys/bio.h#4 integrate
.. //depot/projects/mips/sys/sys/conf.h#5 integrate
.. //depot/projects/mips/sys/sys/disk.h#3 integrate
.. //depot/projects/mips/sys/sys/file.h#3 integrate
.. //depot/projects/mips/sys/sys/filedesc.h#3 integrate
.. //depot/projects/mips/sys/sys/link_elf.h#2 integrate
.. //depot/projects/mips/sys/sys/rman.h#3 integrate
.. //depot/projects/mips/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/mips/sys/ufs/ffs/ffs_balloc.c#4 integrate
.. //depot/projects/mips/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/mips/sys/vm/pmap.h#4 integrate
.. //depot/projects/mips/sys/vm/vm_kern.h#2 integrate
.. //depot/projects/mips/sys/vm/vm_map.c#8 integrate
.. //depot/projects/mips/tools/tools/tinderbox/Makefile#1 branch
.. //depot/projects/mips/tools/tools/tinderbox/make.conf#2 delete
.. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#1 branch
.. //depot/projects/mips/tools/tools/tinderbox/tinderbox.pl#1 branch
.. //depot/projects/mips/tools/tools/tinderbox/tinderbox.sh#2 delete
.. //depot/projects/mips/tools/tools/whereintheworld/whereintheworld.pl#2 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.birthday#4 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.history#3 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.lotr#1 branch
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.world#2 integrate
.. //depot/projects/mips/usr.bin/file/config.h#2 integrate
.. //depot/projects/mips/usr.bin/yacc/skeleton.c#3 integrate
.. //depot/projects/mips/usr.sbin/boot98cfg/boot98cfg.c#2 integrate
.. //depot/projects/mips/usr.sbin/inetd/inetd.c#4 integrate
.. //depot/projects/mips/usr.sbin/keyserv/keyserv.c#2 integrate
.. //depot/projects/mips/usr.sbin/pw/pw_user.c#3 integrate
.. //depot/projects/mips/usr.sbin/route6d/route6d.c#3 integrate
.. //depot/projects/mips/usr.sbin/rtadvd/rtadvd.c#2 integrate
.. //depot/projects/mips/usr.sbin/rtsold/Makefile#2 integrate
.. //depot/projects/mips/usr.sbin/syslogd/syslog.conf.5#4 integrate
.. //depot/projects/mips/usr.sbin/syslogd/syslogd.c#5 integrate

Differences ...

==== //depot/projects/mips/Makefile.inc1#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.316 2003/02/07 07:29:57 jkoshy Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.317 2003/02/11 19:21:13 trhodes Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS4 to build KerberosIV
@@ -7,6 +7,7 @@
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
 #	-DNOCRYPT will prevent building of crypt versions
+#	-DNOMAN do not build the manual pages
 #	-DNOPROFILE do not build profiled libraries
 #	-DNOSECURE do not go into secure subdir
 #	-DNOGAMES do not go into games subdir

==== //depot/projects/mips/UPDATING#8 (text+ko) ====

@@ -916,7 +916,8 @@
 	the config file update procedure.
 		http://people.freebsd.org/~imp/config-upd.html
 	NOTE: LINT is gone.  It has been replaced with NOTES.  NOTES
-	isn't buildable.  However, you can generate a LINT file.
+	isn't buildable.  However, you can generate a LINT file:
+		cd /sys/<ARCH>/conf && make LINT
 
 20000620:
 	Binutils 2.10 have hit the tree, or will shortly.  As soon
@@ -1231,4 +1232,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.242 2003/02/09 13:02:57 schweikh Exp $
+$FreeBSD: src/UPDATING,v 1.243 2003/02/13 17:55:12 obrien Exp $

==== //depot/projects/mips/bin/sh/memalloc.c#2 (text+ko) ====

@@ -40,13 +40,14 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.19 2002/06/30 05:15:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.20 2003/02/14 23:53:19 tjr Exp $");
+
+#include <sys/param.h>
 
 #include "shell.h"
 #include "output.h"
 #include "memalloc.h"
 #include "error.h"
-#include "machdep.h"
 #include "mystring.h"
 #include "expand.h"
 #include <stdlib.h>

==== //depot/projects/mips/bin/sh/nodes.c.pat#2 (text+ko) ====

@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.8 2002/02/02 06:50:47 imp Exp $
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.9 2003/02/14 23:53:19 tjr Exp $
  */
 
+#include <sys/param.h>
+
 #include <stdlib.h>
 /*
  * Routine for dealing with parsed shell commands.
@@ -45,7 +47,6 @@
 #include "shell.h"
 #include "nodes.h"
 #include "memalloc.h"
-#include "machdep.h"
 #include "mystring.h"
 
 

==== //depot/projects/mips/contrib/file/Magdir/archive#2 (text+ko) ====

@@ -231,10 +231,10 @@
 2       string          -pms-           PMarc SFX archive (CP/M, DOS)
 5       string          -pc1-           PopCom compressed executable (CP/M)
 
-# From rafael@icp.inpg.fr (Rafael Laboissiere) 
+# From Rafael Laboissiere <rafael@laboissiere.net>
 # The Project Revision Control System (see
-# http://www.XCF.Berkeley.EDU/~jmacd/prcs.html) generates a packaged project
-# file which is recognized by the following entry:
+# http://prcs.sourceforge.net) generates a packaged project
+# file which is recognized by the following entry: 
 0	leshort		0xeb81	PRCS packaged project
 
 # Microsoft cabinets 

==== //depot/projects/mips/contrib/file/Magdir/audio#2 (text+ko) ====

@@ -157,7 +157,90 @@
 # Impuse tracker module (audio/x-it)
 0	string		IMPM		Impulse Tracker module sound data -
 >4	string		>\0		"%s"
+>40	leshort		!0		compatible w/ITv%x
+>42	leshort		!0		created w/ITv%x
 
 # Imago Orpheus module (audio/x-imf)
 60	string		IM10		Imago Orpheus module sound data -
 >0	string		>\0		"%s"
+
+# From <collver1@attbi.com>
+# These are the /etc/magic entries to decode modules, instruments, and
+# samples in Impulse Tracker's native format.
+
+0	string		IMPS		Impulse Tracker Sample
+>18	byte		&2		16 bit
+>18	byte		^2		8 bit
+>18	byte		&4		stereo
+>18	byte		^4		mono
+0	string		IMPI		Impulse Tracker Instrument
+>28	leshort		!0		ITv%x
+>30	byte		!0		%d samples
+
+# Yamaha TX Wave:  file(1) magic for Yamaha TX Wave audio files
+# From <collver1@attbi.com>
+0	string		LM8953		Yamaha TX Wave
+>22	byte		0x49		looped
+>22	byte		0xC9		non-looped
+>23	byte		1		33kHz
+>23	byte		2		50kHz
+>23	byte		3		16kHz
+
+# scream tracker:  file(1) magic for Scream Tracker sample files
+#
+# From <collver1@attbi.com>
+76	string		SCRS		Scream Tracker Sample
+>0	byte		1		sample
+>0	byte		2		adlib melody
+>0	byte		>2		adlib drum
+>31	byte		&2		stereo
+>31	byte		^2		mono
+>31	byte		&4		16bit little endian
+>31	byte		^4		8bit
+>30	byte		0		unpacked
+>30	byte		1		packed
+
+# audio
+# From: Cory Dikkers <cdikkers@swbell.net>
+0	string		MMD0		MED music file, version 0
+0	string		MMD1		OctaMED Pro music file, version 1
+0	string		MMD3		OctaMED Soundstudio music file, version 3
+0	string		OctaMEDCmpr	OctaMED Soundstudio compressed file
+0	string		MED		MED_Song
+0	string		SymM		Symphonie SymMOD music file
+#
+0	string		THX		AHX version
+>3	byte		=0		1 module data
+>3	byte		=1		2 module data
+#
+0	string		OKTASONG	Oktalyzer module data
+#
+0	string		DIGI\ Booster\ module\0	%s
+>20	byte		>0		%c
+>>21	byte		>0		\b%c
+>>>22	byte		>0		\b%c
+>>>>23	byte		>0		\b%c
+>610	string		>\0		\b, "%s"
+#
+0	string		DBM0	   	DIGI Booster Pro Module
+>4	byte		>0		V%X.
+>>5	byte		x		\b%02X
+>16	string		>\0		\b, "%s"
+#
+0	string		FTMN		FaceTheMusic module
+>16	string		>\0d		\b, "%s"
+
+# From: Takeshi Hamasaki <hma@syd.odn.ne.jp>
+# NOA Nancy Codec file
+0	string		\210NOA\015\012\032	NOA Nancy Codec Movie file
+# Yamaha SMAF format
+0	string		MMMD		Yamaha SMAF file
+# Sharp Jisaku Melody format for PDC
+0	string		\001Sharp\040JisakuMelody	SHARP Cell-Phone ringing Melody
+>20	string		Ver01.00	Ver. 1.00
+>>32	byte		x		, %d tracks
+
+# FLAC audio stream <URL:http://flac.sourceforge.net/>;
+# From: Dan Fandrich <dan@coneharvesters.com>
+0	string		fLaC		FLAC audio stream data
+

==== //depot/projects/mips/contrib/file/Magdir/compress#2 (text+ko) ====

@@ -152,3 +152,20 @@
 # 4.3BSD-Quasijarus Strong Compression
 # http://minnie.tuhs.org/Quasijarus/compress.html
 0	string		\037\241	Quasijarus strong compressed data
+
+# From: Cory Dikkers <cdikkers@swbell.net>
+0	string		XPKF		Amiga xpkf.library compressed data
+0	string		PP11		Power Packer 1.1 compressed data
+0	string		PP20		Power Packer 2.0 compressed data,
+>4	belong		0x09090909	fast compression
+>4	belong		0x090A0A0A	mediocre compression
+>4	belong		0x090A0B0B	good compression
+>4	belong		0x090A0C0C	very good compression
+>4	belong		0x090A0C0D	best compression
+
+# 7z archiver, from Thomas Klausner (wiz@danbala.tuwien.ac.at)
+# http://www.7-zip.org or DOC/7zFormat.txt 
+#
+0	string		7z\274\257\047\034	7z archive data,
+>6	byte		x			version %d
+>7	byte		x			\b.%d

==== //depot/projects/mips/contrib/file/Magdir/ctags#2 (text+ko) ====

@@ -2,4 +2,4 @@
 # ----------------------------------------------------------------------------
 # ctags:  file (1) magic for Exuberant Ctags files
 # From: Alexander Mai <mai@migdal.ikp.physik.tu-darmstadt.de>
-0       string  !_TAG   Exuberant Ctags tag file
+0       string  !_TAG   Exuberant Ctags tag file text

==== //depot/projects/mips/contrib/file/Magdir/filesystems#2 (text+ko) ====

@@ -25,33 +25,108 @@
 >512    belong&077777777	0600407	\b, boot block present
 0x1FE	leshort	0xAA55			x86 boot sector
 >2	string	OSBS			\b, OS/BS MBR
-# J\xf6rg Jenderek <joerg@pcialias.localnet>
+# J\xf6rg Jenderek <joerg.jenderek@gmx.net>
 >0x8C	string	Invalid\ partition\ table	\b, MS-DOS MBR
 >0x9D	string	Invalid\ partition\ table	\b, DR-DOS MBR, version 7.01 to 7.03
 >0x10F	string	Ung\201ltige\ Partitionstabelle	\b, MS-DOS MBR, german version 4.10.1998, 4.10.2222
 >0x8B	string	Ung\201ltige\ Partitionstabelle	\b, MS-DOS MBR, german version 5.00 to 4.00.950
 >0x145	string	Default:\ F			\b, FREE-DOS MBR
 >0	string	\0\0\0\0		\b, extended partition table
->0	leshort 0x3CEB			\b, system
->>3	string	>\0			%s
->>0x36	string	FAT			\b, %s
->>>0x39	string	12			(%s bit)
->>>0x39	string	16			(%s bit)
->0x52	string	FAT32			\b, FAT (32 bit)
->>>43	string		>NO\ NAME	label: %.11s,
->>>43	string		<NO\ NAME	label: %.11s,
->>>43	string		NO\ NAME	unlabeled,
->>>19	leshort		>0		%d sectors
->>>19	leshort		0		
->>>>32	lelong		x		%d sectors
+# JuMP short     bootcodeoffset NOP assembler instructions will usually be EB xx 90
+# older drives may use E9 xx xx
+>0		lelong&0x009000EB	0x009000EB 
+>0		lelong&0x000000E9	0x000000E9 
+>>1		ubyte			>37	\b, code offset 0x%x
+# mtools-3.9.8/msdos.h
+# usual values are marked with comments to get only informations of strange FAT systems
+# valid sectorsize are from 32 to 2048
+>>>11		uleshort	<2049	
+>>>>11		uleshort	>31	
+>>>>>3		string		>\0		\b, OEM-ID "%8.8s"
+>>>>>11		uleshort	>512		\b, Bytes/sector %u
+#>>>>>11	uleshort	=512		\b, Bytes/sector %u=512 (usual)
+>>>>>11		uleshort	<512		\b, Bytes/sector %u
+>>>>>13		ubyte		>1		\b, sectors/cluster %u
+#>>>>>13	ubyte		=1		\b, sectors/cluster %u (usual on Floppies)
+>>>>>14		uleshort	>32		\b, reserved sectors %u
+#>>>>>14	uleshort	=32		\b, reserved sectors %u (usual Fat32)
+#>>>>>14	uleshort	>1		\b, reserved sectors %u
+#>>>>>14	uleshort	=1		\b, reserved sectors %u (usual FAT12,FAT16)
+>>>>>14		uleshort	<1		\b, reserved sectors %u
+>>>>>16		ubyte		>2		\b, FATs %u
+#>>>>>16	ubyte		=2		\b, FATs %u (usual)
+>>>>>16		ubyte		=1		\b, FAT  %u
+>>>>>16		ubyte		>0
+>>>>>17		uleshort	>0		\b, root entries %u
+#>>>>>17	uleshort	=0		\b, root entries %u=0 (usual Fat32)
+>>>>>19		uleshort	>0		\b, sectors %u (volumes <=32 MB) 
+#>>>>>19	uleshort	=0		\b, sectors %u=0 (usual Fat32)
+>>>>>21		ubyte		>0xF0		\b, Media descriptor 0x%x
+#>>>>>21	ubyte		=0xF0		\b, Media descriptor 0x%x (usual floppy)
+>>>>>21		ubyte		<0xF0		\b, Media descriptor 0x%x
+>>>>>22		uleshort	>0		\b, sectors/FAT %u
+#>>>>>22	uleshort	=0		\b, sectors/FAT %u=0 (usual Fat32)
+>>>>>26		ubyte		>2		\b, heads %u
+#>>>>>26	ubyte		=2		\b, heads %u (usual floppy)
+>>>>>26		ubyte		=1		\b, heads %u
+>>>>>28		ulelong		>0		\b, hidden sectors %u
+#>>>>>28	ulelong		=0		\b, hidden sectors %u (usual floppy)
+>>>>>32		ulelong		>0		\b, sectors %u (volumes > 32 MB) 
+#>>>>>32	ulelong		=0		\b, sectors %u (volumes > 32 MB) 
+# FAT<32 specific 
+# NOT le FAT3=NOT 3TAF=0xCCABBEB9
+>>>>>82		ulelong&0xCCABBEB9	>0
+>>>>>>36	ubyte		>0x80		\b, physical drive 0x%x
+#>>>>>>36	ubyte		=0x80		\b, physical drive 0x%x=0x80 (usual harddisk)
+>>>>>>36	ubyte&0x7F	>0		\b, physical drive 0x%x
+#>>>>>>36	ubyte		=0		\b, physical drive 0x%x=0 (usual floppy)
+>>>>>>37	ubyte		>0		\b, reserved 0x%x
+#>>>>>>37	ubyte		=0		\b, reserved 0x%x
+>>>>>>38	ubyte		>0x29		\b, dos < 4.0 BootSector (0x%x)
+>>>>>>38	ubyte		<0x29		\b, dos < 4.0 BootSector (0x%x)
+>>>>>>38	ubyte		=0x29
+>>>>>>>39	ulelong		x		\b, serial number 0x%x
+>>>>>>>43	string		<NO\ NAME	\b, label: "%11.11s"
+>>>>>>>43	string		>NO\ NAME	\b, label: "%11.11s"
+>>>>>>>43	string		=NO\ NAME	\b, unlabeled
+>>>>>>54	string		FAT1		\b, FAT
+>>>>>>>54	string		FAT12		\b (12 bit)
+>>>>>>>54	string		FAT16		\b (16 bit)
+# FAT32 specific
+>>>>>82		string		FAT32		\b, FAT (32 bit)
+>>>>>>36	ulelong		x		\b, sectors/FAT %u
+>>>>>>40	uleshort	>0		\b, extension flags %u
+#>>>>>>40	uleshort	=0		\b, extension flags %u
+>>>>>>42	uleshort	>0		\b, fsVersion %u
+#>>>>>>42	uleshort	=0		\b, fsVersion %u (usual)
+>>>>>>44	ulelong		>2		\b, rootdir cluster %u
+#>>>>>>44	ulelong		=2		\b, rootdir cluster %u
+#>>>>>>44	ulelong		=1		\b, rootdir cluster %u
+>>>>>>48	uleshort	>1		\b, infoSector %u
+#>>>>>>48	uleshort	=1		\b, infoSector %u (usual)
+>>>>>>48	uleshort	<1		\b, infoSector %u
+>>>>>>50	uleshort	>6		\b, Backup boot sector %u
+#>>>>>>50	uleshort	=6		\b, Backup boot sector %u (usual) 
+>>>>>>50	uleshort	<6		\b, Backup boot sector %u
+>>>>>>54	ulelong		>0		\b, reserved1 0x%x
+>>>>>>58	ulelong		>0		\b, reserved2 0x%x
+>>>>>>62	ulelong		>0		\b, reserved3 0x%x
+# same structure as FAT1X 
+>>>>>>64	ubyte		>0x80		\b, physical drive 0x%x
+#>>>>>>64	ubyte		=0x80		\b, physical drive 0x%x=80 (usual harddisk)
+>>>>>>64	ubyte&0x7F	>0		\b, physical drive 0x%x
+#>>>>>>64	ubyte		=0		\b, physical drive 0x%x=0 (usual floppy)
+>>>>>>65	ubyte		>0		\b, reserved 0x%x
+>>>>>>66	ubyte		>0x29		\b, dos < 4.0 BootSector (0x%x)
+>>>>>>66	ubyte		<0x29		\b, dos < 4.0 BootSector (0x%x)
+>>>>>>66	ubyte		=0x29
+>>>>>>>67	ulelong		x		\b, serial number 0x%x
+>>>>>>>71	string		<NO\ NAME	\b, label: "%11.11s"
+>>>>>>71	string		>NO\ NAME	\b, label: "%11.11s"
+>>>>>>71	string		=NO\ NAME	\b, unlabeled
+### FATs end
 >0x200	lelong	0x82564557		\b, BSD disklabel
 
-# Solaris 7 FAT12 floppies J\xf6rg Jenderek <joerg@pcialias.localnet>
->0	leshort 0x7AEB			\b, system
->>3	string	>\0			%s
->>0x36	string	FAT			\b, %s
->>>0x39	string	12			(%s bit)
-
 # Minix filesystems - Juan Cespedes <cespedes@debian.org>
 0x410	leshort		0x137f		Minix filesystem
 0x410	beshort		0x137f		Minix filesystem (big endian),

==== //depot/projects/mips/contrib/file/Magdir/flash#2 (text+ko) ====

@@ -8,3 +8,6 @@
 #
 0	string		FWS		Macromedia Flash data,
 >3	byte		x		version %d
+#
+# From Dave Wilson
+0	string AGD4\xbe\xb8\xbb\xcb\x00	Macromedia Freehand 9 Document

==== //depot/projects/mips/contrib/file/Magdir/gringotts#2 (text+ko) ====

@@ -3,10 +3,30 @@
 # gringotts:  file(1) magic for Gringotts
 # http://devel.pluto.linux.it/projects/Gringotts/
 # author: Germano Rizzo <mano@pluto.linux.it>
-#GRG2????Y
+#GRG3????Y
 0	string	GRG		Gringotts data file
->3	string		1		v.1, SERPENT crypt, SHA-256 hash, ZLib lvl.9
->3	string		2		v.2,
+#file format 1
+>3	string		1		v.1, MCRYPT S2K, SERPENT crypt, SHA-256 hash, ZLib lvl.9
+#file format 2
+>3	string		2		v.2, MCRYPT S2K, 
+>>8	byte&0x70	0x00		RIJNDAEL-128 crypt,
+>>8	byte&0x70	0x10		SERPENT crypt,
+>>8	byte&0x70	0x20		TWOFISH crypt, 
+>>8	byte&0x70	0x30		CAST-256 crypt,
+>>8	byte&0x70	0x40		SAFER+ crypt,
+>>8	byte&0x70	0x50		LOKI97 crypt,
+>>8	byte&0x70	0x60		3DES crypt,
+>>8	byte&0x70	0x70		RIJNDAEL-256 crypt,
+>>8	byte&0x08	0x00		SHA1 hash,
+>>8	byte&0x08	0x08		RIPEMD-160 hash,
+>>8	byte&0x04	0x00		ZLib
+>>8	byte&0x04	0x04		BZip2
+>>8	byte&0x03	0x00		lvl.0
+>>8	byte&0x03	0x01		lvl.3
+>>8	byte&0x03	0x02		lvl.6
+>>8	byte&0x03	0x03		lvl.9
+#file format 3
+>3	string		3		v.3, OpenPGP S2K, 
 >>8	byte&0x70	0x00		RIJNDAEL-128 crypt,
 >>8	byte&0x70	0x10		SERPENT crypt,
 >>8	byte&0x70	0x20		TWOFISH crypt, 
@@ -23,3 +43,5 @@
 >>8	byte&0x03	0x01		lvl.3
 >>8	byte&0x03	0x02		lvl.6
 >>8	byte&0x03	0x03		lvl.9
+#file format >3
+>3	string		>3		v.%.1s (unknown details)

==== //depot/projects/mips/contrib/file/Magdir/hp#2 (text+ko) ====

@@ -389,3 +389,7 @@
 >>>>>>>>>0xC4	belong	12		- received SIGSYS
 >>>>>>>>>0xC4	belong	33		- received SIGXCPU
 >>>>>>>>>0xC4	belong	34		- received SIGXFSZ
+
+# From: AMAKAWA Shuhei <sa264@cam.ac.uk>
+0	string	HPHP49-			HP49 binary
+

==== //depot/projects/mips/contrib/file/Magdir/images#2 (text+ko) ====

@@ -142,7 +142,10 @@
 1	string		PC\ Research,\ Inc	group 3 fax data
 >29	byte		0		\b, normal resolution (204x98 DPI)
 >29	byte		1		\b, fine resolution (204x196 DPI)
+# From: Herbert Rosmanith <herp@wildsau.idv.uni.linz.at>
+0	string		Sfff		structured fax file
 
+
 # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
 0	string		BM		PC bitmap data
 >14	leshort		12		\b, OS/2 1.x format
@@ -333,3 +336,26 @@
 # of various EPOC file formats
 
 0	string \x37\x00\x00\x10\x42\x00\x00\x10\x00\x00\x00\x00\x39\x64\x39\x47 EPOC MBM image file
+
+# PCX image files
+# From: Dan Fandrich <dan@coneharvesters.com>
+0	beshort		0x0a00	PCX ver. 2.5 image data
+0	beshort		0x0a02	PCX ver. 2.8 image data, with palette
+0	beshort		0x0a03	PCX ver. 2.8 image data, without palette
+0	beshort		0x0a04	PCX for Windows image data
+0	beshort		0x0a05	PCX ver. 3.0 image data
+>4	leshort		x      bounding box [%hd,
+>6	leshort		x      %hd] -
+>8	leshort		x      [%hd,
+>10	leshort		x      %hd],
+>65	byte		>1	%d planes each of
+>3	byte		x	%hhd-bit
+>68	byte		0	image,
+>68	byte		1	colour,
+>68	byte		2	grayscale,
+>68	byte		>2	image,
+>68	byte		<0	image,
+>12	leshort		>0	%hd x
+>>14	leshort		x      %hd dpi,
+>2	byte		0	uncompressed
+>2	byte		1	RLE compressed

==== //depot/projects/mips/contrib/file/Magdir/lisp#2 (text+ko) ====

@@ -27,3 +27,6 @@
 
 #.com and .bin for MIT scheme 
 0	string	\372\372\372\372	MIT scheme (library?)
+
+# From: David Allouche <david@allouche.net>
+0	string	\<TeXmacs|	TeXmacs document text

==== //depot/projects/mips/contrib/file/Magdir/msdos#2 (text+ko) ====

@@ -90,6 +90,8 @@
 >>122	string	Windows\ self-extracting\ ZIP	\b, %s
 >0x1c	string	RJSX\xff\xff	\b, ARJ SFX
 >0x1c	string	diet\xf9\x9c	\b, diet compressed
+>0x1c	string	LZ09		\b, LZEXE v0.90 compressed
+>0x1c	string	LZ91		\b, LZEXE v0.91 compressed
 >0x1e	string	Copyright\ 1989-1990\ PKWARE\ Inc.	\b, PKSFX
 # JM: 0x1e "PKLITE Copr. 1990-92 PKWARE Inc. All Rights Reserved\7\0\0\0"
 >0x1e	string	PKLITE\ Copr.	\b, %.6s compressed

==== //depot/projects/mips/contrib/file/Magdir/python#2 (text+ko) ====

@@ -1,5 +1,14 @@
+
+#------------------------------------------------------------------------------
+# python:  file(1) magic for python
+#
+# From: David Necas <yeti@physics.muni.cz>
 # often the module starts with a multiline string
 0	string		"""	a python script text executable
-# MAGIC as specified in Python/import.c (1.5.2/1.6)
+# MAGIC as specified in Python/import.c (1.5 to 2.3.0a)
 # 20121  ( YEAR - 1995 ) + MONTH  + DAY (little endian followed by "\r\n"
-0	belong		0x994e0d0a	python compiled
+0	belong		0x994e0d0a	python 1.5/1.6 byte-compiled
+0	belong		0x87c60d0a	python 2.0 byte-compiled
+0	belong		0x2aeb0d0a	python 2.1 byte-compiled
+0	belong		0x2ded0d0a	python 2.2 byte-compiled
+#0	belong		0x31f20d0a	python 2.3 byte-compiled

==== //depot/projects/mips/contrib/file/Magdir/sgml#2 (text+ko) ====

@@ -5,16 +5,23 @@
 # from Daniel Quinlan (quinlan@yggdrasil.com)
 # adapted to string extenstions by Anthon van der Neut <anthon@mnt.org)
 0   string/cB	\<!doctype\ html	HTML document text
-0   string/c	\<head			HTML document text
-0   string/c	\<title			HTML document text
-0   string/c	\<html			HTML document text
+0   string/cb	\<head			HTML document text
+0   string/cb	\<title			HTML document text
+0   string/cb	\<html			HTML document text
 
 # Extensible markup language (XML), a subset of SGML
 # from Marc Prud'hommeaux (marc@apocalypse.org)
-0   string/c	\<?xml			XML document text
+0   string/cb	\<?xml			XML document text
 
 
 # SGML, mostly from rph@sq
-0   string/c	\<!doctype		exported SGML document text
-0   string/c	\<!subdoc		exported SGML subdocument text
-0   string	\<!--			exported SGML document text
+0   string/cb	\<!doctype		exported SGML document text
+0   string/cb	\<!subdoc		exported SGML subdocument text
+0   string/cb	\<!--			exported SGML document text
+
+# Web browser cookie files
+# (Mozilla, Galeon, Netscape 4, Konqueror..)
+# Ulf Harnhammar <ulfh@update.uu.se>
+0	string	#\ HTTP\ Cookie\ File	Web browser cookie text
+0	string	#\ Netscape\ HTTP\ Cookie\ File	Netscape cookie text
+0	string	#\ KDE\ Cookie\ File	Konqueror cookie text

==== //depot/projects/mips/contrib/file/Magdir/vorbis#2 (text+ko) ====

@@ -32,14 +32,17 @@
 >>>>>44		lelong		!-1
 # Vorbis RC2 has a bug which puts -1000 in the min/max bitrate fields
 # instead of -1.
+# Vorbis 1.0 uses 0 instead of -1.
 >>>>>>44	lelong		!-1000
->>>>>>>44	lelong		x		>%lu
+>>>>>>>44	lelong		!0
+>>>>>>>>44	lelong		x		>%lu
 >>>>>48		lelong		!-1
 >>>>>>48	lelong		x		~%lu
 >>>>>52		lelong		!-1
->>>>>>52	lelong		!-1000
->>>>>>>52	lelong		x		<%lu
->>>>>48		string		<\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff	kbps
+>>>>>>52	lelong		!0
+>>>>>>>52	lelong		!-1000
+>>>>>>>>52	lelong		x		<%lu
+>>>>>48		string		<\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff	bps
 # -- Second vorbis header packet - the comments
 # A kludge to read the vendor string.  It's a counted string, not a
 # zero-terminated one, so file(1) can't read it in a generic way.
@@ -67,10 +70,10 @@
 >>>>>>(84.b+120)	string		20011014	(RC2 - Garf tuned v2)
 >>>>>>(84.b+120)	string		20011217	(pre-RC3 CVS)
 >>>>>>(84.b+120)	string		20011231	(RC3)
-# The string has not changed from beta1 to 2 - they are indistinguishable.
-# Then come the comments, again length-counted (and number-counted).
-# Some looping constructs and registers would allow reading them but now
-# it's impossible.  However we can print the number of comments present
-# (skipping by the vendor string length):
-##>>>>(109.l.113)	lelong		0		\b, no comments
-##>>>>(109.l+113)	lelong		>0		\b, %lu comments
+# Some pre-1.0 CVS snapshots still had "Xiphphorus"...
+>>>>>>(84.b+120)	string		>20011231	(pre-1.0 CVS)
+# For the 1.0 release, Xiphophorus is replaced by Xiph.Org
+>>>>(84.b+96)		string/c	Xiph.Org\ libVorbis\ I	\b, created by: Xiph.Org libVorbis I
+>>>>>(84.b+117)		string		>00000000	%.8s
+>>>>>>(84.b+117)	string		<20020717	(pre-1.0 CVS)
+>>>>>>(84.b+117)	string		20020717	(1.0)

==== //depot/projects/mips/contrib/file/Makefile.am#2 (text+ko) ====

@@ -116,7 +116,6 @@
 Magdir/ibm6000 \
 Magdir/iff \
 Magdir/images \
-Magdir/impulse \
 Magdir/intel \
 Magdir/interleaf \
 Magdir/island \

==== //depot/projects/mips/contrib/file/Makefile.in#2 (text+ko) ====

@@ -86,7 +86,7 @@
 
 CLEANFILES = $(man_MANS) magic magic.mgc magic.mime.mgc
 
-magic_FRAGMENTS =  Magdir/acorn Magdir/adi Magdir/adventure Magdir/allegro Magdir/alliant Magdir/alpha Magdir/amanda Magdir/amigaos Magdir/animation Magdir/apl Magdir/apple Magdir/applix Magdir/archive Magdir/asterix Magdir/att3b Magdir/audio Magdir/blender Magdir/blit Magdir/bsdi Magdir/c-lang Magdir/cddb Magdir/chi Magdir/cisco Magdir/citrus Magdir/claris Magdir/clipper Magdir/commands Magdir/compress Magdir/console Magdir/convex Magdir/ctags Magdir/cvs Magdir/database Magdir/diamond Magdir/diff Magdir/digital Magdir/dolby Magdir/dump Magdir/dyadic Magdir/editors Magdir/elf Magdir/encore Magdir/epoc Magdir/filesystems Magdir/flash Magdir/fonts Magdir/frame Magdir/freebsd Magdir/fsav Magdir/gimp Magdir/gnu Magdir/grace Magdir/gringotts Magdir/hitachi-sh Magdir/hp Magdir/ibm370 Magdir/ibm6000 Magdir/iff Magdir/images Magdir/impulse Magdir/intel Magdir/interleaf Magdir/island Magdir/ispell Magdir/java Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif Magdir/linux M
 agdir/lisp Magdir/mach Magdir/macintosh Magdir/magic Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt Magdir/mime Magdir/mips Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/mlssa Magdir/modem Magdir/motorola Magdir/msdos Magdir/msvc Magdir/natinst Magdir/ncr Magdir/netbsd Magdir/netscape Magdir/news Magdir/nitpicker Magdir/octave Magdir/olf Magdir/os2 Magdir/os9 Magdir/osf1 Magdir/palm Magdir/parix Magdir/pbm Magdir/pdf Magdir/pdp Magdir/perl Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project Magdir/psdbms Magdir/pulsar Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent Magdir/sgml Magdir/sharc Magdir/sketch Magdir/smalltalk Magdir/sniffer Magdir/softquad Magdir/spectrum Magdir/sun Magdir/sysex Magdir/teapot Magdir/terminfo Magdir/tex Magdir/tgif Magdir/ti-8x Magdir/timezone Magdir/troff Magdir/tuxedo Magdir/typeset Magdir/unknown Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/
 vicar Magdir/visx Magdir/vms Magdir/vmware Magdir/vorbis Mag!
dir/vxl Magdir/wordperfect Magdir/xdelta Magdir/xenix Magdir/zilog Magdir/zyxel
+magic_FRAGMENTS =  Magdir/acorn Magdir/adi Magdir/adventure Magdir/allegro Magdir/alliant Magdir/alpha Magdir/amanda Magdir/amigaos Magdir/animation Magdir/apl Magdir/apple Magdir/applix Magdir/archive Magdir/asterix Magdir/att3b Magdir/audio Magdir/blender Magdir/blit Magdir/bsdi Magdir/c-lang Magdir/cddb Magdir/chi Magdir/cisco Magdir/citrus Magdir/claris Magdir/clipper Magdir/commands Magdir/compress Magdir/console Magdir/convex Magdir/ctags Magdir/cvs Magdir/database Magdir/diamond Magdir/diff Magdir/digital Magdir/dolby Magdir/dump Magdir/dyadic Magdir/editors Magdir/elf Magdir/encore Magdir/epoc Magdir/filesystems Magdir/flash Magdir/fonts Magdir/frame Magdir/freebsd Magdir/fsav Magdir/gimp Magdir/gnu Magdir/grace Magdir/gringotts Magdir/hitachi-sh Magdir/hp Magdir/ibm370 Magdir/ibm6000 Magdir/iff Magdir/images Magdir/intel Magdir/interleaf Magdir/island Magdir/ispell Magdir/java Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif Magdir/linux Magdir/lisp Magd
 ir/mach Magdir/macintosh Magdir/magic Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt Magdir/mime Magdir/mips Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/mlssa Magdir/modem Magdir/motorola Magdir/msdos Magdir/msvc Magdir/natinst Magdir/ncr Magdir/netbsd Magdir/netscape Magdir/news Magdir/nitpicker Magdir/octave Magdir/olf Magdir/os2 Magdir/os9 Magdir/osf1 Magdir/palm Magdir/parix Magdir/pbm Magdir/pdf Magdir/pdp Magdir/perl Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project Magdir/psdbms Magdir/pulsar Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent Magdir/sgml Magdir/sharc Magdir/sketch Magdir/smalltalk Magdir/sniffer Magdir/softquad Magdir/spectrum Magdir/sun Magdir/sysex Magdir/teapot Magdir/terminfo Magdir/tex Magdir/tgif Magdir/ti-8x Magdir/timezone Magdir/troff Magdir/tuxedo Magdir/typeset Magdir/unknown Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/vicar Magdir/vi
 sx Magdir/vms Magdir/vmware Magdir/vorbis Magdir/vxl Magdir/!
wordperfect Magdir/xdelta Magdir/xenix Magdir/zilog Magdir/zyxel
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

==== //depot/projects/mips/contrib/file/Makefile.std#2 (text+ko) ====

@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd. 
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile.std,v 1.15 2002/07/03 18:57:52 christos Exp $
+# @(#)$Id: Makefile.std,v 1.16 2003/02/08 18:35:36 christos Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
@@ -22,7 +22,7 @@
 #
 # 4. This notice may not be removed or altered.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302152146.h1FLkYlV091109>