PERFORCE change 106282 for review

Robert Watson rwatson at FreeBSD.org
Mon Sep 18 01:39:26 PDT 2006 

http://perforce.freebsd.org/chv.cgi?CH=106282

Change 106282 by rwatson at rwatson_zoo on 2006/09/18 08:37:28

	Integrate TrustedBSD base from FreeBSD CVS:
	
	- DDB show lapic.
	- VLAN tag now an mbuf header field.
	- if_mxge update.
	- t_session workaround.
	- socket timeouts inheritted on inbound connection
	- syncache/syncookie enhancements.
	- Lots of device_printf().
	- Etc.
	
	TrustedBSD-related:
	
	- Fix event number for sigaltstack().
	- security/security.bsd sysctl hierarchies centrally declared.
	- System call auditing for ia64, ppc.
	- Accounting kern.acct_configured sysctl for priv regression test.
	- ipfw tcp packet generation fix for MAC: allow labeling of generated
	  packets.
	- Add preselection flags for user records, and for now, always mark
	  user records as selected for pipes and trails.
	- AUE_SYSARCH in audit_bsm.c.

Affected files ...

.. //depot/projects/trustedbsd/base/MAINTAINERS#43 integrate
.. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#9 integrate
.. //depot/projects/trustedbsd/base/bin/ls/ls.1#32 integrate
.. //depot/projects/trustedbsd/base/bin/pax/pax.1#12 integrate
.. //depot/projects/trustedbsd/base/bin/ps/ps.1#25 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#9 integrate
.. //depot/projects/trustedbsd/base/bin/sh/sh.1#26 integrate
.. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.1#3 integrate
.. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.8#3 integrate
.. //depot/projects/trustedbsd/base/contrib/tar/ABOUT-NLS#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/AUTHORS#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/COPYING#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/ChangeLog#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/ChangeLog.1#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/FREEBSD-Xlist#3 delete
.. //depot/projects/trustedbsd/base/contrib/tar/FREEBSD-upgrade#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/INSTALL#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/NEWS#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/PORTS#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/README#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/README-alpha#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/THANKS#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/TODO#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/doc/fdl.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/doc/freemanuals.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/doc/getdate.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/doc/header.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/doc/tar.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/doc/version.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/addext.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/alloca.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/argmatch.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/argmatch.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/backupfile.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/backupfile.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/basename.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/dirname.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/dirname.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/error.c#4 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/error.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/exclude.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/exclude.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/fileblocks.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/fnmatch.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/fnmatch.hin#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/ftruncate.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/full-write.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/full-write.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/getdate.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/getdate.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/getline.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/getline.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/getstr.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/getstr.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/hash.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/hash.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/human.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/human.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/lchown.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/lchown.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/malloc.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/memset.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/mktime.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/modechange.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/modechange.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/msleep.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/prepargs.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/prepargs.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/print-copyr.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/print-copyr.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/quote.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/quote.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/quotearg.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/quotearg.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/readutmp.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/realloc.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/rename.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/rmdir.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/safe-read.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/safe-read.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/save-cwd.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/save-cwd.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/savedir.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/savedir.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/stpcpy.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strcasecmp.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strncasecmp.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strstr.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoimax.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strtol.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoll.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoul.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoull.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoumax.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/unicodeio.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/unicodeio.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/utime.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/waitpid.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xalloc.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xgetcwd.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xmalloc.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrdup.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtoimax.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtol.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtol.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtoul.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtoumax.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/arith.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#6 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/common.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/compare.c#3 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/create.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/delete.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/extract.c#5 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/incremen.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/list.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/mangle.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/misc.c#3 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/names.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/rmt.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/rmt.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/rtapelib.c#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/system.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/tar.c#3 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/tar.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/tar/src/update.c#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#15 integrate
.. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#5 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#54 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/genscripts.sh#5 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/config.h#5 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.tgt#7 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/amd64.patch#2 delete
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cpp/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/config.h#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/init.c#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/Makefile#7 delete
.. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/config.h#4 delete
.. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/doc/Makefile#2 delete
.. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/localedir.h#2 delete
.. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/tar.1#7 delete
.. //depot/projects/trustedbsd/base/lib/libarchive/tar.5#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.3#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/vis.3#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_watch.3#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#11 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_bcast.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetconfig.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetpath.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_prot.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_simple.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/fclose.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#14 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/chflags.2#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/getsockopt.2#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/kldnext.2#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#15 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/listen.2#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.2#15 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#12 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/send.2#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/sigqueue.2#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/timer_create.2#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/timer_delete.2#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/timer_settime.2#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/utimes.2#7 integrate
.. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.3#6 integrate
.. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/login.access.5#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opie/pam_opie.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.3#5 integrate
.. //depot/projects/trustedbsd/base/lib/libutil/humanize_number.3#5 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#14 integrate
.. //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.8#5 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#79 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#111 integrate
.. //depot/projects/trustedbsd/base/sbin/devd/devd.8#13 integrate
.. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#18 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#8 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#9 integrate
.. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sbin/ipf/ipftest/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ipf/ipmon/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ipf/ipnat/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ipf/ippool/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#43 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.8#25 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.c#12 integrate
.. //depot/projects/trustedbsd/base/sbin/sconfig/sconfig.c#3 integrate
.. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#45 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/em.4#18 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mxge.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#20 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/hier.7#29 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/device_add_child.9#7 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#31 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#15 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#25 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#56 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#25 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#25 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/crypto/via/padlock_cipher.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-usb.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_i2c.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cs/if_cs.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cs/if_csvar.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#58 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/if_en_pci.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ichsmb/ichsmb.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicsmb.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/lge/if_lgereg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/dev/my/if_myreg.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfereg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nge/if_ngereg.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sio/sio_pccard.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smb.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smb.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smbconf.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smbconf.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smbus.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smbus.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/smbus/smbus_if.m#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/scmouse.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/txp/if_txp.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/osta.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom.h#42 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#69 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/nexus.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia32/ia32_trap.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/kern/bus_if.m#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#58 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#58 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#59 integrate
.. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#71 integrate
.. //depot/projects/trustedbsd/base/sys/modules/Makefile#82 integrate
.. //depot/projects/trustedbsd/base/sys/modules/ipfw/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/sys/modules/pf/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_vlan_var.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_vlan.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#66 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#34 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vfsops.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_subs.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/pci/alpm.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/pci/amdpm.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/pci/amdsmb.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sfreg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#47 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sisreg.h#18 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_tl.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_tlreg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_vrreg.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_wb.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_wbreg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_xlreg.h#18 integrate
.. //depot/projects/trustedbsd/base/sys/pci/intpm.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/pci/intpmreg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/pci/nfsmb.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/pci/viapm.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_inet.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/sys/bus.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac.h#48 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#48 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#49 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mount.h#40 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#58 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#58 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#33 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#59 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#28 integrate
.. //depot/projects/trustedbsd/base/tools/build/options/WITHOUT_ASSERT_DEBUG#1 branch
.. //depot/projects/trustedbsd/base/tools/build/options/makeman#4 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/configure-b-B.t#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/main.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/main.h#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_acct.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_adjtime.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_clock_settime.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_io.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_kenv_set.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_kenv_unset.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_proc_setlogin.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_proc_setrlimit.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_sched_rtprio.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_sched_setpriority.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_settimeofday.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_sysctl_write.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_admin.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_chown.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_chroot.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_clearsugid.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_extattr_system.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_fhopen.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_fhstat.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_fhstatfs.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_generation.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_getfh.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_read_write.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_setgid.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_stickyfile.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vm_madv_protect.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vm_mlock.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vm_munlock.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/priv/test_utimes.c#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/readonly.t#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/awk/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/awk/lib.c.diff#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/awk/main.c.diff#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#52 integrate
.. //depot/projects/trustedbsd/base/usr.bin/file/file.1#10 integrate
.. //depot/projects/trustedbsd/base/usr.bin/file/magic.5#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/indent/indent.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.bin/login/login.1#9 integrate
.. //depot/projects/trustedbsd/base/usr.bin/paste/paste.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/su/su.1#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/edquota/edquota.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.8#14 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.c#20 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.h#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/kbdcontrol/kbdcontrol.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/server.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/procs.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/statd.c#6 integrate

