Date: Sat, 26 Jun 2010 20:12:47 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 180254 for review Message-ID: <201006262012.o5QKClSG067909@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@180254?ac=10 Change 180254 by gcooper@gcooper-bayonetta on 2010/06/26 20:12:41 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#10 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.mips#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/login.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/namedb/named.root#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#8 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/csu/i386-elf/crt1_s.S#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/brk.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/sbrk.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/nls/ru_RU.KOI8-R.msg#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/scripts/ports-install.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/suj.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/check.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/sched/gsched.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/core/geom.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/core/geom.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/ping/ping.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/examples/perfmon/perfmon.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/aibs.4#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man7/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man7/c99.7#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/x86bios/x86bios.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/NOTES#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#8 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.amd64#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.i386#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/ldscript.mips.n32#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/options.amd64#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpi_support/atk0110.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/atpic_vector.s#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/exception.s#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/md_var.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/npx.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/pcb.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/isa/npx.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_clock.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_et.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_module.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_resource.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_sdt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_tc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_bus.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_fattime.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_lock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_module.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_param.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_unit.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_process.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/systrace_args.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/atheros/ar71xx_wdog.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/conf/XLRN32#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/asm.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/cpu.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/pmap.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/pte.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/setjmp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/vm.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/exception.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pm_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#9 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/stack_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/trap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/board.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/board.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/dev/xlr/rge.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/acpi/aibs/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctputil.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/include/npx.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/interrupt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/isa.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/opic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpcht.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/kiic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorthpci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/diskmbr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/pcpu.h#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/systm.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/timeet.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#8 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/cpufreq/est.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/atrtc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/clock.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/local_apic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/timeevents.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/netrate/tcpp/README#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/netrate/tcpp/parallelism.csh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/netrate/tcpp/runit.pl#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/tinybsd/conf/default/TINYBSD#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/tinybsd/conf/vpn/TINYBSD#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/c99/c99.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/du/du.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/du/du.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ypwhich/ypwhich.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/Makefile#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cpucontrol/amd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cpucontrol/intel.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mptutil/mptutil.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-vmware.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-info.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-list.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-part.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/enable-net.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-components.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/query-langs.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/send-logs.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/test-live.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/test-netup.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-disk.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-localize.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-networking.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-newfs.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-parse.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-unmount.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-users.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/parseconfig.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/startautoinstall.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/avail-langs#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/exclude-from-upgrade#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/licenses/bsd-en.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/licenses/intel-en.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/licenses/nvidia-en.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-disk-list#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-disk-size#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-index#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-start-autoinstall#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/README#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pc-autoinstall.conf#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.fbsd-netinstall#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.geli#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.gmirror#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.netinstall#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.restore#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.rsync#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.upgrade#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.zfs#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/timed/timed/measure.c#2 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.653 2010/06/16 16:52:35 raj Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.656 2010/06/24 17:53:25 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -30,9 +30,7 @@ .include <bsd.own.mk> -.if ${MACHINE_ARCH} == "mips" -MK_RESCUE=no # not yet -.endif +.include <bsd.arch.inc.mk> # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to @@ -167,7 +165,7 @@ .if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} +OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile @@ -1110,10 +1108,10 @@ # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_ARCH}-elf +.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf .else -_startup_libs+= lib/csu/${MACHINE_ARCH} +_startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libc ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.6 2010/03/02 07:20:46 joel Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.7 2010/06/20 08:48:30 brian Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -156,14 +156,16 @@ matches processes not in jail. .It Fl l Long output. -Print the process name in addition to the process ID for each matching +For +.Nm pgrep , +print the process name in addition to the process ID for each matching process. If used in conjunction with .Fl f , print the process ID and the full argument list for each matching process. -This option can only be used with the -.Nm pgrep -command. +For +.Nm pkill , +display the kill command used for each process killed. .It Fl n Select only the newest (most recently started) of the matching processes. .It Fl o ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.10 2010/03/02 07:20:46 joel Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.11 2010/06/20 08:48:30 brian Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -128,7 +128,7 @@ { char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile; const char *execf, *coref; - int ancestors, debug_opt; + int ancestors, debug_opt, did_action; int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock; size_t jsz; int (*action)(const struct kinfo_proc *); @@ -242,8 +242,6 @@ criteria = 1; break; case 'l': - if (!pgrep) - usage(); longfmt = 1; break; case 'n': @@ -530,16 +528,24 @@ /* * Take the appropriate action for each matched process, if any. */ + did_action = 0; for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) { if (PSKIP(kp)) continue; if (selected[i]) { + if (longfmt && !pgrep) { + did_action = 1; + printf("kill -%d %d\n", signum, kp->ki_pid); + } if (inverse) continue; } else if (!inverse) continue; rv |= (*action)(kp); } + if (!did_action && !pgrep && longfmt) + fprintf(stderr, + "No matching processes belonging to you were found\n"); exit(rv ? STATUS_MATCH : STATUS_NOMATCH); } @@ -552,7 +558,7 @@ if (pgrep) ustr = "[-LSfilnoqvx] [-d delim]"; else - ustr = "[-signal] [-ILfinovx]"; + ustr = "[-signal] [-ILfilnovx]"; fprintf(stderr, "usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#5 (text+ko) ==== @@ -36,10 +36,11 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.81 2010/06/19 10:33:04 jilles Exp $"); #include <stdlib.h> #include <unistd.h> +#include <stdio.h> #include "shell.h" #include "parser.h" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text+ko) ==== @@ -45,7 +45,7 @@ #undef input #undef unput #else -/* +/* * Define YY_INPUT for flex since input() can't be re-defined. */ #define YY_INPUT(buf,result,max_size) \ @@ -60,6 +60,19 @@ buf[n] = *yypcb->pcb_strptr++; \ result = n; \ } +/* + * Do not EOF let tokens to be put back. This does not work with flex. + * On the other hand, leaving current buffer in same state it was when + * last EOF was received guarantees that input() will keep returning EOF + * for all subsequent invocations, which is the effect desired. + */ +#undef unput +#define unput(c) \ + do { \ + int _c = c; \ + if (_c != EOF) \ + yyunput(_c, yytext_ptr); \ + } while(0) #endif static int id_or_type(const char *); @@ -811,8 +824,7 @@ longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); } - if (c0 != EOF) - unput(c0); + unput(c0); return (ttok); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/binutils/doc/readelf.1#2 (text+ko) ==== @@ -247,14 +247,6 @@ .PD Displays the contents of the file's unwind section, if it has one. Only the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. -.IP "\fB\-u\fR" 4 -.IX Item "-u" -.PD 0 -.IP "\fB\-\-unwind\fR" 4 -.IX Item "--unwind" -.PD -Displays the contents of the file's unwind section, if it has one. Only -the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. .IP "\fB\-d\fR" 4 .IX Item "-d" .PD 0 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/login.conf#2 (text+ko) ==== @@ -7,7 +7,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $FreeBSD: src/etc/login.conf,v 1.53 2009/06/23 20:57:27 kib Exp $ +# $FreeBSD: src/etc/login.conf,v 1.54 2010/06/19 09:21:34 brian Exp $ # # Default settings effectively disable resource limits, see the @@ -228,7 +228,7 @@ # # ## -## The dialer class should be used for a dialup PPP/SLIP accounts +## The dialer class should be used for a dialup PPP account ## Welcome messages/news suppressed ## #dialer:\ @@ -247,7 +247,7 @@ # # ## -## Site full-time 24/7 PPP/SLIP connections +## Site full-time 24/7 PPP connection ## - no time accounting, restricted to access via dialin lines ## #site:\ @@ -306,11 +306,6 @@ # :tc=subscriber: # # -#subslip|SLIP Subscriber Accounts:\ -# :tc=dialer:\ -# :tc=subscriber: -# -# #subshell|Shell Subscriber Accounts:\ # :tc=subscriber: # ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.usr.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.345 2010/04/21 12:17:01 avg Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.346 2010/06/24 22:21:47 imp Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -261,6 +261,8 @@ .. nwclient .. + pc-sysinstall + .. perfmon .. pf @@ -1226,6 +1228,20 @@ .. .. .. + pc-sysinstall + backend + .. + backend-partmanager + .. + backend-query + .. + conf + license + .. + .. + doc + .. + .. security .. sendmail ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/namedb/named.root#2 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.16 2010/06/18 08:11:52 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Dec 12, 2008 -; related version of root zone: 2008121200 +; last update: Jun 17, 2010 +; related version of root zone: 2010061700 ; ; formerly NS.INTERNIC.NET ; @@ -63,6 +63,7 @@ ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; ; OPERATED BY VERISIGN, INC. ; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.18 2010/06/17 12:25:47 netchild Exp $ .include <bsd.own.mk> @@ -8,7 +8,6 @@ 200.backup-passwd \ 330.news \ 400.status-disks \ - 404.status-zfs \ 405.status-ata-raid \ 406.status-gmirror \ 407.status-graid3 \ @@ -53,4 +52,9 @@ 500.queuerun .endif +.if ${MK_ZFS} != "no" +FILES+= 404.status-zfs \ + 800.scrub-zfs +.endif + .include <bsd.prog.mk> ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/games/fortune/datfiles/fortunes-o.real#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.36 2010/03/31 18:21:25 uqs Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.37 2010/06/26 07:02:31 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -12433,6 +12433,39 @@ (chorus) -- Crosby, Stills, Nash, "Fair Game" % +Taken from actual police car videos: + +(15) Relax! The handcuffs are tight because they're new. They'll + stretch out after you wear them awhile. +(14) Take your hands off the car and I'll make your birth certificate + a worthless document. +(13) If you run you'll only go to jail tired. +(12) Can you run faster than 1200 feet per second? In case you didn't + know that's the average speed of a 9 mm bullet fired from my gun. +(11) So you don't know how fast you were going. I guess that means I + can write anything I want on the ticket, huh? +(10) Yes, sir, you can talk to the shift supervisor, but I don't think + it will help. Oh, did I mention that I AM the shift supervisor? +(9) Warning? You want a warning? OK, I'm warning you not to do that + again or I'll give you another ticket. +(8) The answer to this last question will determine whether you are + drunk or not. Is Mickey Mouse a cat or a dog? +% +Taken from actual police car videos: + +(7) Fair? You want me to be fair? Listen, fair is a place where you + go to ride on rides, eat cotton candy, and step in monkey poop. +(6) Yeah, we have a quota. Two more tickets and my wife gets a toaster + oven. +(5) No, sir, we don't have quotas anymore. We used to have quotas but + now we're allowed to write as many tickets as we want. +(4) Just how big were those two beers? +(3) In God we trust, all others we run through CPIC/NCIC. +(2) I'm glad to hear the Chief of Police is a good personal friend of + yours. At least you know someone who can post your bail. +(1) You didn't think we gave pretty women tickets? + You're right, we don't -- sign here. +% Taoism: Shit Happens. Confucianism: Confucius say, "Shit Happens". Buddhism: If shit happens, it isn't really shit. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.32 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.33 2010/06/18 11:09:51 kib Exp $ .include <bsd.own.mk> MK_SSP= no @@ -17,7 +17,8 @@ CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-zero-initialized-in-bss \ - -fno-zero-initialized-in-bss -fno-toplevel-reorder + -fno-zero-initialized-in-bss -fno-toplevel-reorder \ + -fno-asynchronous-unwind-tables -fno-omit-frame-pointer CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh,v 1.2 2010/03/04 04:30:16 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh,v 1.3 2010/06/25 05:07:42 jchandra Exp $ . ${srcdir}/emulparams/elf32btsmipn32.sh . ${srcdir}/emulparams/elf_fbsd.sh GENERATE_PIE_SCRIPT=yes +ALIGNMENT=8 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh,v 1.2 2010/03/04 04:30:16 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh,v 1.3 2010/06/25 05:07:42 jchandra Exp $ . ${srcdir}/emulparams/elf32ltsmipn32.sh . ${srcdir}/emulparams/elf_fbsd.sh GENERATE_PIE_SCRIPT=yes +ALIGNMENT=8 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.248 2010/06/09 19:57:20 rdivacky Exp $ +# $FreeBSD: src/lib/Makefile,v 1.249 2010/06/21 19:44:29 ed Exp $ .include <bsd.own.mk> @@ -146,7 +146,7 @@ _libbsnmp= libbsnmp .endif -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/csu/i386-elf/crt1_s.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $ + * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $ */ @@ -30,15 +30,22 @@ .align 4 .globl _start .type _start, @function -_start: xorl %ebp,%ebp +_start: + .cfi_startproc + xorl %ebp,%ebp pushl %ebp + .cfi_def_cfa_offset 4 movl %esp,%ebp + .cfi_offset %ebp,-8 + .cfi_def_cfa_register %ebp andl $0xfffffff0,%esp # align stack leal 8(%ebp),%eax pushl %eax # argv pushl 4(%ebp) # argc pushl %edx # rtld cleanup call _start1 + int3 + .cfi_endproc .size _start, . - _start - .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $" + .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/brk.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.5 2010/06/16 12:55:14 jchandra Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.6 2010/06/25 05:36:36 jchandra Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -47,7 +47,7 @@ .data _C_LABEL(minbrk): - .word _C_LABEL(_end) + PTR_WORD _C_LABEL(_end) .text LEAF(__sys_brk) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/sbrk.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/sbrk.S,v 1.4 2010/06/16 12:55:14 jchandra Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/sbrk.S,v 1.5 2010/06/25 05:36:36 jchandra Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -46,7 +46,7 @@ .data _C_LABEL(__curbrk): - .word _C_LABEL(_end) + PTR_WORD _C_LABEL(_end) .text LEAF(__sys_sbrk) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/nls/ru_RU.KOI8-R.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.2 2009/03/21 10:10:33 maxim Exp $ +$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.3 2010/06/20 06:52:10 maxim Exp $ $ $ Message catalog for ru_RU.KOI8-R locale $ @@ -183,6 +183,16 @@ 87 Атрибут не найден $ EDOOFUS 88 Ошибка программирования +$ EBADMSG +89 Плохой формат сообщения +$ EMULTIHOP +90 Попытка мультихопа +$ ENOLINK +91 Канал разорван +$ EPROTO +92 Ошибка протокола +$ ENOTCAPABLE +93 Недостаточно возможностей $ $ strsignal() support catalog $ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libkvm/kvm_proc.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.103 2010/06/18 01:17:16 sbruno Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -323,7 +323,12 @@ (void)kvm_read(kd, (u_long)proc.p_vmspace, (char *)&vmspace, sizeof(vmspace)); kp->ki_size = vmspace.vm_map.size; - kp->ki_rssize = vmspace.vm_swrss; /* XXX */ + /* + * Approximate the kernel's method of calculating + * this field. + */ +#define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) + kp->ki_rssize = pmap_resident_count(&vmspace.vm_pmap); kp->ki_swrss = vmspace.vm_swrss; kp->ki_tsize = vmspace.vm_tsize; kp->ki_dsize = vmspace.vm_dsize; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/scripts/ports-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $ +# $FreeBSD: src/release/scripts/ports-install.sh,v 1.4 2010/06/19 09:33:11 brian Exp $ # if [ "`id -u`" != "0" ]; then @@ -8,5 +8,5 @@ exit 1 fi echo "Extracting ports tarball into ${DESTDIR}/usr" -cat ports.tgz | tar --unlink -xpzf - -C ${DESTDIR}/usr +tar --unlink -xpzf ports.tgz -C ${DESTDIR}/usr exit 0 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/main.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.59 2010/04/24 07:05:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.60 2010/06/22 00:26:07 delphij Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -388,16 +388,18 @@ /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == FS_SUJ) { - if (preen || reply("USE JOURNAL?")) { - if (suj_check(filesys) == 0) { - if (chkdoreload(mntp) == 0) - exit(0); - exit(4); + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { + if (preen || reply("USE JOURNAL?")) { + if (suj_check(filesys) == 0) { + printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + if (chkdoreload(mntp) == 0) + exit(0); + exit(4); + } } - /* suj_check failed, fall through. */ + printf("** Skipping journal, falling through to full fsck\n\n"); } - printf("** Skipping journal, falling through to full fsck\n"); /* * Write the superblock so we don't try to recover the * journal on another pass. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/suj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.2 2010/04/24 07:58:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.3 2010/06/22 00:26:07 delphij Exp $"); #include <sys/param.h> #include <sys/disklabel.h> @@ -37,12 +37,15 @@ #include <ufs/ufs/dir.h> #include <ufs/ffs/fs.h> +#include <setjmp.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <libufs.h> #include <string.h> #include <strings.h> +#include <sysexits.h> #include <err.h> #include <assert.h> @@ -141,7 +144,10 @@ uint64_t jbytes; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006262012.o5QKClSG067909>