Date: Mon, 27 Feb 2006 22:17:22 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 92486 for review Message-ID: <200602272217.k1RMHM0l051927@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=92486 Change 92486 by rwatson@rwatson_peppercorn on 2006/02/27 22:16:57 Integrate trustedbsd MAC branch from TrustedBSD base; see change set @92126 for merge details. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#62 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#4 integrate .. //depot/projects/trustedbsd/mac/UPDATING#52 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/mac/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#25 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/CHANGELOG#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/mac/etc/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#45 integrate .. //depot/projects/trustedbsd/mac/etc/hosts.allow#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/440.status-mailq#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc#30 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/SERVERS#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localpkg#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pccard#7 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/root#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#22 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#40 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/trustedbsd/mac/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_set_policy.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_strerror.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_suspend_np.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libthr_db.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/libutil.h#8 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#67 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#56 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#83 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#32 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#36 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#30 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#16 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#17 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#36 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#57 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/agp.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ataraid.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/atkbd.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_one2many.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ohci.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/syscons.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twa.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vga.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/group.5#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#35 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#44 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/acl.9#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/buf.9#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/memguard.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mtx_pool.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ja_JP.SJIS.src#4 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#124 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#51 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#40 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#34 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_pci.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispvar.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/fc_log.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_rue.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_udav.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohcivar.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umct.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/tsc.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mca.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_clock.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kse.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#85 integrate .. //depot/projects/trustedbsd/mac/sys/modules/arcnet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/firewire/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_vlan/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/ubt/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/nfs4client/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/twa/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/net/radix.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#61 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#56 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_intel.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#18 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#47 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#45 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pcpu.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#67 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/sys/systm.h#33 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#33 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/column/column.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/mbuf.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vmstat/vmstat.8#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wall/wall.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/who/who.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/arp/arp.c#17 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidcontrol/sdp.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcsecd/hcsecd.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.c#16 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/version/perform.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/powerd/powerd.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#19 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tcpip.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#62 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/mac/UPDATING#52 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/mac/bin/csh/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/mac/bin/csh/config.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/mac/bin/ln/ln.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/mac/bin/ln/ln.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -53,6 +53,7 @@ #include <unistd.h> int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#25 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#4 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#9 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + +/** + * Recompute the poll timer for the HC counters + */ +void +mibif_reset_hc_timer(void) +{ + u_int ticks; + + if ((ticks = mibif_force_hc_update_interval) == 0) { + if (mibif_maxspeed <= 10000000) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602272217.k1RMHM0l051927>