Differences ...

==== //depot/projects/trustedbsd/base/MAINTAINERS#43 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $
+$FreeBSD: src/MAINTAINERS,v 1.141 2006/09/11 19:39:46 simon Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -119,6 +119,7 @@
 bs{diff,patch}	cperciva	Pre-commit review requested.
 portsnap	cperciva	Pre-commit review requested.
 freebsd-update	cperciva	Pre-commit review requested.
+openssl		simon		Pre-commit review requested.
 sys/netgraph/bluetooth	emax	Pre-commit review preferred.
 lib/libbluetooth	emax	Pre-commit review preferred.
 lib/libsdp		emax	Pre-commit review preferred.

==== //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#9 (text+ko) ====

@@ -25,12 +25,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.10 2006/03/13 11:45:29 rwatson Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.11 2006/09/17 17:40:06 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
 .\"
-.Dd December 30, 2002
+.Dd March 13, 2006
 .Dt GETFACL 1
 .Os
 .Sh NAME
@@ -65,7 +65,8 @@
 If the target of the operation is a symbolic link, return the ACL from
 the symbolic link itself rather than following the link.
 .It Fl q
-Don't write commented information about file name and ownership. This is
+Do not write commented information about file name and ownership.
+This is
 useful when dealing with filenames with unprintable characters.
 .El
 .Pp

