Date: Thu, 25 Apr 2002 23:25:50 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10301 for review Message-ID: <200204260625.g3Q6PoV92957@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10301 Change 10301 by rwatson@rwatson_curry on 2002/04/25 23:25:18 Integ TrustedBSD MAC from TrustedBSD base branch, bringing in various features/fixes, including rename of "bin" distribution to "base" distribution, style/code flow cleanups of VFS code, VFS locking assertion fixes, PAM fixes, etc. Affected files ... ... //depot/projects/trustedbsd/mac/MAINTAINERS#3 integrate ... //depot/projects/trustedbsd/mac/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/UPDATING#11 integrate ... //depot/projects/trustedbsd/mac/bin/expr/expr.1#3 integrate ... //depot/projects/trustedbsd/mac/bin/expr/expr.y#4 integrate ... //depot/projects/trustedbsd/mac/bin/pax/pax.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/sh/options.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#5 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/kinstall#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/fils.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sfil.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipfs.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/l4check.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mlf_ipl.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mls_ipl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/natparse.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printstate.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/solaris.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f11#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f17#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in3#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ipv6.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ipv6.2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1.b#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f11#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f17#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ipv6.2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/intest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/logtest#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/mhtest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f11#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f17#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in3#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ipv6.2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni4.ipf#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni4.nat#1 branch ... //depot/projects/trustedbsd/mac/contrib/smbfs/CREDITS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/HISTORY#3 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/examples/dot.nsmbrc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/smbutil.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/view.c#2 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam.c#2 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#5 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/session.c#9 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#4 integrate ... //depot/projects/trustedbsd/mac/etc/Makefile#11 integrate ... //depot/projects/trustedbsd/mac/etc/mail/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/etc/nsmb.conf#3 integrate ... //depot/projects/trustedbsd/mac/etc/rc#13 integrate ... //depot/projects/trustedbsd/mac/etc/rc.d/wscons#2 integrate ... //depot/projects/trustedbsd/mac/etc/rc.diskless1#5 integrate ... //depot/projects/trustedbsd/mac/etc/rc.sendmail#1 branch ... //depot/projects/trustedbsd/mac/etc/rc.serial#3 integrate ... //depot/projects/trustedbsd/mac/etc/rc.subr#2 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/rc.sendmail#2 delete ... //depot/projects/trustedbsd/mac/games/adventure/setup.c#2 integrate ... //depot/projects/trustedbsd/mac/games/atc/main.c#2 integrate ... //depot/projects/trustedbsd/mac/games/backgammon/common_source/subs.c#2 integrate ... //depot/projects/trustedbsd/mac/games/bs/bs.c#3 integrate ... //depot/projects/trustedbsd/mac/games/canfield/cfscores/cfscores.c#3 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#10 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#4 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.c#4 integrate ... //depot/projects/trustedbsd/mac/include/stdlib.h#7 integrate ... //depot/projects/trustedbsd/mac/kerberos5/lib/libvers/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getnetgrent.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.3#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#6 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/test/guard_b.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libcam/camlib.h#3 integrate ... //depot/projects/trustedbsd/mac/lib/libedit/makelist#2 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/pam_unix.c#8 integrate ... //depot/projects/trustedbsd/mac/libexec/pppoed/pppoed.c#5 integrate ... //depot/projects/trustedbsd/mac/release/Makefile#12 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#3 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#3 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#14 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/tinyware/msh/sh3.c#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/bin-install.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/catpages-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/dict-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/doc-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/driver-copy2.pl#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/driver-remove.pl#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/games-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/info-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/manpages-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/proflibs-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck/fsck.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_ifs/main.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/main.c#3 integrate ... //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#2 integrate ... //depot/projects/trustedbsd/mac/sbin/mount/mount.8#2 integrate ... //depot/projects/trustedbsd/mac/sbin/mount/mount.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/mkfs.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/newfs.8#5 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/newfs.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/newfs.h#3 integrate ... //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#2 integrate ... //depot/projects/trustedbsd/mac/sbin/vinum/list.c#2 integrate ... //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#6 integrate ... //depot/projects/trustedbsd/mac/share/examples/isdn/contrib/answer.c#2 integrate ... //depot/projects/trustedbsd/mac/share/examples/isdn/contrib/isdnctl#2 integrate ... //depot/projects/trustedbsd/mac/share/examples/netgraph/ether.bridge#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/Makefile#10 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ed.4#4 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/tx.4#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/polling.4#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ulpt.4#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#6 integrate ... //depot/projects/trustedbsd/mac/share/man/man8/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.dep.mk#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.doc.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.docb.mk#3 delete ... //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#8 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.man.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.obj.mk#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#7 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.sgml.mk#3 delete ... //depot/projects/trustedbsd/mac/share/mk/bsd.subdir.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/sys.mk#4 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_all.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files#25 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#6 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#5 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_disk.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aacreg.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aacvar.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/dev/puc/puc.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/puc/pucdata.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mem.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_io.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_enc.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_slice.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/sal.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/swtch.s#7 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/include/sal.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/makesyscalls.sh#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#18 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#41 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/in.h#8 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/pc98/syscons.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/sys/linker.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#11 integrate ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#22 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#3 integrate ... //depot/projects/trustedbsd/mac/tools/diag/localeck/localeck.c#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/ConfCmp.c#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2.conf#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2a.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2b.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2c.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2d.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T000/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T001/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T002/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T003/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T004/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T005/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T006/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T007/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T008/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T009/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T010/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T011/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T012/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T013/ref.conf#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T014/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/p1003_1b/yield.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/Makefile#8 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#8 integrate ... //depot/projects/trustedbsd/mac/usr.bin/doscmd/config.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/elf2aout/Makefile#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/expand/expand.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fmt/fmt.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/hesinfo/hesinfo.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/login/login.c#15 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mklocale/yacc.y#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/objformat/objformat.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/passwd/passwd.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/printf/printf.1#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/printf/printf.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rpcinfo/rpcinfo.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/sed/sed.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.pl#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/telnet/commands.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/telnet/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/unexpand/unexpand.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/usbhidctl/usbhid.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xlint/lint1/main1.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xlint/xlint/xlint.c#7 integrate ... //depot/projects/trustedbsd/mac/usr.bin/yacc/lalr.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.c#8 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/crunchide.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_rmail/options.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/digictl/digictl.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/faithd/faithd.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/faithd/ftp.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/kldxref/kldxref.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/common.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/ctlinfo.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/lp.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/printcap.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/startdaemon.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpc/cmds.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpc/lpc.8#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpd/lpd.8#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpd/printjob.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpr/lpr.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpr/printcap.5#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/pac/pac.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/named/Makefile.maninc#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ngctl/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pccard/pccardc/beep.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pccard/pccardc/power.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pcvt/keycap/keycap.src#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pcvt/userkeys/vt220keys.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/command.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/nat_cmd.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/systems.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pppstats/pppstats.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/rip6query/rip6query.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#6 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/doc.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/installUpgrade.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#10 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/usbd/usbd.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/usbdevs/usbdevs.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#3 (text+ko) ==== @@ -1,7 +1,7 @@ -$FreeBSD: src/MAINTAINERS,v 1.18 2002/04/20 08:24:11 jake Exp $ +$FreeBSD: src/MAINTAINERS,v 1.22 2002/04/25 16:43:58 des Exp $ subsystem login notes -------------------------- +----------------------------- mergemaster dougb Prefers to pre-approve commits binutils obrien Insists to keep BU blocked from other's unapproved commits @@ -17,8 +17,7 @@ telnet markm commits _must_ be made to src/crypto/telnet first, only then to "base" telnet via "make unifdef" -i386 boot[012] jhb Pre-commit review preferred. Robert Nordier would - probably also like to review these as well. +i386 boot[012] jhb Pre-commit review preferred. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -47,6 +46,7 @@ isp(4) mjacob {isp_freebsd.?,isp_pci.c}: heads-up on changes please. All other files need pre-commit with mjacob as they're shared with five other platforms. +tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -55,3 +55,5 @@ dhcp murray Needs to pre-approve commits to contrib/isc-dhcp, so changes can be made to the isc.org CVS repository. RELENG_4_* security-officer Requires Security Officer approval. +openssh des Pre-commit review requested. +libpam des Pre-commit review requested. ==== //depot/projects/trustedbsd/mac/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.249 2002/04/20 19:04:59 gshapiro Exp $ +# $FreeBSD: src/Makefile,v 1.250 2002/04/23 09:03:55 ru Exp $ # # The user-driven targets are: # @@ -85,7 +85,7 @@ TGTS= afterdistribute all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distribworld everything \ hierarchy includes install installcheck installkernel kernel \ - reinstallkernel installmost installworld libraries lint maninstall \ + reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update PATH= /sbin:/bin:/usr/sbin:/usr/bin ==== //depot/projects/trustedbsd/mac/UPDATING#11 (text+ko) ==== @@ -22,6 +22,10 @@ integrity. Re-enabling write caching can substantially improve performance. +20020421: + When exec'ing set[ug]id executables, the kernel now ensures that the + stdio file descriptors (0..2) are open. See FreeBSD-SA-02:23.stdio. + 20020404: New sendmail startup scripts have been installed to make it easier to use alternative MTAs with FreeBSD. Setting the rc.conf @@ -934,7 +938,7 @@ make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2] - make installkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE [6] reboot in single user [3] mergemaster -p [5] make installworld @@ -968,6 +972,8 @@ mount -a cd /usr/src adjkerntz -i # if CMOS is wall time + Also, when doing a major release upgrade, it is required that + you boot into single user mode to do the installworld. [4] Note: This step is non-optional. Failure to do this step can result in a significant reduction in the functionality of the @@ -983,6 +989,9 @@ install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] You may get a warning from kldxref. Ignore it. It doesn't + matter. + FORMAT: This file contains a list, in reverse chronological order, of major @@ -1016,4 +1025,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.201 2002/04/19 11:37:34 ru Exp $ +$FreeBSD: src/UPDATING,v 1.203 2002/04/25 14:41:39 nectar Exp $ ==== //depot/projects/trustedbsd/mac/bin/expr/expr.1#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/expr/expr.1,v 1.16 2002/03/22 20:49:29 wollman Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.17 2002/04/22 21:23:09 wollman Exp $ .\" .Dd March 22, 2002 .Dt EXPR 1 @@ -111,7 +111,9 @@ .Pp Parentheses are used for grouping in the usual manner. .Pp -This version of +Unless the +.Ev EXPR_COMPAT +variable is defined in the process environment, this version of .Nm adheres to the .Tn POSIX @@ -141,6 +143,15 @@ command in general is historic and inconvenient. New applications are advised to use shell arithmetic rather than .Nm . +.Sh ENVIRONMENT +.Bl -tag -compact -width EXPR_COMPAT +.It Ev EXPR_COMPAT +If set, +.Nm +will emulate historic +.Nm +implementations which did not obey the Utility Syntax Guidelines. +.El .Sh EXAMPLES .Bl -bullet .It @@ -216,7 +227,10 @@ The .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.1-2001 , +provided that the +.Ev EXPR_COMPAT +environment variable is not defined. .Tn POSIX does not specify whether arithmetic overflow is detected, nor does it specify the possible range of integer arguments to ==== //depot/projects/trustedbsd/mac/bin/expr/expr.y#4 (text+ko) ==== @@ -4,7 +4,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.19 2002/03/22 20:18:26 wollman Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.20 2002/04/22 21:23:09 wollman Exp $ */ #include <sys/types.h> @@ -270,14 +270,17 @@ int c; setlocale (LC_ALL, ""); - while ((c = getopt(argc, argv, "")) != -1) - switch (c) { - default: - fprintf(stderr, "usage: expr [--] expression\n"); - exit(ERR_EXIT); - } - - av = argv + optind; + if (getenv("EXPR_COMPAT") != NULL) { + av = argv + 1; + } else { + while ((c = getopt(argc, argv, "")) != -1) + switch (c) { + default: + fprintf(stderr,"usage: expr [--] expression\n"); + exit(ERR_EXIT); + } + av = argv + optind; + } yyparse(); ==== //depot/projects/trustedbsd/mac/bin/pax/pax.1#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.24 2001/08/14 10:01:43 ru Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.25 2002/04/21 12:53:08 charnier Exp $ .\" .Dd April 18, 1994 .Dt PAX 1 @@ -179,12 +179,12 @@ .Op Ar .Ar directory .Sh DESCRIPTION -.Nm Pax -will read, write, and list the members of an archive file, +The +.Nm +utility will read, write, and list the members of an archive file, and will copy directory hierarchies. -.Nm Pax -operation is independent of the specific archive format, -and supports a wide variety of different archive formats. +These operations are independent of the specific archive format, +and support a wide variety of different archive formats. A list of supported archive formats can be found under the description of the .Fl x option. @@ -202,8 +202,7 @@ .Bl -tag -width 6n .It <none> .Em List . -.Nm Pax -will write to +Write to .Dv standard output a table of contents of the members of the archive file read from .Dv standard input , @@ -213,8 +212,7 @@ and is written using single line buffering. .It Fl r .Em Read . -.Nm Pax -extracts the members of the archive file read from the +Extract the members of the archive file read from the .Dv standard input , with pathnames matching the specified .Ar patterns . @@ -228,8 +226,7 @@ option. .It Fl w .Em Write . -.Nm Pax -writes an archive containing the +Write an archive containing the .Ar file operands to .Dv standard output @@ -244,8 +241,7 @@ at that directory will be included. .It Fl r Fl w .Em Copy . -.Nm Pax -copies the +Copy the .Ar file operands to the destination .Ar directory . @@ -465,15 +461,17 @@ will prompt to .Pa /dev/tty giving the name of the file, its file mode and its modification time. -.Nm Pax -will then read a line from +The +.Nm +utility will then read a line from .Pa /dev/tty . If this line is blank, the file or archive member is skipped. If this line consists of a single period, the file or archive member is processed with no modification to its name. Otherwise, its name is replaced with the contents of the line. -.Nm Pax -will immediately exit with a non-zero exit status if +The +.Nm +utility will immediately exit with a non-zero exit status if .Dv <EOF> is encountered when reading a response or if .Pa /dev/tty @@ -691,8 +689,9 @@ .It Fl x Ar format Specify the output archive format, with the default format being .Ar ustar . -.Nm Pax -currently supports the following formats: +The +.Nm +utility currently supports the following formats: .Bl -tag -width "sv4cpio" .It Ar cpio The extended cpio interchange format specified in the @@ -753,8 +752,9 @@ Pathnames stored by this format must be 250 characters or less in length. .El .Pp -.Nm Pax -will detect and report any file that it is unable to store or extract +The +.Nm +utility will detect and report any file that it is unable to store or extract as the result of any specific archive format restrictions. The individual archive formats may impose additional restrictions on use. Typical archive format restrictions include (but are not limited to): @@ -1145,8 +1145,9 @@ .An Keith Muller at the University of California, San Diego .Sh DIAGNOSTICS -.Nm Pax -will exit with one of the following values: +The +.Nm +utility will exit with one of the following values: .Bl -tag -width 2n .It 0 All files were processed successfully. ==== //depot/projects/trustedbsd/mac/bin/sh/options.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/options.c,v 1.17 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/options.c,v 1.18 2002/04/22 13:44:17 des Exp $"; #endif /* not lint */ #include <signal.h> @@ -373,7 +373,7 @@ char **optbase = NULL; if (argc < 3) - error("Usage: getopts optstring var [arg]"); + error("usage: getopts optstring var [arg]"); else if (argc == 3) optbase = shellparam.p; else ==== //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.42 2002/03/27 05:19:51 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -755,8 +755,8 @@ (n) + 4) #undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF_DEBUG \ - || write_symbols == DWARF2_DEBUG) \ +#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF2_DEBUG \ + || write_symbols == DWARF_DEBUG) \ ? DWARF_DBX_REGISTER_NUMBER(n) \ : STABS_DBX_REGISTER_NUMBER(n)) ==== //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.42 2002/03/27 05:22:35 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.44 2002/04/24 04:49:34 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with <machine/ansi.h>. GCC defaults come from c-decl.c, c-common.c, and config/<arch>/<arch>.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#3 (text+ko) ==== @@ -7,6 +7,8 @@ # BINDEST=/usr/sbin SBINDEST=/sbin +SEARCHDIRS=$(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin \ + /usr/local/bin /usr/local/sbin MANDIR=/usr/share/man CC=cc -Wall -Wstrict-prototypes -Wuninitialized -O CFLAGS=-g -I$(TOP) @@ -49,6 +51,14 @@ FILS=fils.o parse.o kmem.o opt.o facpri.o common.o printstate.o build all: ipf ipfs ipfstat ipftest ipmon ipnat $(LKM) + /bin/rm -f $(TOP)/ipf + ln -s `pwd`/ipf $(TOP) + /bin/rm -f $(TOP)/ipftest + ln -s `pwd`/ipftest $(TOP) + /bin/rm -f $(TOP)/ipmon + ln -s `pwd`/ipmon $(TOP) + /bin/rm -f $(TOP)/ipnat + ln -s `pwd`/ipnat $(TOP) ipfstat: $(FILS) $(CC) -static $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \ @@ -56,13 +66,9 @@ ipf: $(IPF) $(CC) -static $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS) - /bin/rm -f $(TOP)/ipf - ln -s `pwd`/ipf $(TOP) ipftest: $(IPT) $(CC) $(DEBUG) $(CFLAGS) $(IPT) -o $@ $(LIBS) - /bin/rm -f $(TOP)/ipftest - ln -s `pwd`/ipftest $(TOP) ipnat: $(IPNAT) >>> 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?200204260625.g3Q6PoV92957>