From owner-p4-projects@FreeBSD.ORG Wed Sep 26 22:08:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B62A016A420; Wed, 26 Sep 2007 22:08:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F66716A419 for ; Wed, 26 Sep 2007 22:08:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 501EC13C455 for ; Wed, 26 Sep 2007 22:08:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8QM8cqf000892 for ; Wed, 26 Sep 2007 22:08:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8QM8VnQ000889 for perforce@freebsd.org; Wed, 26 Sep 2007 22:08:31 GMT (envelope-from imp@freebsd.org) Date: Wed, 26 Sep 2007 22:08:31 GMT Message-Id: <200709262208.l8QM8VnQ000889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 126842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2007 22:08:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=126842 Change 126842 by imp@imp_paco-paco on 2007/09/26 22:07:32 IFC @126840 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#27 integrate .. //depot/projects/arm/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/arm/src/bin/ps/print.c#2 integrate .. //depot/projects/arm/src/bin/ps/ps.c#2 integrate .. //depot/projects/arm/src/contrib/less/main.c#9 integrate .. //depot/projects/arm/src/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/arm/src/etc/defaults/rc.conf#17 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#9 integrate .. //depot/projects/arm/src/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/arm/src/etc/rc.d/lockd#3 integrate .. //depot/projects/arm/src/etc/services#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/genscripts.sh#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_int/Makefile#7 integrate .. //depot/projects/arm/src/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/arm/src/include/Makefile#12 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/arm/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_connectx.3#4 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/arm/src/lib/libc/rpc/auth_time.c#2 integrate .. //depot/projects/arm/src/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/arm/src/lib/libc/rpc/getnetpath.c#4 integrate .. //depot/projects/arm/src/lib/libc/rpc/rpc_generic.c#2 integrate .. //depot/projects/arm/src/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.c#5 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/arm/src/lib/libc/sys/kqueue.2#5 integrate .. //depot/projects/arm/src/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/ntp_adjtime.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/ntp_gettime.2#2 delete .. //depot/projects/arm/src/lib/libdisk/open_disk.c#3 integrate .. //depot/projects/arm/src/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/arm/src/lib/libelf/elf_update.3#3 integrate .. //depot/projects/arm/src/lib/libelf/elf_update.c#3 integrate .. //depot/projects/arm/src/lib/libelf/libelf_convert.m4#3 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/arm/src/lib/libutil/Makefile#5 integrate .. //depot/projects/arm/src/lib/libutil/expand_number.3#1 branch .. //depot/projects/arm/src/lib/libutil/expand_number.c#1 branch .. //depot/projects/arm/src/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/arm/src/lib/libutil/libutil.h#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#20 integrate .. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#10 integrate .. //depot/projects/arm/src/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/arm/src/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/arm/src/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/arm/src/sbin/dhclient/dhclient.8#4 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/Makefile#3 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/arm/src/sbin/geom/class/Makefile#6 integrate .. //depot/projects/arm/src/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/arm/src/sbin/geom/class/virstor/Makefile#1 branch .. //depot/projects/arm/src/sbin/geom/class/virstor/geom_virstor.c#1 branch .. //depot/projects/arm/src/sbin/geom/class/virstor/gvirstor.8#1 branch .. //depot/projects/arm/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/arm/src/sbin/geom/core/geom.c#5 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#12 integrate .. //depot/projects/arm/src/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/arm/src/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/arm/src/sbin/tunefs/tunefs.8#4 integrate .. //depot/projects/arm/src/share/examples/cvsup/cvs-supfile#4 integrate .. //depot/projects/arm/src/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/arm/src/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/arm/src/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/arm/src/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/arm/src/share/examples/cvsup/standard-supfile#3 integrate .. //depot/projects/arm/src/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#19 integrate .. //depot/projects/arm/src/share/man/man4/ata.4#8 integrate .. //depot/projects/arm/src/share/man/man4/cxgb.4#2 integrate .. //depot/projects/arm/src/share/man/man4/gem.4#4 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#9 integrate .. //depot/projects/arm/src/share/man/man4/ral.4#4 integrate .. //depot/projects/arm/src/share/man/man4/rum.4#3 integrate .. //depot/projects/arm/src/share/man/man4/sctp.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_emu10kx.4#4 integrate .. //depot/projects/arm/src/share/man/man4/ural.4#6 integrate .. //depot/projects/arm/src/share/man/man4/wlan.4#3 integrate .. //depot/projects/arm/src/share/man/man4/wlan_amrr.4#2 integrate .. //depot/projects/arm/src/share/man/man4/zyd.4#1 branch .. //depot/projects/arm/src/share/man/man5/Makefile#6 integrate .. //depot/projects/arm/src/share/man/man5/ar.5#1 branch .. //depot/projects/arm/src/share/man/man5/elf.5#4 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#10 integrate .. //depot/projects/arm/src/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#13 integrate .. //depot/projects/arm/src/share/man/man9/crypto.9#4 integrate .. //depot/projects/arm/src/share/man/man9/suser.9#5 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#22 integrate .. //depot/projects/arm/src/sys/amd64/amd64/uma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#9 integrate .. //depot/projects/arm/src/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#20 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#20 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#20 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#17 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#19 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#35 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#14 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#32 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#22 integrate .. //depot/projects/arm/src/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/arm/src/sys/arm/include/endian.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/uart_dev_sa1110.c#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321.c#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/arm/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/arm/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/arm/src/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#27 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/arm/src/sys/conf/NOTES#55 integrate .. //depot/projects/arm/src/sys/conf/files#78 integrate .. //depot/projects/arm/src/sys/conf/options#51 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/arm/src/sys/dev/an/if_an.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#38 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#9 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#33 integrate .. //depot/projects/arm/src/sys/dev/awi/awi.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_lro.c#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/arm/src/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/arm/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/arm/src/sys/dev/em/if_em.c#42 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#17 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#10 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/ipw/if_ipw.c#13 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#22 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#19 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#19 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfireg.h#9 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#10 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#24 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#20 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/arm/src/sys/dev/pci/pcireg.h#13 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#14 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661.c#12 integrate .. //depot/projects/arm/src/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx-pcm.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.h#4 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axereg.h#9 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#26 integrate .. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/arm/src/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/arm/src/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/arm/src/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#17 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/direntry.h#4 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_conv.c#9 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_fat.c#6 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#8 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.h#7 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_crypto.c#5 integrate .. //depot/projects/arm/src/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/arm/src/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/arm/src/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/arm/src/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/arm/src/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/arm/src/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/arm/src/sys/i386/acpica/madt.c#9 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/arm/src/sys/i386/i386/genassym.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/geode.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#21 integrate .. //depot/projects/arm/src/sys/i386/include/smp.h#9 integrate .. //depot/projects/arm/src/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/arm/src/sys/i386/isa/isa.c#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#12 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#23 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_ptrace.c#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#22 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#22 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#22 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#15 integrate .. //depot/projects/arm/src/sys/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/arm/src/sys/ia64/include/vmparam.h#8 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#22 integrate .. //depot/projects/arm/src/sys/kern/kern_sysctl.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#21 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#24 integrate .. //depot/projects/arm/src/sys/kern/subr_kdb.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_lock.c#8 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/arm/src/sys/kern/subr_smp.c#6 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#12 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#21 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#12 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#28 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#22 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#17 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#37 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#32 integrate .. //depot/projects/arm/src/sys/modules/Makefile#48 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/ixgbe/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/zyd/Makefile#1 branch .. //depot/projects/arm/src/sys/net/bpf.c#21 integrate .. //depot/projects/arm/src/sys/net/bpf_filter.c#6 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#36 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#9 integrate .. //depot/projects/arm/src/sys/net/if_media.h#10 integrate .. //depot/projects/arm/src/sys/net/if_stf.c#9 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#11 integrate .. //depot/projects/arm/src/sys/net80211/_ieee80211.h#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#16 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#20 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#18 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#15 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#17 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#36 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#17 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#20 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#21 integrate .. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#15 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#20 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#17 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#15 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#17 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#21 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#12 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#22 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#32 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#19 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.h#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#22 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#24 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#18 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_var.h#7 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#17 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_input.c#7 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_bio.c#12 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_nfsiod.c#5 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/arm/src/sys/pci/agp_i810.c#11 integrate .. //depot/projects/arm/src/sys/pci/agp_via.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#17 integrate .. //depot/projects/arm/src/sys/powerpc/conf/NOTES#8 integrate .. //depot/projects/arm/src/sys/powerpc/include/vmparam.h#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/uma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/arm/src/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/arm/src/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/arm/src/sys/security/mac_mls/mac_mls.c#10 integrate .. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/arm/src/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#24 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/intr_machdep.h#5 integrate .. //depot/projects/arm/src/sys/sparc64/include/vmparam.h#5 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#11 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psychoreg.h#6 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/sbusreg.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#10 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/intr_machdep.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/upa.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/arm/src/sys/sun4v/include/vmparam.h#5 integrate .. //depot/projects/arm/src/sys/sun4v/mdesc/mdesc_init.c#5 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/vm_machdep.c#5 integrate .. //depot/projects/arm/src/sys/sys/callout.h#4 integrate .. //depot/projects/arm/src/sys/sys/lock_profile.h#7 integrate .. //depot/projects/arm/src/sys/sys/mount.h#20 integrate .. //depot/projects/arm/src/sys/sys/proc.h#31 integrate .. //depot/projects/arm/src/sys/sys/socket.h#8 integrate .. //depot/projects/arm/src/sys/sys/user.h#5 integrate .. //depot/projects/arm/src/sys/sys/vmmeter.h#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#10 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#16 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#22 integrate .. //depot/projects/arm/src/sys/vm/vm_glue.c#10 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#17 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#22 integrate .. //depot/projects/arm/src/sys/vm/vm_object.h#5 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#31 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#14 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#14 integrate .. //depot/projects/arm/src/sys/vm/vm_phys.c#3 integrate .. //depot/projects/arm/src/sys/vm/vm_phys.h#3 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_ZONEINFO#1 branch .. //depot/projects/arm/src/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/onetime-a.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/arm/src/tools/regression/priv/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/priv/main.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/main.h#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_acct.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_adjtime.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_audit_control.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_audit_getaudit.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_audit_setaudit.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_audit_submit.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_clock_settime.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_cred.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_io.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_kenv_set.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_kenv_unset.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_msgbuf.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_netinet_raw.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_proc_setlogin.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_proc_setrlimit.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_sched_rtprio.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_sched_setpriority.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_settimeofday.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_sysctl_write.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_admin.c#2 delete .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_chflags.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_chmod.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_chown.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_chroot.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_fhopen.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_fhstat.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_generation.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_getfh.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_read_write.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_setgid.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_utimes.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vm_madv_protect.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vm_mlock.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/priv_vm_munlock.c#2 integrate .. //depot/projects/arm/src/tools/regression/priv/test_utimes.c#2 delete .. //depot/projects/arm/src/tools/tools/crypto/ipsecstats.c#2 integrate .. //depot/projects/arm/src/usr.bin/at/at.c#2 integrate .. //depot/projects/arm/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#3 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.holiday#7 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate .. //depot/projects/arm/src/usr.bin/login/login_fbtab.c#3 integrate .. //depot/projects/arm/src/usr.bin/m4/gnum4.c#2 integrate .. //depot/projects/arm/src/usr.bin/mklocale/yacc.y#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/arm/src/usr.bin/systat/pigs.c#3 integrate .. //depot/projects/arm/src/usr.bin/tar/bsdtar.c#8 integrate .. //depot/projects/arm/src/usr.bin/top/machine.c#5 integrate .. //depot/projects/arm/src/usr.bin/top/top.local.1#2 integrate .. //depot/projects/arm/src/usr.sbin/kbdmap/kbdmap.c#3 integrate .. //depot/projects/arm/src/usr.sbin/periodic/periodic.8#4 integrate .. //depot/projects/arm/src/usr.sbin/repquota/repquota.c#3 integrate .. //depot/projects/arm/src/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/wpa/ndis_events/ndis_events.8#3 integrate .. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#27 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.109 2007/08/07 23:48:30 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -797,6 +797,10 @@ OLD_FILES+=usr/share/man/man1/omshell.1.gz OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz # 200504XX: ipf tools moved from /usr to / +OLD_FILES+=rescue/ipfs +OLD_FILES+=rescue/ipfstat +OLD_FILES+=rescue/ipmon +OLD_FILES+=rescue/ipnat OLD_FILES+=usr/sbin/ipftest OLD_FILES+=usr/sbin/ipresend OLD_FILES+=usr/sbin/ipsend @@ -828,6 +832,7 @@ OLD_FILES+=usr/libexec/getNAME # 200411XX: gvinum replaces vinum OLD_FILES+=bin/vinum +OLD_FILES+=rescue/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz # 200411XX: libxpg4 removal @@ -3296,7 +3301,6 @@ OLD_FILES+=usr/share/man/man4/uaudio.4.gz OLD_FILES+=usr/share/man/man4/utf2.4.gz OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz -OLD_FILES+=usr/share/man/man5/ar.5.gz OLD_FILES+=usr/share/man/man5/disklabel.5.gz OLD_FILES+=usr/share/man/man5/dm.conf.5.gz OLD_FILES+=usr/share/man/man5/ranlib.5.gz ==== //depot/projects/arm/src/bin/getfacl/getfacl.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $"); #include #include @@ -41,6 +41,8 @@ #include #include +#include +#include #include #include #include @@ -55,6 +57,32 @@ fprintf(stderr, "getfacl [-dhq] [file ...]\n"); } +static char * +getuname(uid_t uid) +{ + struct passwd *pw; + static char uids[10]; + + if ((pw = getpwuid(uid)) == NULL) { + (void)snprintf(uids, sizeof(uids), "%u", uid); + return (uids); + } else + return (pw->pw_name); +} + +static char * +getgname(gid_t gid) +{ + struct group *gr; + static char gids[10]; + + if ((gr = getgrgid(gid)) == NULL) { + (void)snprintf(gids, sizeof(gids), "%u", gid); + return (gids); + } else + return (gr->gr_name); +} + /* * return an ACL corresponding to the permissions * contained in struct stat @@ -169,8 +197,8 @@ more_than_one++; if (!qflag) - printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, - sb.st_gid); + printf("# file: %s\n# owner: %s\n# group: %s\n", path, + getuname(sb.st_uid), getgname(sb.st_gid)); if (hflag) acl = acl_get_link_np(path, type); ==== //depot/projects/arm/src/bin/ps/print.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); #include #include @@ -197,14 +197,13 @@ void state(KINFO *k, VARENT *ve) { - int flag, sflag, tdflags; + int flag, tdflags; char *cp; VAR *v; char buf[16]; v = ve->var; flag = k->ki_p->ki_flag; - sflag = k->ki_p->ki_sflag; tdflags = k->ki_p->ki_tdflags; /* XXXKSE */ cp = buf; @@ -242,7 +241,7 @@ *cp = '?'; } cp++; - if (!(sflag & PS_INMEM)) + if (!(flag & P_INMEM)) *cp++ = 'W'; if (k->ki_p->ki_nice < NZERO) *cp++ = '<'; @@ -591,7 +590,7 @@ #define fxtofl(fixpt) ((double)(fixpt) / fscale) /* XXX - I don't like this */ - if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0) + if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0) return (0.0); if (rawcpu) return (100.0 * fxtofl(k->ki_p->ki_pctcpu)); @@ -619,7 +618,7 @@ if (failure) return (0.0); - if ((k->ki_p->ki_sflag & PS_INMEM) == 0) + if ((k->ki_p->ki_flag & P_INMEM) == 0) return (0.0); /* XXX want pmap ptpages, segtab, etc. (per architecture) */ /* XXX don't have info about shared */ ==== //depot/projects/arm/src/bin/ps/ps.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); #include #include @@ -994,13 +994,13 @@ return (s); } -#define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM)) +#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM)) static void saveuser(KINFO *ki) { - if (ki->ki_p->ki_sflag & PS_INMEM) { + if (ki->ki_p->ki_flag & P_INMEM) { /* * The u-area might be swapped out, and we can't get * at it because we have a crashdump and no swap. ==== //depot/projects/arm/src/contrib/less/main.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.11 2007/08/13 16:15:26 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.12 2007/09/04 13:54:09 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -244,7 +244,7 @@ quit(QUIT_OK); } - if (missing_cap && !know_dumb) + if (missing_cap && !know_dumb && !less_is_more) error("WARNING: terminal is not fully functional", NULL_PARG); init_mark(); open_getchr(); ==== //depot/projects/arm/src/etc/defaults/rc.conf#17 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.316 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -154,6 +154,8 @@ pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_program="/sbin/pflogd" # where the pflogd program lives pflog_flags="" # additional flags for pflogd +ftpproxy_enable="NO" # Set to YES to enable ftp-proxy(8) for pf +ftpproxy_flags="" # additional flags for ftp-proxy(8) pfsync_enable="NO" # Expose pf state to other hosts for syncing pfsync_syncdev="" # Interface for pfsync to work through pfsync_syncpeer="" # IP address of pfsync peer host ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -174,6 +174,8 @@ .. stripe .. + virstor + .. .. gnu posix ==== //depot/projects/arm/src/etc/rc.d/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.82 2007/08/17 07:58:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $ .include @@ -11,7 +11,7 @@ devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ - fsck ftpd \ + fsck ftp-proxy ftpd \ gbde geli geli2 \ hcsecd \ hostapd hostid hostname \ ==== //depot/projects/arm/src/etc/rc.d/lockd#3 (text+ko) ==== @@ -2,11 +2,11 @@ # # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.17 2007/08/18 04:08:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ # # PROVIDE: lockd -# REQUIRE: nfsserver nfsclient nfsd rpcbind +# REQUIRE: nfsserver nfsclient nfsd rpcbind statd # BEFORE: DAEMON # KEYWORD: nojail ==== //depot/projects/arm/src/etc/services#4 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.110 2007/05/20 03:57:47 grog Exp $ +# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2186,6 +2186,8 @@ sj3 3086/tcp #SJ3 (kanji input) vmodem 3141/tcp vmodem 3141/udp +iscsi-target 3260/tcp # iSCSI port +iscsi-target 3260/udp # iSCSI port ccmail 3264/tcp #cc:mail/lotus ccmail 3264/udp #cc:mail/lotus dec-notes 3333/tcp #DEC Notes @@ -2326,6 +2328,10 @@ montage-lm 6147/udp #Montage License Manager ricardo-lm 6148/tcp #Ricardo North America License Manager ricardo-lm 6148/udp #Ricardo North America License Manager +sge_qmaster 6444/tcp #Grid Engine Qmaster Service +sge_qmaster 6444/udp #Grid Engine Qmaster Service +sge_execd 6445/tcp #Grid Engine Execution Service +sge_execd 6445/udp #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp ircd 6667/tcp #Internet Relay Chat (unoffical) ==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ==== @@ -1,9 +1,13 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.31 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.32 2007/09/26 01:31:28 marcel Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/ld +.if ${TARGET_ARCH} == "ia64" +CFLAGS+= -O1 +.endif + PROG= ld SCRIPTDIR= /usr/libdata/ldscripts SRCS+= ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \ ==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/genscripts.sh#4 (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.7 2006/09/14 07:46:32 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.9 2007/09/19 14:19:32 obrien 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 @@ -54,8 +54,12 @@ fi # Set some flags for the emultempl scripts. USE_LIBPATH will -# be set for any libpath-using emulation. - USE_LIBPATH=yes +# be set for any libpath-using emulation; NATIVE will be set for a +# emulation to enable 'LD_LIBRARY_PATH=/foo:/bar ld -lfooz' + if [ "x${host}" = "x${target}" ] ; then + NATIVE=yes + fi + USE_LIBPATH=yes # Set the library search path, for libraries named by -lfoo. # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. ==== //depot/projects/arm/src/gnu/usr.bin/cc/cc_int/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.51 2007/05/19 04:25:57 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $ .include "../Makefile.inc" .include "../Makefile.ver" @@ -75,6 +75,10 @@ # Target specific, C specific object file C_TARGET_OBJS= +.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END +.endif + # Language-specific object files for C and Objective C. C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \ c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \ ==== //depot/projects/arm/src/gnu/usr.bin/man/man/man.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.63 2005/12/05 14:22:11 ru Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -884,11 +884,26 @@ next: +#if HAVE_LIBZ > 0 + if ((fp = gzopen (ult, "r")) == NULL) + { + /* check for the compressed version too */ + strlcat(ult, ".gz", FILENAME_MAX); + if ((fp = gzopen (ult, "r")) == NULL) + return ult; /* we munged it, but it doesn't exist anyway */ + } +#else if ((fp = fopen (ult, "r")) == NULL) return ult; +#endif +#if HAVE_LIBZ > 0 + end = gzgets (fp, buf, BUFSIZ); + gzclose(fp); +#else end = fgets (buf, BUFSIZ, fp); fclose(fp); +#endif if (!end || strlen (buf) < 5) return ult; ==== //depot/projects/arm/src/gnu/usr.bin/texinfo/info/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.13 2002/06/05 06:58:32 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.14 2007/09/19 14:21:18 obrien Exp $ PROG= info MAN= info.1 info.5 texinfo.5 @@ -8,7 +8,7 @@ infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \ signals.c terminal.c tilde.c variables.c window.c -CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:/usr/X11R6/info:.\" +CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" DPADD= ${LIBTERMCAP} ${LIBTXI} LDADD= -ltermcap ${LIBTXI} ==== //depot/projects/arm/src/include/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $ +# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -49,7 +49,7 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ - geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ + geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ ==== //depot/projects/arm/src/lib/libarchive/archive_read.3#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.34 2007/05/29 01:00:18 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -267,7 +267,7 @@ The .Va flags argument is passed unmodified to -.Xr archiv_write_disk_set_options 3 . +.Xr archive_write_disk_set_options 3 . .It Fn archive_read_extract_set_progress_callback Sets a pointer to a user-defined callback that can be used for updating progress displays during extraction. ==== //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.14 2007/08/12 17:35:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.17 2007/09/21 04:52:42 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -448,8 +448,10 @@ __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_disk_block"); - if (a->fd < 0) - return (ARCHIVE_OK); + if (a->fd < 0) { + archive_set_error(&a->archive, 0, "File not open"); + return (ARCHIVE_WARN); + } archive_clear_error(&a->archive); /* Seek if necessary to the specified offset. */ @@ -478,12 +480,17 @@ _archive_write_data(struct archive *_a, const void *buff, size_t size) { struct archive_write_disk *a = (struct archive_write_disk *)_a; + int r; + __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); if (a->fd < 0) return (ARCHIVE_OK); - return (_archive_write_data_block(_a, buff, size, a->offset)); + r = _archive_write_data_block(_a, buff, size, a->offset); + if (r < ARCHIVE_OK) + return (r); + return (size); } >>> TRUNCATED FOR MAIL (1000 lines) <<<