==== //depot/projects/trustedbsd/base/bin/ls/ls.1#32 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.98 2006/03/24 17:09:02 jhb Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $
 .\"
-.Dd November 16, 2005
+.Dd March 24, 2006
 .Dt LS 1
 .Os
 .Sh NAME

==== //depot/projects/trustedbsd/base/bin/pax/pax.1#12 (text+ko) ====

@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/pax/pax.1,v 1.36 2006/05/10 20:32:57 cokane Exp $
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.37 2006/09/17 17:40:06 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt PAX 1
@@ -394,7 +394,8 @@
 bytes per write to the archive file.
 The
 .Ar blocksize
-must be a multiple of 512 bytes with a maximum of 64512 bytes. A
+must be a multiple of 512 bytes with a maximum of 64512 bytes.
+A
 .Ar blocksize
 larger than 32256 bytes violates the
 .Tn POSIX

==== //depot/projects/trustedbsd/base/bin/ps/ps.1#25 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/ps/ps.1,v 1.88 2006/08/21 03:09:12 yar Exp $
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $
 .\"
 .Dd August 21, 2006
 .Dt PS 1
@@ -181,7 +181,7 @@
 list of keywords specified.
 The last keyword in the list may be appended with an equals
 .Pq Ql =
-sign and a string that spans the rest of the argument and can contain
+sign and a string that spans the rest of the argument, and can contain
 space and comma characters.
 This causes the printed header to use the specified string instead of
 the standard header.

==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#9 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
@@ -44,8 +44,9 @@
 .Nm
 utility sets discretionary access control information on
 the specified file(s).
-If no files are specified, or the list consists of the
-only "-", the file names are taken from the standard input.
+If no files are specified, or the list consists of the only
+.Sq Fl ,
+the file names are taken from the standard input.
 .Pp
 The following options are available:
 .Bl -tag -width indent

==== //depot/projects/trustedbsd/base/bin/sh/sh.1#26 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.122 2006/07/29 09:56:29 yar Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $
 .\"
 .Dd July 29, 2006
 .Dt SH 1
@@ -305,7 +305,7 @@
 Useful for debugging.
 .It Fl x Li xtrace
 Write each command
