PERFORCE change 108496 for review
Robert Watson
rwatson at FreeBSD.org
Thu Oct 26 16:43:17 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=108496
Change 108496 by rwatson at rwatson_zoo on 2006/10/26 16:42:53
Integrate TrustedBSD base branch from FreeBSD CVS HEAD:
- compat/freebsd32 audit system calls hooked up.
- mac_framework.h
- subr_fattime.c.
- mmc
- More devfs/VFS/etc fixes.
Affected files ...
.. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#15 integrate
.. //depot/projects/trustedbsd/base/bin/cp/cp.1#13 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/function.c#14 integrate
.. //depot/projects/trustedbsd/base/etc/pf.os#4 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/auto_linklocal#3 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ppp#5 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#56 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.1#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/resolv/res_send.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#15 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#13 integrate
.. //depot/projects/trustedbsd/base/lib/libthread_db/thread_db.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libvgl/vgl.3#5 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#80 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#114 integrate
.. //depot/projects/trustedbsd/base/sbin/adjkerntz/adjkerntz.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#15 integrate
.. //depot/projects/trustedbsd/base/sbin/devd/devd.conf.5#9 integrate
.. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#16 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#25 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_pppoe.4#15 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_source.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sis.4#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/syscons.4#13 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#64 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/ports.7#17 integrate
.. //depot/projects/trustedbsd/base/share/man/man8/intro.8#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/zone.9#12 integrate
.. //depot/projects/trustedbsd/base/share/misc/usb_hid_usages#2 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#26 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#32 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC.hints#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#19 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/nexus.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/nexus_io.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_mci.c#1 branch
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_mcireg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_spi.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_ssc.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_sscreg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twi.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/std.kb920x#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_io.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_irqhandler.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_ost.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/main.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/boot2.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/loader_prompt.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/arm_init.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/ee.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/ee.h#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/main.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac_init.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/mci_device.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/mci_device.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/memcmp.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/memcpy.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/memset.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/printf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/putchar.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/sd-card.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/strcmp.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/strcpy.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/strcvt.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/strlen.c#1 branch
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#78 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#106 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.amd64#35 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#68 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.ia64#38 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#57 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#25 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#46 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#38 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#46 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/crypto/sha2/sha2.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbd.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mmc/bridge.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmc.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcbr_if.m#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcbrvar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcbus_if.m#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcreg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcsd.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mmc/mmcvar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/dev/spibus/spibus.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/denode.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/direntry.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_conv.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_denode.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_subr.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_subr.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#72 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#69 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/NOTES#9 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/nexus.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_main.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acl.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#62 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#57 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#66 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#65 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_fattime.c#1 branch
.. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#62 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#58 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#61 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#53 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#82 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#73 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/modules/mmc/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/mmcsd/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/net/bpf.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/net/bsd_comp.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_fddisubr.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_fwsubr.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_gif.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_iso88025subr.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_stf.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_tun.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/netatalk/aarp.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netatalk/ddp_input.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netatalk/ddp_output.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/igmp.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw_pfil.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#68 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_syscalls.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#38 integrate
.. //depot/projects/trustedbsd/base/sys/pci/agp.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_inet.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_label.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_net.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_pipe.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_posix_sem.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_process.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_socket.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_system.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_msg.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_sem.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_shm.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_vfs.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#18 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/clock.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sys/conf.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac.h#49 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#49 integrate
.. //depot/projects/trustedbsd/base/sys/sys/queue.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/vm/device_pager.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/vm/phys_pager.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#63 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#68 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#35 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#42 integrate
.. //depot/projects/trustedbsd/base/usr.bin/awk/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/usr.bin/awk/tran.c.diff#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/jot/jot.1#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/lam/lam.1#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/lorder/lorder.1#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/quota/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/quota/quota.1#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/quota/quota.c#10 integrate
.. //depot/projects/trustedbsd/base/usr.bin/rs/rs.1#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/su/su.c#26 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tail/forward.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.8#13 integrate
.. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.c#21 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/config.5#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/config.8#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/config.h#10 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#15 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/main.c#15 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/mkmakefile.c#15 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/fdcontrol/fdcontrol.8#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.sh#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/smbmsg/smbmsg.8#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#35 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#34 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.h#34 integrate
Differences ...
==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.55 2006/10/01 17:48:43 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20061018: pccardc removed
+OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
# 20060930: demangle.h from contrib/libstdc++/include/ext/
OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
# 20060929: mrouted removed
==== //depot/projects/trustedbsd/base/bin/cp/cp.1#13 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.37 2006/10/24 18:42:42 trhodes Exp $
.\"
-.Dd October 7, 2006
+.Dd October 24, 2006
.Dt CP 1
.Os
.Sh NAME
@@ -251,38 +251,28 @@
utility had a
.Fl r
option.
-This implementation supports that option, however, its use is strongly
-discouraged as its behavior is very implementation dependent.
-In this version of
+This implementation supports that option, however, its behavior
+is different from historical
+.Fx
+behavior.
+Use
+of this option
+is strongly discouraged as the behavior is
+implementation-dependent.
+In this implementation of
.Nm ,
.Fl r
-is just a synonym for
-.Fl RL .
-The
-.Fl R
-option gives the correct behavior while
-.Fl L
-preserves the sometimes-useful historical behavior of following symbolic links.
-The
+works alike
+.Fl RL
+thus all files, including special files, are copied
+in a manner similar to normal files.
+Data within these special files
+will not be copied, only the file itself.
+Historical implemenations
+of
.Fl r
-option is deprecated in
-.Tn POSIX
- and its behavior is likely to be different
-in future versions of
-.Nm
-and its behavior is likely to be different
-in future versions of
-.Fx .
-Previous versions of
-.Nm
-in
-.Fx ,
-the
-.Fl r
-behavior was to not correctly copy special files, symbolic links
-or fifos.
-Symbolic links were followed, and the contents of special
-files and fifos were copied to regular files.
+differ as they could copy the internal contents of special
+files while recreating a hierarchy.
.Pp
The
.Fl v
==== //depot/projects/trustedbsd/base/contrib/gcc/function.c#14 (text+ko) ====
@@ -19,7 +19,7 @@
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/* $FreeBSD: src/contrib/gcc/function.c,v 1.22 2005/06/03 04:02:19 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/function.c,v 1.23 2006/10/25 07:29:22 bde Exp $ */
/* This file handles the generation of rtl code from tree structure
at the level of the function as a whole.
@@ -7129,7 +7129,9 @@
if (!initialized)
{
mexitcount_libfunc = init_one_libfunc (".mexitcount");
+#if 0 /* Turn this off to prevent erroneous garbage collection. */
initialized = 1;
+#endif
}
emit_library_call (mexitcount_libfunc, LCT_NORMAL, VOIDmode, 0);
}
==== //depot/projects/trustedbsd/base/etc/pf.os#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/etc/pf.os,v 1.3 2004/09/14 00:30:14 mlaier Exp $
-# $OpenBSD: pf.os,v 1.17 2004/04/28 01:01:27 deraadt Exp $
+# $FreeBSD: src/etc/pf.os,v 1.4 2006/10/23 05:09:44 delphij Exp $
+# $OpenBSD: pf.os,v 1.21 2006/07/28 21:51:12 david Exp $
# passive OS fingerprinting
# -------------------------
#
@@ -223,9 +223,10 @@
S4:64:1:60:M1360,S,T,N,W0: Linux:google::Linux (Google crawlbot)
S2:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4 (big boy)
-S3:64:1:60:M*,S,T,N,W0: Linux:2.4:18-21:Linux 2.4.18 and newer
-S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6
-S4:64:1:60:M*,S,T,N,W0: Linux:2.6::Linux 2.4/2.6
+S3:64:1:60:M*,S,T,N,W0: Linux:2.4:.18-21:Linux 2.4.18 and newer
+S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 <= 2.6.7
+S4:64:1:60:M*,S,T,N,W0: Linux:2.6:.1-7:Linux 2.4/2.6 <= 2.6.7
+S4:64:1:60:M*,S,T,N,W7: Linux:2.6:8:Linux 2.6.8 and newer (?)
S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 (sometimes 2.4)
S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6
@@ -260,27 +261,28 @@
# ----------------- FreeBSD -----------------
-16384:64:1:44:M*: FreeBSD:2.0-2.2::FreeBSD 2.0-4.1
-16384:64:1:44:M*: FreeBSD:3.0-3.5::FreeBSD 2.0-4.1
-16384:64:1:44:M*: FreeBSD:4.0-4.1::FreeBSD 2.0-4.1
+16384:64:1:44:M*: FreeBSD:2.0-2.2::FreeBSD 2.0-4.2
+16384:64:1:44:M*: FreeBSD:3.0-3.5::FreeBSD 2.0-4.2
+16384:64:1:44:M*: FreeBSD:4.0-4.2::FreeBSD 2.0-4.2
16384:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4
1024:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4
57344:64:1:44:M*: FreeBSD:4.6-4.8:noRFC1323:FreeBSD 4.6-4.8 (no RFC1323)
-57344:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.6-4.8::FreeBSD 4.6-4.8
+57344:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.6-4.9::FreeBSD 4.6-4.9
-32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X)
+32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.11::FreeBSD 4.8-5.1 (or MacOS X)
32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X)
-65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X)
-65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X)
-65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.9::FreeBSD 4.7-5.1
-65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.7-5.1
+65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.11::FreeBSD 4.8-5.2 (or MacOS X)
+65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.2::FreeBSD 4.8-5.2 (or MacOS X)
+65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.11::FreeBSD 4.7-5.2
+65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.2::FreeBSD 4.7-5.2
# XXX need quirks support
-# 65535:64:1:60:M*,N,W0,N,N,T:Z:FreeBSD:5.1-current (1)
-# 65535:64:1:60:M*,N,W1,N,N,T:Z:FreeBSD:5.1-current (2)
-# 65535:64:1:60:M*,N,W2,N,N,T:Z:FreeBSD:5.1-current (3)
+# 65535:64:1:60:M*,N,W0,N,N,T:Z:FreeBSD:5.1-5.4::5.1-current (1)
+# 65535:64:1:60:M*,N,W1,N,N,T:Z:FreeBSD:5.1-5.4::5.1-current (2)
+# 65535:64:1:60:M*,N,W2,N,N,T:Z:FreeBSD:5.1-5.4::5.1-current (3)
+# 65535:64:1:44:M*:Z:FreeBSD:5.2::FreeBSD 5.2 (no RFC1323)
# 16384:64:1:60:M*,N,N,N,N,N,N,T:FreeBSD:4.4:noTS:FreeBSD 4.4 (w/o timestamps)
@@ -297,12 +299,12 @@
# ----------------- OpenBSD -----------------
16384:64:0:60:M*,N,W0,N,N,T: OpenBSD:2.6::NetBSD 1.3 (or OpenBSD 2.6)
-16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5::OpenBSD 3.0-3.5
-16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:no-df:OpenBSD 3.0-3.5 (scrub no-df)
-57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5::OpenBSD 3.3-3.5
-57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5:no-df:OpenBSD 3.3-3.5 (scrub no-df)
+16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-4.0::OpenBSD 3.0-4.0
+16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-4.0:no-df:OpenBSD 3.0-4.0 (scrub no-df)
+57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-4.0::OpenBSD 3.3-4.0
+57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-4.0:no-df:OpenBSD 3.3-4.0 (scrub no-df)
-65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:opera:OpenBSD 3.0-3.5 (Opera)
+65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-4.0:opera:OpenBSD 3.0-4.0 (Opera)
# ----------------- Solaris -----------------
@@ -317,7 +319,8 @@
4096:64:0:44:M1460: SunOS:4.1::SunOS 4.1.x
-S34:64:1:52:M*,N,W0,N,N,S: Solaris:10::Solaris 10 (beta)
+S34:64:1:52:M*,N,W0,N,N,S: Solaris:10:beta:Solaris 10 (beta)
+32850:64:1:64:M*,N,N,T,N,W1,N,N,S: Solaris:10::Solaris 10 1203
# ----------------- IRIX --------------------
@@ -329,6 +332,9 @@
61440:64:0:48:M*,N,N,S: IRIX:6.5:12-21:IRIX 6.5.12 - 6.5.21
49152:64:0:48:M*,N,N,S: IRIX:6.5:15-21:IRIX 6.5.15 - 6.5.21
+49152:60:0:64:M*,N,W2,N,N,T,N,N,S: IRIX:6.5:IP27:IRIX 6.5 IP27
+
+
# ----------------- Tru64 -------------------
32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 (or OS/2 Warp 4)
@@ -428,6 +434,11 @@
16384:128:1:52:M536,N,W0,N,N,S: Windows:2000:ZoneAlarm:Windows 2000 w/ZoneAlarm?
2048:255:0:40:.: Windows:.NET::Windows .NET Enterprise Server
+44620:64:0:48:M*,N,N,S: Windows:ME::Windows ME no SP (?)
+S6:255:1:48:M536,N,N,S: Windows:95:winsock2:Windows 95 winsock 2
+32768:32:1:52:M1460,N,W0,N,N,S: Windows:2003:AS:Windows 2003 AS
+
+
# No need to be more specific, it passes:
# *:128:1:48:M*,N,N,S:U:-Windows:XP/2000 while downloading (leak!) XXX quirk
# there is an equiv similar generic sig w/o the quirk
@@ -442,7 +453,6 @@
# Whoa. Hardcore WSS.
0:64:0:48:M*,W0,N: HP-UX:B.11.00:A:HP-UX B.11.00 A (RFC1323)
-
# ----------------- RiscOS ------------------
# We don't yet support the ?12 TCP option
@@ -453,6 +463,7 @@
# 4096:64:1:56:M1460,N,N,T:T: RISC OS:3.70:freenet:RISC OS 3.70 freenet 2.00
+
# ----------------- BSD/OS ------------------
# Once again, power of two WSS is also shared by MacOS X with DF set
@@ -466,6 +477,7 @@
# ---------------- NeXTSTEP -----------------
+S4:64:0:44:M1024: NeXTSTEP:3.3::NeXTSTEP 3.3
S8:64:0:44:M512: NeXTSTEP:3.3::NeXTSTEP 3.3
# ------------------ BeOS -------------------
@@ -501,15 +513,18 @@
# ----------------- SCO ------------------
S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1
+S17:64:1:60:M1380,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1.3 MP3
S23:64:1:44:M1380: SCO:OpenServer:5.0:SCO OpenServer 5.0
# ------------------- DOS -------------------
2048:255:0:44:M536: DOS:WATTCP:1.05:DOS Arachne via WATTCP/1.05
+T2:255:0:44:M984: DOS:WATTCP:1.05Arachne:Arachne via WATTCP/1.05 (eepro)
# ------------------ OS/2 -------------------
S56:64:0:44:M512: OS/2:4::OS/2 4
+28672:64:0:44:M1460: OS/2:4::OS/2 Warp 4.0
# ----------------- TOPS-20 -----------------
@@ -517,6 +532,10 @@
# XXX QUIRK 0:64:0:44:M1460:A:TOPS-20:version 7
0:64:0:44:M1460: TOPS-20:7::TOPS-20 version 7
+# ----------------- FreeMiNT ----------------
+
+S44:255:0:44:M536: FreeMiNT:1:16A:FreeMiNT 1 patch 16A (Atari)
+
# ------------------ AMIGA ------------------
# XXX TCP option 12
@@ -539,7 +558,6 @@
S12:64:1:44:M1460: @Checkpoint:::Checkpoint (unknown 1)
S12:64:1:48:N,N,S,M1460: @Checkpoint:::Checkpoint (unknown 2)
4096:32:0:44:M1460: ExtremeWare:4.x::ExtremeWare 4.x
-60352:64:0:52:M1460,N,W2,N,N,S: Clavister:7::Clavister firewall 7.x
# XXX TCP option 12
# S32:64:0:68:M512,N,W0,N,N,T,N,N,?12:.:Nokia:IPSO w/Checkpoint NG FP3
@@ -549,6 +567,9 @@
8192:64:1:44:M1460: Eagle:::Eagle Secure Gateway
+S52:128:1:48:M1260,N,N,N,N: LinkSys:WRV54G::LinkSys WRV54G VPN router
+
+
# ------- Switches and other stuff ----------
@@ -581,6 +602,10 @@
16384:255:0:40:.: Proxyblocker:::Proxyblocker (what's this?)
+65535:255:0:48:M*,N,N,S: Redline:::Redline T|X 2200
+
+32696:128:0:40:M1460: Spirent:Avalanche::Spirent Web Avalanche HTTP benchmarking engine
+
# ----------- Embedded systems --------------
S9:255:0:44:M536: PalmOS:Tungsten:C:PalmOS Tungsten C
@@ -589,10 +614,15 @@
S4:255:0:44:M536: PalmOS:3:5:PalmOS 3.5
2948:255:0:44:M536: PalmOS:3:5:PalmOS 3.5.3 (Handera)
S29:255:0:44:M536: PalmOS:5::PalmOS 5.0
+16384:255:0:44:M1398: PalmOS:5.2:Clie:PalmOS 5.2 (Clie)
+S14:255:0:44:M1350: PalmOS:5.2:Treo:PalmOS 5.2.1 (Treo)
S23:64:1:64:N,W1,N,N,T,N,N,S,M1460: SymbianOS:7::SymbianOS 7
-8192:255:0:44:M1460: SymbianOS:6048::SymbianOS 6048 (on Nokia 7650?)
-8192:255:0:44:M536: SymbianOS:::SymbianOS (on Nokia 9210?)
+
+8192:255:0:44:M1460: SymbianOS:6048::Symbian OS 6048 (Nokia 7650?)
+8192:255:0:44:M536: SymbianOS:9210::Symbian OS (Nokia 9210?)
+S22:64:1:56:M1460,T,S: SymbianOS:P800::Symbian OS ? (SE P800?)
+S36:64:1:56:M1360,T,S: SymbianOS:6600::Symbian OS 60xx (Nokia 6600?)
# Perhaps S4?
@@ -608,8 +638,8 @@
S12:64:0:44:M1452: AXIS:5600:v5.64:AXIS Printer Server 5600 v5.64
+3100:32:1:44:M1460: Windows:CE:2.0:Windows CE 2.0
-
####################
# Fancy signatures #
####################
@@ -619,11 +649,23 @@
3072:64:0:40:.: *NMAP:syn scan:3:NMAP syn scan (3)
4096:64:0:40:.: *NMAP:syn scan:4:NMAP syn scan (4)
+# Requires quirks support
+# 1024:64:0:40:.:A:*NMAP:TCP sweep probe (1)
+# 2048:64:0:40:.:A:*NMAP:TCP sweep probe (2)
+# 3072:64:0:40:.:A:*NMAP:TCP sweep probe (3)
+# 4096:64:0:40:.:A:*NMAP:TCP sweep probe (4)
+
1024:64:0:60:W10,N,M265,T: *NMAP:OS:1:NMAP OS detection probe (1)
2048:64:0:60:W10,N,M265,T: *NMAP:OS:2:NMAP OS detection probe (2)
3072:64:0:60:W10,N,M265,T: *NMAP:OS:3:NMAP OS detection probe (3)
4096:64:0:60:W10,N,M265,T: *NMAP:OS:4:NMAP OS detection probe (4)
+32767:64:0:40:.: *NAST:::NASTsyn scan
+
+# Requires quirks support
+# 12345:255:0:40:.:A:-p0f:sendsyn utility
+
+
#####################################
# Generic signatures - just in case #
#####################################
@@ -633,6 +675,8 @@
*:128:1:52:M*,N,W0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323 no tstamp)
*:128:1:52:M*,N,W0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323 no tstamp)
+*:128:1:52:M*,N,W*,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323 no tstamp)
+*:128:1:52:M*,N,W*,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323 no tstamp)
*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323)
*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323)
*:128:1:64:M*,N,W*,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP (RFC1323, w+)
==== //depot/projects/trustedbsd/base/etc/rc.d/auto_linklocal#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.2 2006/10/13 12:41:35 ume Exp $
+# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.3 2006/10/22 17:21:03 hrs Exp $
#
# PROVIDE: auto_linklocal
@@ -15,7 +15,7 @@
auto_linklocal_start()
{
- if ! checkyesno ipv6_enable; then
+ if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then
${SYSCTL_W} net.inet6.ip6.auto_linklocal=0
fi
}
==== //depot/projects/trustedbsd/base/etc/rc.d/ppp#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ppp,v 1.11 2005/10/29 05:00:25 yar Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.12 2006/10/26 00:29:43 avatar Exp $
#
# PROVIDE: ppp
@@ -40,9 +40,10 @@
ppp_postcmd()
{
- # Re-Sync ipfilter so it picks up any new network interfaces
+ # Re-Sync ipfilter and pf so they pick up any new network interfaces
#
/etc/rc.d/ipfilter resync
+ /etc/rc.d/pf resync
}
load_rc_config $name
==== //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#56 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.227 2006/10/07 08:29:20 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.229 2006/10/23 13:25:17 phk Exp $
%
=======================================================================
@@ -30223,6 +30223,9 @@
municipality.
-- Local ordinance, Euclid Ohio
%
+It so happens that everything that is stupid is not unconstitutional.
+ -- Supreme Court Justice Antonio Scalia
+%
It takes a smart husband to have the last word and not use it.
%
It takes a special kind of courage to face what we all have to face.
@@ -52261,6 +52264,9 @@
Those who can, do; those who can't, write.
Those who can't write work for the Bell Labs Record.
%
+Those who can make you believe absurdities, can make you commit atrocities.
+ -- Voltaire
+%
Those who cannot remember the past are condemned to repeat it.
-- George Santayana
%
==== //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/Makefile#4 (text+ko) ====
@@ -1,5 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.11 2006/08/24 21:53:49 marcel Exp $
+# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.12 2006/10/21 17:27:36 jmg Exp $
SUBDIR= doc libgdb gdb gdbtui kgdb
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=gdbserver
+.endif
+
.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.1#6 (text+ko) ====
@@ -22,8 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $
-.Dd March 2, 2005
+.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.10 2006/10/21 17:39:35 ru Exp $
+.\"
+.Dd October 11, 2006
.Os
.Dt KGDB 1
.Sh NAME
==== //depot/projects/trustedbsd/base/lib/libc/resolv/res_send.c#3 (text) ====
@@ -70,10 +70,10 @@
#if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.3 2006/08/04 12:26:07 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.4 2006/10/24 14:41:43 ume Exp $");
/*
* Send query to name server and wait for reply.
@@ -145,7 +145,7 @@
int kq,
#endif
const u_char *, int,
- u_char *, int, int *, int,
+ u_char *, int, int *, int, int,
int *, int *);
static void Aerror(const res_state, FILE *, const char *, int,
const struct sockaddr *, int);
@@ -490,7 +490,7 @@
kq,
#endif
buf, buflen, ans, anssiz, &terrno,
- ns, &v_circuit, &gotsomewhere);
+ ns, try, &v_circuit, &gotsomewhere);
if (n < 0)
goto fail;
if (n == 0)
@@ -812,8 +812,9 @@
#ifdef USE_KQUEUE
int kq,
#endif
- const u_char *buf, int buflen, u_char *ans, int anssiz,
- int *terrno, int ns, int *v_circuit, int *gotsomewhere)
+ const u_char *buf, int buflen, u_char *ans,
+ int anssiz, int *terrno, int ns, int try, int *v_circuit,
+ int *gotsomewhere)
{
const HEADER *hp = (const HEADER *) buf;
HEADER *anhp = (HEADER *) ans;
@@ -914,7 +915,7 @@
/*
* Wait for reply.
*/
- seconds = (statp->retrans << ns);
+ seconds = (statp->retrans << try);
if (ns > 0)
seconds /= statp->nscount;
if (seconds <= 0)
==== //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.3 2006/04/01 19:06:54 phk Exp $
+ * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.5 2006/10/23 07:25:25 kib Exp $
*/
#include <namespace.h>
@@ -261,7 +261,7 @@
static int
-__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap)
+__v2printf(FILE *fp, const char *fmt0, unsigned pct, va_list ap)
{
struct printf_info *pi, *pil;
const char *fmt;
==== //depot/projects/trustedbsd/base/lib/libc/sys/read.2#15 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)read.2 8.4 (Berkeley) 2/26/94
-.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.33 2006/10/11 13:33:02 maxim Exp $
+.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.34 2006/10/21 18:03:53 ru Exp $
.\"
.Dd October 11, 2006
.Dt READ 2
@@ -170,7 +170,7 @@
An I/O error occurred while reading from the file system.
.It Bq Er EINTR
A read from a slow device
-(i.e. one that might block for an arbitrary amount of time)
+(i.e.\& one that might block for an arbitrary amount of time)
was interrupted by the delivery of a signal
before any data arrived.
.It Bq Er EINVAL
==== //depot/projects/trustedbsd/base/lib/libc/sys/write.2#13 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)write.2 8.5 (Berkeley) 4/2/94
-.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.32 2006/04/14 19:34:07 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.33 2006/10/21 20:36:50 simon Exp $
.\"
.Dd July 7, 2005
.Dt WRITE 2
@@ -85,7 +85,7 @@
For
.Fn writev
and
-.Fn pwritev,
+.Fn pwritev ,
the
.Fa iovec
structure is defined as:
==== //depot/projects/trustedbsd/base/lib/libthread_db/thread_db.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $");
+__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.4 2006/10/20 14:15:42 davidxu Exp $");
#include <proc_service.h>
#include <stddef.h>
@@ -41,14 +41,12 @@
static TAILQ_HEAD(, td_thragent) proclist = TAILQ_HEAD_INITIALIZER(proclist);
-extern struct ta_ops libc_r_db_ops;
extern struct ta_ops libpthread_db_ops;
extern struct ta_ops libthr_db_ops;
static struct ta_ops *ops[] = {
&libpthread_db_ops,
&libthr_db_ops,
- &libc_r_db_ops
};
td_err_e
==== //depot/projects/trustedbsd/base/lib/libvgl/vgl.3#5 (text+ko) ====
@@ -24,7 +24,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/lib/libvgl/vgl.3,v 1.30 2005/02/13 23:45:48 ru Exp $
+.\" $FreeBSD: src/lib/libvgl/vgl.3,v 1.31 2006/10/21 15:12:36 maxim Exp $
.Dd November 7, 1999
.Dt VGL 3
.Os
@@ -398,7 +398,7 @@
.Pp
.Dl VGLSetVScreenSize(10000, 10000);
.Pp
-.Fn VGLPanSreen
+.Fn VGLPanScreen
change the origin of the displayed screen in the virtual screen.
Note that this function must be called when our vty is in the
foreground.
==== //depot/projects/trustedbsd/base/release/Makefile#80 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.914 2006/09/11 13:15:09 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.916 2006/10/24 21:00:49 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -943,9 +943,6 @@
# Break the link to device.hints so we can modify it
@rm -f ${CD_LIVEFS}/boot/device.hints
@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
-.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
- @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_LIVEFS}/boot/device.hints
-.endif
.endif
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
touch ${.TARGET}
@@ -1252,9 +1249,6 @@
${BOOTDIR}/loader.rc ${IMAGEDIR}/boot
.if exists(${HINTSFILE})
@cp ${HINTSFILE} ${IMAGEDIR}/boot/device.hints
-.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
- @echo 'hint.atkbd.0.flags="0x1"' >> ${IMAGEDIR}/boot/device.hints
-.endif
@gzip -9n ${IMAGEDIR}/boot/device.hints
.endif
@gzip -9n ${IMAGEDIR}/boot/*.4th ${IMAGEDIR}/boot/loader.help \
@@ -1275,9 +1269,11 @@
.if defined(SPLIT_MFSROOT)
@echo 'mfsroot_after="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf
.endif
-.if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
+.if ${AUTO_KEYBOARD_DETECT}
@echo "-P" >> ${IMAGEDIR}/boot.config
.endif
+.endif
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the trustedbsd-cvs
mailing list