-(preceded by the value of the 
+(preceded by the value of the
 .Ev PS4
 variable)
 to standard error before it is executed.
@@ -1985,7 +1985,7 @@
 The
 .Ar action
 may be an empty string or a dash
-.Pq Ar - ;
+.Pq Ql - ;
 the former causes the specified signal to be ignored
 and the latter causes the default action to be taken.
 Omitting the
@@ -2260,7 +2260,8 @@
 .Sh AUTHORS
 This version of
 .Nm
-was originally written by Kenneth Almquist.
+was originally written by
+.An Kenneth Almquist .
 .Sh BUGS
 The
 .Nm

==== //depot/projects/trustedbsd/base/contrib/com_err/compile_et.1#3 (text+ko) ====

@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.4 2005/06/16 20:51:10 ru Exp $
+.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.5 2006/09/17 18:52:27 ru Exp $
 .\"
 .Dd November 22, 1988
 .Os
@@ -61,12 +61,6 @@
 .Pp
 A ``#'' in the source file is treated as a comment character, and all
 remaining text to the end of the source line will be ignored.
-.Sh BUGS
-Since
-.Nm compile_et
-uses a very simple parser based on
-.Xr yacc 1 ,
-its error recovery leaves much to be desired.
 .Sh SEE ALSO
 .Xr yacc 1 ,
 .Xr com_err 3
@@ -74,3 +68,9 @@
 .%A Ken Raeburn
 .%T "A Common Error Description Library for UNIX"
 .Re
+.Sh BUGS
+Since
+.Nm compile_et
+uses a very simple parser based on
+.Xr yacc 1 ,
+its error recovery leaves much to be desired.

==== //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.8#3 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.6 2005/06/16 20:51:10 ru Exp $
+.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.7 2006/09/17 18:52:28 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt PNPINFO 8
@@ -44,8 +44,6 @@
 Some of the information,
 such as the vendor ID, serial number, I/O ports, IRQ, etc.\& are useful when
 configuring a kernel with ISA PnP devices.
-.Sh BUGS
-A few of the tags are unimplemented (Enough exist for 99% of PnP cards).
 .Sh SEE ALSO
 .Xr pnp 4
 .Sh HISTORY
@@ -55,3 +53,5 @@
 .Fx 2.2 .
 .Sh AUTHORS
 .An Sujal M. Patel Aq smpatel at umiacs.umd.edu
+.Sh BUGS
+A few of the tags are unimplemented (Enough exist for 99% of PnP cards).

==== //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#15 (text+ko) ====

@@ -26,7 +26,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: monitor.c,v 1.64 2005/10/13 22:24:31 stevesk Exp $");
-RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.19 2006/03/22 20:41:36 des Exp $");
+RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.20 2006/09/16 15:12:58 des Exp $");
 
 #include <openssl/dh.h>
 
@@ -272,7 +272,7 @@
     {MONITOR_REQ_TERM, 0, mm_answer_term},
 #ifdef SSH_AUDIT_EVENTS
     {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
-    {MONITOR_REQ_AUDIT_COMMAND, MON_ONCE, mm_answer_audit_command},
+    {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},
 #endif
     {0, 0, NULL}
 };
@@ -639,9 +639,6 @@
 	if (options.use_pam)
 		monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
 #endif
-#ifdef SSH_AUDIT_EVENTS
-	monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_COMMAND, 1);
-#endif
 
 	return (0);
 }

==== //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#5 (text+ko) ====

@@ -185,6 +185,23 @@
 		sig=d2i_X509_SIG(NULL,&p,(long)i);
 
 		if (sig == NULL) goto err;
+
+		/* Excess data can be used to create forgeries */
+		if(p != s+i)
+			{
+			RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+			goto err;
+			}
+
+		/* Parameters to the signature algorithm can also be used to
+		   create forgeries */
+		if(sig->algor->parameter
+		   && sig->algor->parameter->type != V_ASN1_NULL)
+			{
+			RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+			goto err;
+			}
+
 		sigtype=OBJ_obj2nid(sig->algor->algorithm);
 
 

==== //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#54 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.225 2006/08/27 14:29:10 wilko Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.226 2006/09/17 21:36:16 phk Exp $
 
 %
 =======================================================================
@@ -11086,6 +11086,9 @@
 Anyone who considers protocol unimportant has never dealt with a cat.
 		-- R. Heinlein
 %
+Anyone who describes Islam as a religion as intolerant encourages violence.
+		-- Tasnim Aslam, Spokesman for Pakistani Foreign Ministry.
+%
 Anyone who goes to a psychiatrist ought to have his head examined.
 		-- Samuel Goldwyn
 %
@@ -35522,6 +35525,10 @@
 Never make anything simple and efficient when a
 way can be found to make it complex and wonderful.
 %
+Never negotiate with the United States unless you have a nuclear
+weapon.
+		-- Former deputy defense minister of India.
+%
 Never offend people with style when you can offend them with substance.
 		-- Sam Brown, "The Washington Post", January 26, 1977
 %
@@ -44439,6 +44446,10 @@
 Swipple's Rule of Order:
 	He who shouts the loudest has the floor.
 %
+Symbolic representation of quantitative  entities is doomed to its rightful
+place of minor importance in a world where flowers and beautiful women abound.
+		-- Albert Einstein
+%
 Symptom:		Drinking fails to give taste and satisfaction, beer is
 			unusually pale and clear.
 Problem:		Glass empty.
@@ -50450,6 +50461,10 @@
 and there are few mistakes they have ever avoided.
 		-- Winston Churchill, Parliament, August, 1945
 %
+There are four boxes to be used in defense of liberty: soap, ballot,
+jury, and ammo. Please use in that order. 
+		-- Ed Howdershelt 
+%
 There are four kinds of homicide: felonious, excusable, justifiable,
 and praiseworthy ...
 		-- Ambrose Bierce, "The Devil's Dictionary"
@@ -50876,6 +50891,11 @@
 There is brutality and there is honesty.
 There is no such thing as brutal honesty.
 %
+There is Good Information and there is Bad Information and the 
+Internet is generally pretty neutral about the difference. If you're
+a computer, it's all just 0s and 1s.
+		-- Joel Achenbach
+%
 There is grandeur in this view of life, with its several powers,
 having been originally breathed into a few forms or into one; and that,
 whilst this planet has gone cycling on according to the fixed law of

==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc#6 (text+ko) ====

@@ -1,6 +1,4 @@
-#
-# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.8 2004/02/24 19:23:28 johan Exp $
-#
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.9 2006/09/12 19:24:01 obrien Exp $
 
 .if (${TARGET_ARCH} == "alpha")
 WARNS?=	2

==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.16 2004/12/21 09:59:40 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.17 2006/09/11 18:07:09 obrien Exp $
 
 
 # BINDIR
@@ -35,6 +35,9 @@
 .else
 CFLAGS+= -DDEFAULT_ARCH=\"${BINUTILS_ARCH}\"
 .endif
+.if defined(TARGET_BIG_ENDIAN)
+CFLAGS+= -DTARGET_BYTES_BIG_ENDIAN=1
+.endif
 CFLAGS+= -DTARGET_CPU=\"${BINUTILS_ARCH}\"
 CFLAGS+= -DTARGET_CANONICAL=\"${TARGET_TUPLE}\"
 CFLAGS+= -DTARGET_ALIAS=\"${TARGET_TUPLE}\"

==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.arm#2 (text+ko) ====

@@ -1,12 +1,17 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.1 2006/07/22 14:36:15 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.3 2006/09/14 07:44:05 imp Exp $
 
-NATIVE_EMULATION=	armelf_fbsd
+.if defined(TARGET_BIG_ENDIAN)
+NATIVE_EMULATION= armelfb_fbsd
+.else
+NATIVE_EMULATION= armelf_fbsd
+.endif
 
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
-e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
+e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \
 	    ${TOOLS_PREFIX}/usr \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
-	    ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE}
+	    ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
+	    ${.CURDIR}/${NATIVE_EMULATION}.sh

==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/genscripts.sh#5 (text+ko) ====

@@ -9,7 +9,7 @@
 # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
 #
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.6 2004/06/16 07:09:37 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $
 #
 # This is a cut-down version of the GNU script. Instead of jumping through
 # hoops for all possible combinations of paths, just use the libdir
@@ -37,7 +37,12 @@
 # FSF BU ver 2.15 which allows for a more generic emulparams processing.
 # To reduce the diff, I also include the ${EMULATION_NAME} parameter in uses
 # of 'CUSTOMIZER_SCRIPT'.
+
+# XXX: arm hack : until those file are merged back into the FSF repo, just
+# use the version in this directory.
+if !(test -f ${CUSTOMIZER_SCRIPT}"";) then
 CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh"
+fi
 
 # Include the emulation-specific parameters:
 . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}

==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 (text+ko) ====

@@ -1,14 +1,45 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.3 2006/08/10 16:39:55 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.8 2006/09/14 08:21:20 imp Exp $
 
+.if defined(TARGET_BIG_ENDIAN)
+DEFAULT_VECTOR=	bfd_elf32_bigarm_vec
+.else
 DEFAULT_VECTOR=	bfd_elf32_littlearm_vec
+.endif
 
 SRCS+=	cpu-arm.c \
-	elf32.c	 \
+	elf32.c \
 	elf32-arm-fbsd.c \
 	elf32-gen.c \
 	elf32-target.h \
-	elfarm-nabi.c \
 	elflink.c
 
-VECS=	${DEFAULT_VECTOR} \
-	bfd_elf32_bigarm_vec
+VECS+=	${DEFAULT_VECTOR}
+.if defined(TARGET_BIG_ENDIAN)
+VECS+=	bfd_elf32_littlearm_vec
+.else
+VECS+=	bfd_elf32_bigarm_vec
+.endif
+
+CLEANFILES+=	elf32-arm-fbsd.c
+
+# XXX: We should really add the FreeBSD case in elf32_arm_nabi_grok_prstatus
+# instead of defining our own elf32_fbsd_arm_grok_prstatus.
+#
+elf32-arm-fbsd.c: elfarm-nabi.c
+	cat ${.ALLSRC} | sed \
+	    -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \
+	    -e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" \
+	    -e s/"#include.*elf32-arm.h.*//" >${.TARGET}
+	echo ' \
+	    static bfd_boolean \
+	    elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \
+	    { size_t raw_size =68 ; int offset = 28; \
+	    if (note->descsz != 96) return (FALSE); \
+	    if (elf_tdata(abfd)->core_signal == 0) \
+		elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \
+	    elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \
+	    /* Make a ".reg/999" section.  */ \
+	    return _bfd_elfcore_make_pseudosection (abfd, ".reg",raw_size, \
+		note->descpos + offset); \
+	    }' >> ${.TARGET}
+	echo '#include "elf32-arm.h"' >> ${.TARGET}

==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/config.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.6 2004/06/16 07:09:41 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.8 2006/09/14 06:36:13 imp Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
@@ -7,7 +7,7 @@
 
 
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#ifdef __sparc64__
+#if defined(__sparc64__) || defined(__ARMEB__)
 #define BYTEORDER 4321
 #else
 #define BYTEORDER 1234
@@ -325,7 +325,7 @@
 
 /* Define if the host machine stores words of multi-word integers in
    big-endian order. */
-#ifdef __sparc64__
+#if defined(__sparc64__) || defined(__ARMEB__)
 #define HOST_WORDS_BIG_ENDIAN 1
 #endif
 

==== //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.tgt#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.10 2006/09/15 05:21:06 imp Exp $

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

More information about the trustedbsd-cvs mailing list