svn commit: r237181 - in user/alc/pvh_global_lock: . cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common contrib/gcc/config/arm etc gnu/lib/libgomp gnu/lib/libstdc++ inclu...

Sun Jun 17 03:59:19 UTC 2012

Author: alc
Date: Sun Jun 17 03:59:17 2012
New Revision: 237181
URL: http://svn.freebsd.org/changeset/base/237181

Log:
  MFC r237179

Added:
  user/alc/pvh_global_lock/sys/arm/include/atags.h
     - copied unchanged from r237179, head/sys/arm/include/atags.h
  user/alc/pvh_global_lock/tools/regression/usr.bin/make/variables/modifier_t/
     - copied from r237179, head/tools/regression/usr.bin/make/variables/modifier_t/
Deleted:
  user/alc/pvh_global_lock/etc/auth.conf
  user/alc/pvh_global_lock/lib/libutil/auth.3
  user/alc/pvh_global_lock/lib/libutil/auth.conf.5
  user/alc/pvh_global_lock/sys/arm/at91/files.at91sam9
Modified:
  user/alc/pvh_global_lock/Makefile.inc1
  user/alc/pvh_global_lock/ObsoleteFiles.inc
  user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  user/alc/pvh_global_lock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  user/alc/pvh_global_lock/contrib/gcc/config/arm/freebsd.h
  user/alc/pvh_global_lock/etc/Makefile
  user/alc/pvh_global_lock/gnu/lib/libgomp/config.h
  user/alc/pvh_global_lock/gnu/lib/libstdc++/config.h
  user/alc/pvh_global_lock/include/paths.h
  user/alc/pvh_global_lock/lib/libc/arm/Symbol.map
  user/alc/pvh_global_lock/lib/libc/gen/fstab.c
  user/alc/pvh_global_lock/lib/libc/gen/getnetgrent.c
  user/alc/pvh_global_lock/lib/libc/gen/signal.3
  user/alc/pvh_global_lock/lib/libc/stdlib/getopt_long.c
  user/alc/pvh_global_lock/lib/libcrypt/Makefile
  user/alc/pvh_global_lock/lib/libcrypt/crypt.3
  user/alc/pvh_global_lock/lib/libcrypt/crypt.c
  user/alc/pvh_global_lock/lib/libkiconv/Makefile
  user/alc/pvh_global_lock/lib/libusb/Makefile
  user/alc/pvh_global_lock/lib/libusb/libusb10.c
  user/alc/pvh_global_lock/lib/libusb/libusb10_io.c
  user/alc/pvh_global_lock/lib/libutil/Makefile
  user/alc/pvh_global_lock/lib/libutil/auth.c
  user/alc/pvh_global_lock/lib/libutil/property.3
  user/alc/pvh_global_lock/libexec/rtld-elf/map_object.c
  user/alc/pvh_global_lock/release/picobsd/tinyware/passwd/passwd.c
  user/alc/pvh_global_lock/sbin/fsck_ffs/suj.c
  user/alc/pvh_global_lock/share/examples/csh/dot.cshrc
  user/alc/pvh_global_lock/share/examples/etc/README.examples
  user/alc/pvh_global_lock/share/examples/mdoc/example.4
  user/alc/pvh_global_lock/share/man/man4/hptrr.4
  user/alc/pvh_global_lock/share/man/man4/ip.4
  user/alc/pvh_global_lock/share/misc/committers-src.dot
  user/alc/pvh_global_lock/share/mk/bsd.own.mk
  user/alc/pvh_global_lock/sys/amd64/acpica/acpi_wakecode.S
  user/alc/pvh_global_lock/sys/amd64/amd64/cpu_switch.S
  user/alc/pvh_global_lock/sys/amd64/amd64/mp_machdep.c
  user/alc/pvh_global_lock/sys/amd64/amd64/trap.c
  user/alc/pvh_global_lock/sys/amd64/conf/GENERIC
  user/alc/pvh_global_lock/sys/amd64/include/pcb.h
  user/alc/pvh_global_lock/sys/amd64/include/pmap.h
  user/alc/pvh_global_lock/sys/amd64/include/smp.h
  user/alc/pvh_global_lock/sys/arm/arm/bcopyinout_xscale.S
  user/alc/pvh_global_lock/sys/arm/arm/bootconfig.c
  user/alc/pvh_global_lock/sys/arm/arm/busdma_machdep.c
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc.c
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_arm10.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_arm11.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_arm7tdmi.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_arm8.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_arm9.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_armv4.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_armv5.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_sa1.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_xscale.S
  user/alc/pvh_global_lock/sys/arm/arm/cpufunc_asm_xscale_c3.S
  user/alc/pvh_global_lock/sys/arm/arm/db_disasm.c
  user/alc/pvh_global_lock/sys/arm/arm/db_interface.c
  user/alc/pvh_global_lock/sys/arm/arm/db_trace.c
  user/alc/pvh_global_lock/sys/arm/arm/disassem.c
  user/alc/pvh_global_lock/sys/arm/arm/dump_machdep.c
  user/alc/pvh_global_lock/sys/arm/arm/elf_trampoline.c
  user/alc/pvh_global_lock/sys/arm/arm/exception.S
  user/alc/pvh_global_lock/sys/arm/arm/gdb_machdep.c
  user/alc/pvh_global_lock/sys/arm/arm/in_cksum.c
  user/alc/pvh_global_lock/sys/arm/arm/intr.c
  user/alc/pvh_global_lock/sys/arm/arm/irq_dispatch.S
  user/alc/pvh_global_lock/sys/arm/arm/machdep.c
  user/alc/pvh_global_lock/sys/arm/arm/mem.c
  user/alc/pvh_global_lock/sys/arm/arm/nexus.c
  user/alc/pvh_global_lock/sys/arm/arm/pmap.c
  user/alc/pvh_global_lock/sys/arm/arm/support.S
  user/alc/pvh_global_lock/sys/arm/arm/swtch.S
  user/alc/pvh_global_lock/sys/arm/arm/sys_machdep.c
  user/alc/pvh_global_lock/sys/arm/arm/trap.c
  user/alc/pvh_global_lock/sys/arm/arm/undefined.c
  user/alc/pvh_global_lock/sys/arm/arm/vectors.S
  user/alc/pvh_global_lock/sys/arm/arm/vm_machdep.c
  user/alc/pvh_global_lock/sys/arm/at91/at91.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_machdep.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_mci.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_pio.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_pio_rm9200.h
  user/alc/pvh_global_lock/sys/arm/at91/at91_pit.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_pitreg.h
  user/alc/pvh_global_lock/sys/arm/at91/at91_pmcvar.h
  user/alc/pvh_global_lock/sys/arm/at91/at91_reset.S
  user/alc/pvh_global_lock/sys/arm/at91/at91_rst.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_ssc.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_st.c
  user/alc/pvh_global_lock/sys/arm/at91/at91_wdtreg.h
  user/alc/pvh_global_lock/sys/arm/at91/at91rm9200.c
  user/alc/pvh_global_lock/sys/arm/at91/at91rm92reg.h
  user/alc/pvh_global_lock/sys/arm/at91/at91sam9260reg.h
  user/alc/pvh_global_lock/sys/arm/at91/at91sam9g20.c
  user/alc/pvh_global_lock/sys/arm/at91/at91sam9g20reg.h
  user/alc/pvh_global_lock/sys/arm/at91/at91var.h
  user/alc/pvh_global_lock/sys/arm/at91/board_qila9g20.c
  user/alc/pvh_global_lock/sys/arm/at91/board_sam9g20ek.c
  user/alc/pvh_global_lock/sys/arm/at91/files.at91
  user/alc/pvh_global_lock/sys/arm/at91/if_macb.c
  user/alc/pvh_global_lock/sys/arm/at91/std.at91
  user/alc/pvh_global_lock/sys/arm/at91/std.at91sam9
  user/alc/pvh_global_lock/sys/arm/at91/uart_cpu_at91rm9200usart.c
  user/alc/pvh_global_lock/sys/arm/conf/AVILA
  user/alc/pvh_global_lock/sys/arm/conf/BWCT
  user/alc/pvh_global_lock/sys/arm/conf/CAMBRIA
  user/alc/pvh_global_lock/sys/arm/conf/CNS11XXNAS
  user/alc/pvh_global_lock/sys/arm/conf/CRB
  user/alc/pvh_global_lock/sys/arm/conf/EP80219
  user/alc/pvh_global_lock/sys/arm/conf/GUMSTIX
  user/alc/pvh_global_lock/sys/arm/conf/GUMSTIX-QEMU
  user/alc/pvh_global_lock/sys/arm/conf/HL200
  user/alc/pvh_global_lock/sys/arm/conf/HL201
  user/alc/pvh_global_lock/sys/arm/conf/IQ31244
  user/alc/pvh_global_lock/sys/arm/conf/KB920X
  user/alc/pvh_global_lock/sys/arm/conf/LN2410SBC
  user/alc/pvh_global_lock/sys/arm/conf/NSLU
  user/alc/pvh_global_lock/sys/arm/conf/QILA9G20
  user/alc/pvh_global_lock/sys/arm/conf/QILA9G20.hints
  user/alc/pvh_global_lock/sys/arm/conf/SAM9G20EK
  user/alc/pvh_global_lock/sys/arm/conf/SAM9G20EK.hints
  user/alc/pvh_global_lock/sys/arm/conf/SIMICS
  user/alc/pvh_global_lock/sys/arm/econa/econa_machdep.c
  user/alc/pvh_global_lock/sys/arm/include/armreg.h
  user/alc/pvh_global_lock/sys/arm/include/asmacros.h
  user/alc/pvh_global_lock/sys/arm/include/atomic.h
  user/alc/pvh_global_lock/sys/arm/include/blockio.h
  user/alc/pvh_global_lock/sys/arm/include/cpufunc.h
  user/alc/pvh_global_lock/sys/arm/include/elf.h
  user/alc/pvh_global_lock/sys/arm/include/endian.h
  user/alc/pvh_global_lock/sys/arm/include/fdt.h
  user/alc/pvh_global_lock/sys/arm/include/fp.h
  user/alc/pvh_global_lock/sys/arm/include/frame.h
  user/alc/pvh_global_lock/sys/arm/include/ieee.h
  user/alc/pvh_global_lock/sys/arm/include/in_cksum.h
  user/alc/pvh_global_lock/sys/arm/include/intr.h
  user/alc/pvh_global_lock/sys/arm/include/katelib.h
  user/alc/pvh_global_lock/sys/arm/include/machdep.h
  user/alc/pvh_global_lock/sys/arm/include/param.h
  user/alc/pvh_global_lock/sys/arm/include/pmap.h
  user/alc/pvh_global_lock/sys/arm/include/pmc_mdep.h
  user/alc/pvh_global_lock/sys/arm/include/profile.h
  user/alc/pvh_global_lock/sys/arm/include/pte.h
  user/alc/pvh_global_lock/sys/arm/include/resource.h
  user/alc/pvh_global_lock/sys/arm/include/stack.h
  user/alc/pvh_global_lock/sys/arm/include/vmparam.h
  user/alc/pvh_global_lock/sys/arm/mv/mv_machdep.c
  user/alc/pvh_global_lock/sys/arm/mv/mvwin.h
  user/alc/pvh_global_lock/sys/arm/mv/std.mv
  user/alc/pvh_global_lock/sys/arm/s3c2xx0/s3c2410reg.h
  user/alc/pvh_global_lock/sys/arm/s3c2xx0/s3c2440reg.h
  user/alc/pvh_global_lock/sys/arm/s3c2xx0/s3c24x0.c
  user/alc/pvh_global_lock/sys/arm/s3c2xx0/s3c24x0_machdep.c
  user/alc/pvh_global_lock/sys/arm/s3c2xx0/s3c24x0reg.h
  user/alc/pvh_global_lock/sys/arm/sa11x0/assabet_machdep.c
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0.c
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0_gpioreg.h
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0_io_asm.S
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0_irq.S
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0_ost.c
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0_ostreg.h
  user/alc/pvh_global_lock/sys/arm/sa11x0/sa11x0_var.h
  user/alc/pvh_global_lock/sys/arm/sa11x0/uart_dev_sa1110.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/ep80219_machdep.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321_aau.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321_dma.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321_intr.h
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321_pci.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321_space.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321_timer.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/i80321reg.h
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/iq31244_7seg.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/iq31244_machdep.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/iq80321.c
  user/alc/pvh_global_lock/sys/arm/xscale/i80321/obio.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/crb_machdep.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/i81342.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/i81342_mcu.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/i81342_pci.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/i81342_space.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/i81342reg.h
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/iq81342_7seg.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/obio.c
  user/alc/pvh_global_lock/sys/arm/xscale/i8134x/uart_cpu_i81342.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/avila_ata.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/avila_gpio.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/avila_machdep.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/cambria_exp_space.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/if_npe.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/if_npereg.h
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_iic.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_npe.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_npereg.h
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_pci.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_pci_space.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_qmgr.c
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425_qmgr.h
  user/alc/pvh_global_lock/sys/arm/xscale/ixp425/ixp425reg.h
  user/alc/pvh_global_lock/sys/arm/xscale/pxa/if_smc_smi.c
  user/alc/pvh_global_lock/sys/arm/xscale/pxa/pxa_machdep.c
  user/alc/pvh_global_lock/sys/arm/xscale/pxa/pxareg.h
  user/alc/pvh_global_lock/sys/boot/zfs/zfsimpl.c
  user/alc/pvh_global_lock/sys/conf/kern.post.mk
  user/alc/pvh_global_lock/sys/conf/options.arm
  user/alc/pvh_global_lock/sys/dev/ata/chipsets/ata-ite.c
  user/alc/pvh_global_lock/sys/dev/ath/ath_hal/ah_desc.h
  user/alc/pvh_global_lock/sys/dev/ath/if_ath.c
  user/alc/pvh_global_lock/sys/dev/ath/if_ath_misc.h
  user/alc/pvh_global_lock/sys/dev/ath/if_ath_sysctl.c
  user/alc/pvh_global_lock/sys/dev/ath/if_ath_tx.c
  user/alc/pvh_global_lock/sys/dev/ath/if_ath_tx_ht.c
  user/alc/pvh_global_lock/sys/dev/ath/if_athvar.h
  user/alc/pvh_global_lock/sys/dev/drm2/i915/i915_gem.c
  user/alc/pvh_global_lock/sys/dev/hptrr/hptrr_osm_bsd.c
  user/alc/pvh_global_lock/sys/dev/hwpmc/hwpmc_arm.c
  user/alc/pvh_global_lock/sys/dev/isp/isp_pci.c
  user/alc/pvh_global_lock/sys/dev/mvs/mvs.c
  user/alc/pvh_global_lock/sys/dev/mvs/mvs.h
  user/alc/pvh_global_lock/sys/dev/mvs/mvs_soc.c
  user/alc/pvh_global_lock/sys/dev/pci/pci_pci.c
  user/alc/pvh_global_lock/sys/dev/sym/sym_conf.h
  user/alc/pvh_global_lock/sys/dev/sym/sym_hipd.c
  user/alc/pvh_global_lock/sys/dev/usb/quirk/usb_quirk.c
  user/alc/pvh_global_lock/sys/dev/usb/serial/uftdi.c
  user/alc/pvh_global_lock/sys/dev/usb/serial/uftdi_reg.h
  user/alc/pvh_global_lock/sys/dev/usb/usbdevs
  user/alc/pvh_global_lock/sys/geom/part/g_part_gpt.c
  user/alc/pvh_global_lock/sys/i386/acpica/acpi_wakecode.S
  user/alc/pvh_global_lock/sys/i386/conf/GENERIC
  user/alc/pvh_global_lock/sys/i386/i386/mp_machdep.c
  user/alc/pvh_global_lock/sys/i386/i386/swtch.s
  user/alc/pvh_global_lock/sys/i386/include/pcb.h
  user/alc/pvh_global_lock/sys/i386/include/pmap.h
  user/alc/pvh_global_lock/sys/i386/include/smp.h
  user/alc/pvh_global_lock/sys/ia64/include/pmap.h
  user/alc/pvh_global_lock/sys/kern/kern_descrip.c
  user/alc/pvh_global_lock/sys/kern/kern_event.c
  user/alc/pvh_global_lock/sys/kern/uipc_usrreq.c
  user/alc/pvh_global_lock/sys/kern/vfs_syscalls.c
  user/alc/pvh_global_lock/sys/mips/include/pmap.h
  user/alc/pvh_global_lock/sys/mips/rmi/rootfs_list.txt
  user/alc/pvh_global_lock/sys/net/if.h
  user/alc/pvh_global_lock/sys/net/if_gif.c
  user/alc/pvh_global_lock/sys/netgraph/netflow/netflow_v9.c
  user/alc/pvh_global_lock/sys/netgraph/netflow/ng_netflow.c
  user/alc/pvh_global_lock/sys/netinet/in.h
  user/alc/pvh_global_lock/sys/netinet/in_pcb.c
  user/alc/pvh_global_lock/sys/netinet/in_pcb.h
  user/alc/pvh_global_lock/sys/netinet/ip_input.c
  user/alc/pvh_global_lock/sys/netinet/ip_output.c
  user/alc/pvh_global_lock/sys/netinet/libalias/libalias.3
  user/alc/pvh_global_lock/sys/netinet/sctp_indata.c
  user/alc/pvh_global_lock/sys/netinet/sctp_indata.h
  user/alc/pvh_global_lock/sys/netinet/sctp_input.c
  user/alc/pvh_global_lock/sys/netinet/sctp_input.h
  user/alc/pvh_global_lock/sys/netinet/sctp_output.c
  user/alc/pvh_global_lock/sys/netinet/sctp_output.h
  user/alc/pvh_global_lock/sys/netinet/sctputil.c
  user/alc/pvh_global_lock/sys/netinet/sctputil.h
  user/alc/pvh_global_lock/sys/netinet/udp_usrreq.c
  user/alc/pvh_global_lock/sys/netinet6/ip6_input.c
  user/alc/pvh_global_lock/sys/netinet6/sctp6_usrreq.c
  user/alc/pvh_global_lock/sys/netsmb/smb_dev.c
  user/alc/pvh_global_lock/sys/powerpc/include/pmap.h
  user/alc/pvh_global_lock/sys/sparc64/include/pmap.h
  user/alc/pvh_global_lock/sys/sys/cdefs.h
  user/alc/pvh_global_lock/sys/sys/filedesc.h
  user/alc/pvh_global_lock/sys/sys/kernel.h
  user/alc/pvh_global_lock/sys/ufs/ffs/ffs_softdep.c
  user/alc/pvh_global_lock/sys/vm/pmap.h
  user/alc/pvh_global_lock/sys/vm/swap_pager.c
  user/alc/pvh_global_lock/sys/vm/vm_page.c
  user/alc/pvh_global_lock/sys/vm/vm_page.h
  user/alc/pvh_global_lock/sys/vm/vm_pageout.c
  user/alc/pvh_global_lock/sys/vm/vnode_pager.c
  user/alc/pvh_global_lock/sys/x86/acpica/acpi_wakeup.c
  user/alc/pvh_global_lock/tools/tools/ath/athdebug/athdebug.c
  user/alc/pvh_global_lock/tools/tools/net80211/wlanstats/main.c
  user/alc/pvh_global_lock/usr.bin/find/find.1
  user/alc/pvh_global_lock/usr.sbin/apmd/apmd.8
Directory Properties:
  user/alc/pvh_global_lock/   (props changed)
  user/alc/pvh_global_lock/cddl/contrib/opensolaris/   (props changed)
  user/alc/pvh_global_lock/contrib/gcc/   (props changed)
  user/alc/pvh_global_lock/gnu/lib/   (props changed)
  user/alc/pvh_global_lock/lib/libc/   (props changed)
  user/alc/pvh_global_lock/lib/libutil/   (props changed)
  user/alc/pvh_global_lock/sbin/   (props changed)
  user/alc/pvh_global_lock/share/man/man4/   (props changed)
  user/alc/pvh_global_lock/sys/   (props changed)
  user/alc/pvh_global_lock/sys/boot/   (props changed)
  user/alc/pvh_global_lock/sys/conf/   (props changed)

Modified: user/alc/pvh_global_lock/Makefile.inc1
==============================================================================

--- user/alc/pvh_global_lock/Makefile.inc1	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/Makefile.inc1	Sun Jun 17 03:59:17 2012	(r237181)
@@ -15,6 +15,7 @@
 #	-DNO_WWWUPDATE do not update www in ${MAKE} update
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+#	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
 #	TARGET="machine" to crossbuild world for a different machine type
@@ -88,7 +89,7 @@ SUBDIR+=etc
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
-.for _DIR in ${LOCAL_DIRS}
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+= ${_DIR}
 .endif
@@ -1273,6 +1274,11 @@ _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.for _DIR in ${LOCAL_LIB_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+_generic_libs+= ${_DIR}
+.endif
+.endfor
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 

Modified: user/alc/pvh_global_lock/ObsoleteFiles.inc
==============================================================================
--- user/alc/pvh_global_lock/ObsoleteFiles.inc	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/ObsoleteFiles.inc	Sun Jun 17 03:59:17 2012	(r237181)
@@ -38,8 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20120613: auth.conf removed
+OLD_FILES+=etc/auth.conf
+OLD_FILES+=usr/share/examples/etc/auth.conf
+OLD_FILES+=usr/share/man/man3/auth.3.gz
+OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
-OLD_FILES+=/etc/pam.d/kde
+OLD_FILES+=etc/pam.d/kde
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd

Modified: user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sun Jun 17 03:59:17 2012	(r237181)
@@ -1348,6 +1348,8 @@ reports are printed.
 .It Fl H
 Scripted mode. Do not display headers, and separate fields by a single tab
 instead of arbitrary space.
+.It Fl v
+Show more detailed information.
 .It Fl o Ar property Ns Op , Ns Ar ...
 Comma-separated list of properties to display. See the
 .Qq Sx Properties

Modified: user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -235,7 +235,7 @@ get_usage(zpool_help_t idx) {
 	case HELP_LABELCLEAR:
 		return (gettext("\tlabelclear [-f] <vdev>\n"));
 	case HELP_LIST:
-		return (gettext("\tlist [-H] [-o property[,...]] "
+		return (gettext("\tlist [-Hv] [-o property[,...]] "
 		    "[-T d|u] [pool] ... [interval [count]]\n"));
 	case HELP_OFFLINE:
 		return (gettext("\toffline [-t] <pool> <device> ...\n"));

Modified: user/alc/pvh_global_lock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/alc/pvh_global_lock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -1485,11 +1485,13 @@ zfs_prop_set(zfs_handle_t *zhp, const ch
 
 	/*
 	 * If the dataset's canmount property is being set to noauto,
+	 * or being set to on and the dataset is already mounted,
 	 * then we want to prevent unmounting & remounting it.
 	 */
 	do_prefix = !((prop == ZFS_PROP_CANMOUNT) &&
 	    (zprop_string_to_index(prop, propval, &idx,
-	    ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO));
+	    ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO ||
+	    (idx == ZFS_CANMOUNT_ON && zfs_is_mounted(zhp, NULL))));
 
 	if (do_prefix && (ret = changelist_prefix(cl)) != 0)
 		goto error;

Modified: user/alc/pvh_global_lock/contrib/gcc/config/arm/freebsd.h
==============================================================================
--- user/alc/pvh_global_lock/contrib/gcc/config/arm/freebsd.h	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/contrib/gcc/config/arm/freebsd.h	Sun Jun 17 03:59:17 2012	(r237181)
@@ -50,6 +50,7 @@
       %{rdynamic:-export-dynamic}					\
       %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }}	\
     %{static:-Bstatic}}							\
+  %{!static:--hash-style=both}						\
   %{symbolic:-Bsymbolic}						\
   -X %{mbig-endian:-EB} %{mlittle-endian:-EL}"
 

Modified: user/alc/pvh_global_lock/etc/Makefile
==============================================================================
--- user/alc/pvh_global_lock/etc/Makefile	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/etc/Makefile	Sun Jun 17 03:59:17 2012	(r237181)
@@ -7,8 +7,7 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	auth.conf \
-	crontab \
+BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
 	ddb.conf \

Modified: user/alc/pvh_global_lock/gnu/lib/libgomp/config.h
==============================================================================
--- user/alc/pvh_global_lock/gnu/lib/libgomp/config.h	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/gnu/lib/libgomp/config.h	Sun Jun 17 03:59:17 2012	(r237181)
@@ -59,7 +59,7 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if the target supports thread-local storage. */
-#if !defined(__arm__) && !defined(__mips__)
+#if !defined(__mips__)
 #define HAVE_TLS 1
 #endif
 

Modified: user/alc/pvh_global_lock/gnu/lib/libstdc++/config.h
==============================================================================
--- user/alc/pvh_global_lock/gnu/lib/libstdc++/config.h	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/gnu/lib/libstdc++/config.h	Sun Jun 17 03:59:17 2012	(r237181)
@@ -371,7 +371,7 @@
 /* #undef HAVE_TANL */
 
 /* Define to 1 if the target supports thread-local storage. */
-#if !defined(__arm__) && !defined(__mips__)
+#if !defined(__mips__)
 #define HAVE_TLS 1
 #endif
 

Modified: user/alc/pvh_global_lock/include/paths.h
==============================================================================
--- user/alc/pvh_global_lock/include/paths.h	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/include/paths.h	Sun Jun 17 03:59:17 2012	(r237181)
@@ -42,7 +42,6 @@
 /* Locate system binaries. */
 #define	_PATH_SYSPATH	"/sbin:/usr/sbin"
 
-#define	_PATH_AUTHCONF	"/etc/auth.conf"
 #define	_PATH_BSHELL	"/bin/sh"
 #define	_PATH_CAPABILITY	"/etc/capability"
 #define	_PATH_CAPABILITY_DB	"/etc/capability.db"

Modified: user/alc/pvh_global_lock/lib/libc/arm/Symbol.map
==============================================================================
--- user/alc/pvh_global_lock/lib/libc/arm/Symbol.map	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libc/arm/Symbol.map	Sun Jun 17 03:59:17 2012	(r237181)
@@ -33,6 +33,10 @@ FBSD_1.0 {
 	sbrk;
 };
 
+FBSD_1.3 {
+	__flt_rounds;
+};
+
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
@@ -70,7 +74,6 @@ FBSDprivate_1.0 {
 	__divdf3;
 	__floatsisf;
 	__floatsidf;
-	__flt_rounds;
 	__fixsfsi;
 	__fixdfsi;
 	__fixunssfsi;

Modified: user/alc/pvh_global_lock/lib/libc/gen/fstab.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libc/gen/fstab.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libc/gen/fstab.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <fstab.h>
 #include <paths.h>
 #include <stdio.h>
@@ -246,6 +247,8 @@ getfsfile(name)
 int 
 setfsent()
 {
+	int fd;
+
 	if (_fs_fp) {
 		rewind(_fs_fp);
 		LineNo = 0;
@@ -257,11 +260,18 @@ setfsent()
 		else
 			setfstab(getenv("PATH_FSTAB"));
 	}
-	if ((_fs_fp = fopen(path_fstab, "r")) != NULL) {
+	fd = _open(path_fstab, O_RDONLY | O_CLOEXEC);
+	if (fd == -1) {
+		error(errno);
+		return (0);
+	}
+	_fs_fp = fdopen(fd, "r");
+	if (_fs_fp  != NULL) {
 		LineNo = 0;
 		return(1);
 	}
 	error(errno);
+	_close(fd);
 	return(0);
 }
 

Modified: user/alc/pvh_global_lock/lib/libc/gen/getnetgrent.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libc/gen/getnetgrent.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libc/gen/getnetgrent.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -161,8 +161,7 @@ setnetgrent(const char *group)
 	if (group == NULL || !strlen(group))
 		return;
 
-	if (grouphead.gr == (struct netgrp *)0 ||
-		strcmp(group, grouphead.grname)) {
+	if (grouphead.gr == NULL || strcmp(group, grouphead.grname)) {
 		endnetgrent();
 #ifdef YP
 		/* Presumed guilty until proven innocent. */
@@ -172,7 +171,7 @@ setnetgrent(const char *group)
 		 * use NIS exclusively.
 		 */
 		if (((stat(_PATH_NETGROUP, &_yp_statp) < 0) &&
-			errno == ENOENT) || _yp_statp.st_size == 0)
+		    errno == ENOENT) || _yp_statp.st_size == 0)
 			_use_only_yp = _netgr_yp_enabled = 1;
 		if ((netf = fopen(_PATH_NETGROUP,"r")) != NULL ||_use_only_yp){
 		/*
@@ -247,27 +246,24 @@ endnetgrent(void)
 		lp = lp->l_next;
 		free(olp->l_groupname);
 		free(olp->l_line);
-		free((char *)olp);
+		free(olp);
 	}
-	linehead = (struct linelist *)0;
+	linehead = NULL;
 	if (grouphead.grname) {
 		free(grouphead.grname);
-		grouphead.grname = (char *)0;
+		grouphead.grname = NULL;
 	}
 	gp = grouphead.gr;
 	while (gp) {
 		ogp = gp;
 		gp = gp->ng_next;
-		if (ogp->ng_str[NG_HOST])
-			free(ogp->ng_str[NG_HOST]);
-		if (ogp->ng_str[NG_USER])
-			free(ogp->ng_str[NG_USER]);
-		if (ogp->ng_str[NG_DOM])
-			free(ogp->ng_str[NG_DOM]);
-		free((char *)ogp);
+		free(ogp->ng_str[NG_HOST]);
+		free(ogp->ng_str[NG_USER]);
+		free(ogp->ng_str[NG_DOM]);
+		free(ogp);
 	}
-	grouphead.gr = (struct netgrp *)0;
-	nextgrp = (struct netgrp *)0;
+	grouphead.gr = NULL;
+	nextgrp = NULL;
 #ifdef YP
 	_netgr_yp_enabled = 0;
 #endif
@@ -282,7 +278,7 @@ _listmatch(const char *list, const char 
 	int glen = strlen(group);
 
 	/* skip possible leading whitespace */
-	while(isspace((unsigned char)*ptr))
+	while (isspace((unsigned char)*ptr))
 		ptr++;
 
 	while (ptr < list + len) {
@@ -291,7 +287,7 @@ _listmatch(const char *list, const char 
 			ptr++;
 		if (strncmp(cptr, group, glen) == 0 && glen == (ptr - cptr))
 			return (1);
-		while(*ptr == ','  || isspace((unsigned char)*ptr))
+		while (*ptr == ','  || isspace((unsigned char)*ptr))
 			ptr++;
 	}
 
@@ -436,8 +432,7 @@ parse_netgrp(const char *group)
 			break;
 		lp = lp->l_next;
 	}
-	if (lp == (struct linelist *)0 &&
-	    (lp = read_for_group(group)) == (struct linelist *)0)
+	if (lp == NULL && (lp = read_for_group(group)) == NULL)
 		return (1);
 	if (lp->l_parsed) {
 #ifdef DEBUG
@@ -538,7 +533,7 @@ parse_netgrp(const char *group)
 static struct linelist *
 read_for_group(const char *group)
 {
-	char *pos, *spos, *linep;
+	char *linep, *olinep, *pos, *spos;
 	int len, olen;
 	int cont;
 	struct linelist *lp;
@@ -615,15 +610,20 @@ read_for_group(const char *group)
 				} else
 					cont = 0;
 				if (len > 0) {
-					linep = reallocf(linep, olen + len + 1);
+					linep = malloc(olen + len + 1);
 					if (linep == NULL) {
 						free(lp->l_groupname);
 						free(lp);
 						return (NULL);
 					}
+					if (olen > 0) {
+						bcopy(olinep, linep, olen);
+						free(olinep);
+					}
 					bcopy(pos, linep + olen, len);
 					olen += len;
 					*(linep + olen) = '\0';
+					olinep = linep;
 				}
 				if (cont) {
 					if (fgets(line, LINSIZ, netf)) {

Modified: user/alc/pvh_global_lock/lib/libc/gen/signal.3
==============================================================================
--- user/alc/pvh_global_lock/lib/libc/gen/signal.3	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libc/gen/signal.3	Sun Jun 17 03:59:17 2012	(r237181)
@@ -38,20 +38,11 @@
 .Lb libc
 .Sh SYNOPSIS
 .In signal.h
-.\" XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
-.\" The prototype for signal(3) cannot be cleanly marked up in -mdoc
-.\" without the following lower-level tweak.
-.nr in-synopsis-section 0
-.Pp
-.Ft "void \*(lp*" Ns
-.Fo signal
-.Fa "int sig"
-.Fa "void \*(lp*func\*(rp\*(lpint\*(rp"
-.Fc Ns
-.Ft "\*(rp\*(lpint\*(rp" ;
+.\" The following is Quite Ugly, but syntactically correct.
+.\" Don't try to fix it.
+.Ft void
+.Fn \*(lp*signal "int sig" "void \*(lp*func\*(rp\*(lpint\*(rp\*(rp\*(rp\*(lpint"
 .Pp
-.nr in-synopsis-section 1
-.\" XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
 or in
 .Fx Ap s
 equivalent but easier to read typedef'd version:
@@ -98,7 +89,7 @@ an interrupt.
 These signals are defined in the file
 .In signal.h :
 .Bl -column No ".Dv SIGVTALRM" "create core image"
-.It Sy "No	Name	Default Action	Description"
+.It Sy "Num" Ta Sy "Name" Ta Sy "Default Action" Ta Sy "Description"
 .It 1 Ta Dv SIGHUP Ta "terminate process" Ta "terminal line hangup"
 .It 2 Ta Dv SIGINT Ta "terminate process" Ta "interrupt program"
 .It 3 Ta Dv SIGQUIT Ta "create core image" Ta "quit program"

Modified: user/alc/pvh_global_lock/lib/libc/stdlib/getopt_long.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libc/stdlib/getopt_long.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libc/stdlib/getopt_long.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt_long.c,v 1.21 2006/09/22 17:22:05 millert Exp $	*/
+/*	$OpenBSD: getopt_long.c,v 1.22 2006/10/04 21:29:04 jmc Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
 
 /*
@@ -35,13 +35,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: user/alc/pvh_global_lock/lib/libcrypt/Makefile
==============================================================================
--- user/alc/pvh_global_lock/lib/libcrypt/Makefile	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libcrypt/Makefile	Sun Jun 17 03:59:17 2012	(r237181)
@@ -26,11 +26,7 @@ SRCS+=		crypt-des.c crypt-blowfish.c blo
 CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
 .endif
 
-# And the auth_getval() code and support.
-.PATH:		${.CURDIR}/../libutil
-SRCS+=		auth.c property.c
-.for sym in auth_getval property_find properties_read properties_free \
-	    MD4Init MD4Final MD4Update MD4Pad \
+.for sym in MD4Init MD4Final MD4Update MD4Pad \
 	    MD5Init MD5Final MD5Update MD5Pad \
 	    SHA256_Init SHA256_Final SHA256_Update \
 	    SHA512_Init SHA512_Final SHA512_Update

Modified: user/alc/pvh_global_lock/lib/libcrypt/crypt.3
==============================================================================
--- user/alc/pvh_global_lock/lib/libcrypt/crypt.3	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libcrypt/crypt.3	Sun Jun 17 03:59:17 2012	(r237181)
@@ -238,12 +238,6 @@ The
 .Fn crypt_set_format
 function sets the default encoding format according to the supplied
 .Fa string .
-.Pp
-The global default format can be set using the
-.Pa /etc/auth.conf
-file using the
-.Va crypt_default
-property.
 .Sh RETURN VALUES
 The
 .Fn crypt
@@ -260,9 +254,7 @@ Otherwise, a value of 0 is returned.
 .Sh SEE ALSO
 .Xr login 1 ,
 .Xr passwd 1 ,
-.Xr auth_getval 3 ,
 .Xr getpass 3 ,
-.Xr auth.conf 5 ,
 .Xr passwd 5
 .Sh HISTORY
 A rotor-based

Modified: user/alc/pvh_global_lock/lib/libcrypt/crypt.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libcrypt/crypt.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libcrypt/crypt.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -79,23 +79,23 @@ static const struct {
 	}
 };
 
+#ifdef HAS_DES
+#define CRYPT_DEFAULT	"des"
+#else
+#define CRYPT_DEFAULT	"md5"
+#endif
+
 static int crypt_type = -1;
 
 static void
 crypt_setdefault(void)
 {
-	char *def;
 	size_t i;
 
 	if (crypt_type != -1)
 		return;
-	def = auth_getval("crypt_default");
-	if (def == NULL) {
-		crypt_type = 0;
-		return;
-	}
 	for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
-		if (strcmp(def, crypt_types[i].name) == 0) {
+		if (strcmp(CRYPT_DEFAULT, crypt_types[i].name) == 0) {
 			crypt_type = (int)i;
 			return;
 		}

Modified: user/alc/pvh_global_lock/lib/libkiconv/Makefile
==============================================================================
--- user/alc/pvh_global_lock/lib/libkiconv/Makefile	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libkiconv/Makefile	Sun Jun 17 03:59:17 2012	(r237181)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
+SHLIBDIR?=	/lib
+
 .include <bsd.own.mk>
 
 LIB=		kiconv
-SHLIBDIR?=	/lib
 SRCS=		kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c
 

Modified: user/alc/pvh_global_lock/lib/libusb/Makefile
==============================================================================
--- user/alc/pvh_global_lock/lib/libusb/Makefile	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libusb/Makefile	Sun Jun 17 03:59:17 2012	(r237181)
@@ -18,6 +18,9 @@ NOGCCERROR=
 
 WARNS?=		2
 
+DPADD=		${LIBPTHREAD}
+LDADD=		-lpthread
+
 MLINKS+=	libusb.3 usb.3
 
 # libusb 0.1 compat

Modified: user/alc/pvh_global_lock/lib/libusb/libusb10.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libusb/libusb10.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libusb/libusb10.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -92,6 +92,7 @@ int
 libusb_init(libusb_context **context)
 {
 	struct libusb_context *ctx;
+	pthread_condattr_t attr;
 	char *debug;
 	int ret;
 
@@ -110,8 +111,28 @@ libusb_init(libusb_context **context)
 	TAILQ_INIT(&ctx->pollfds);
 	TAILQ_INIT(&ctx->tr_done);
 
-	pthread_mutex_init(&ctx->ctx_lock, NULL);
-	pthread_cond_init(&ctx->ctx_cond, NULL);
+	if (pthread_mutex_init(&ctx->ctx_lock, NULL) != 0) {
+		free(ctx);
+		return (LIBUSB_ERROR_NO_MEM);
+	}
+	if (pthread_condattr_init(&attr) != 0) {
+		pthread_mutex_destroy(&ctx->ctx_lock);
+		free(ctx);
+		return (LIBUSB_ERROR_NO_MEM);
+	}
+	if (pthread_condattr_setclock(&attr, CLOCK_MONOTONIC) != 0) {
+		pthread_mutex_destroy(&ctx->ctx_lock);
+		pthread_condattr_destroy(&attr);
+		free(ctx);
+		return (LIBUSB_ERROR_OTHER);
+	}
+	if (pthread_cond_init(&ctx->ctx_cond, &attr) != 0) {
+		pthread_mutex_destroy(&ctx->ctx_lock);
+		pthread_condattr_destroy(&attr);
+		free(ctx);
+		return (LIBUSB_ERROR_NO_MEM);
+	}
+	pthread_condattr_destroy(&attr);
 
 	ctx->ctx_handler = NO_THREAD;
 

Modified: user/alc/pvh_global_lock/lib/libusb/libusb10_io.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libusb/libusb10_io.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libusb/libusb10_io.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -307,12 +307,16 @@ libusb_wait_for_event(libusb_context *ct
 		    &ctx->ctx_lock);
 		return (0);
 	}
-	err = clock_gettime(CLOCK_REALTIME, &ts);
+	err = clock_gettime(CLOCK_MONOTONIC, &ts);
 	if (err < 0)
 		return (LIBUSB_ERROR_OTHER);
 
-	ts.tv_sec = tv->tv_sec;
-	ts.tv_nsec = tv->tv_usec * 1000;
+	/*
+	 * The "tv" arguments points to a relative time structure and
+	 * not an absolute time structure.
+	 */
+	ts.tv_sec += tv->tv_sec;
+	ts.tv_nsec += tv->tv_usec * 1000;
 	if (ts.tv_nsec >= 1000000000) {
 		ts.tv_nsec -= 1000000000;
 		ts.tv_sec++;

Modified: user/alc/pvh_global_lock/lib/libutil/Makefile
==============================================================================
--- user/alc/pvh_global_lock/lib/libutil/Makefile	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libutil/Makefile	Sun Jun 17 03:59:17 2012	(r237181)
@@ -25,14 +25,13 @@ CFLAGS+= -DINET6
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
 
-MAN+=	auth.3 expand_number.3 flopen.3 fparseln.3 hexdump.3 \
+MAN+=	expand_number.3 flopen.3 fparseln.3 hexdump.3 \
 	humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
 	kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \
 	login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \
 	property.3 pty.3 quotafile.3 realhostname.3 realhostname_sa.3 \
 	_secure_path.3 trimdomain.3 uucplock.3
-MAN+=	auth.conf.5 login.conf.5
-MLINKS+= auth.3 auth_getval.3
+MAN+=	login.conf.5
 MLINKS+= kld.3 kld_isloaded.3 kld.3 kld_load.3
 MLINKS+=login_auth.3 auth_cat.3 login_auth.3 auth_checknologin.3
 MLINKS+=login_cap.3 login_close.3 login_cap.3 login_getcapbool.3 \

Modified: user/alc/pvh_global_lock/lib/libutil/auth.c
==============================================================================
--- user/alc/pvh_global_lock/lib/libutil/auth.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libutil/auth.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -31,40 +31,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <fcntl.h>
-#include <libutil.h>
-#include <paths.h>
-#include <syslog.h>
-#include <unistd.h>
-
-static properties P;
-
-static int
-initauthconf(const char *path)
-{
-    int fd;
+#include <stdlib.h>
 
-    if (!P) {
-	if ((fd = open(path, O_RDONLY)) < 0) {
-	    syslog(LOG_ERR, "initauthconf: unable to open file: %s", path);
-	    return 1;
-	}
-	P = properties_read(fd);
-	close(fd);
-	if (!P) {
-	    syslog(LOG_ERR, "initauthconf: unable to parse file: %s", path);
-	    return 1;
-	}
-    }
-    return 0;
-}
+#include <libutil.h>
 
 char *
 auth_getval(const char *name)
 {
-    if (!P && initauthconf(_PATH_AUTHCONF))
-	return NULL;
-    else
-	return property_find(P, name);
+
+	(void)name;
+	return (NULL);
 }

Modified: user/alc/pvh_global_lock/lib/libutil/property.3
==============================================================================
--- user/alc/pvh_global_lock/lib/libutil/property.3	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/lib/libutil/property.3	Sun Jun 17 03:59:17 2012	(r237181)
@@ -90,8 +90,6 @@ are desired, the entire value should be 
 characters.
 Any line beginning with a # or ; character is assumed to
 be a comment and will be ignored.
-.Sh SEE ALSO
-.Xr auth_getval 3
 .Sh AUTHORS
 .An Jordan Hubbard
 .Sh BUGS

Modified: user/alc/pvh_global_lock/libexec/rtld-elf/map_object.c
==============================================================================
--- user/alc/pvh_global_lock/libexec/rtld-elf/map_object.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/libexec/rtld-elf/map_object.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -38,7 +38,7 @@
 #include "debug.h"
 #include "rtld.h"
 
-static Elf_Ehdr *get_elf_header (int, const char *);
+static Elf_Ehdr *get_elf_header(int, const char *);
 static int convert_prot(int);	/* Elf flags -> mmap protection */
 static int convert_flags(int); /* Elf flags -> mmap flags */
 
@@ -121,7 +121,7 @@ map_object(int fd, const char *path, con
     	    if ((segs[nsegs]->p_align & (PAGE_SIZE - 1)) != 0) {
 		_rtld_error("%s: PT_LOAD segment %d not page-aligned",
 		    path, nsegs);
-		return NULL;
+		goto error;
 	    }
 	    break;
 
@@ -161,12 +161,12 @@ map_object(int fd, const char *path, con
     }
     if (phdyn == NULL) {
 	_rtld_error("%s: object is not dynamically-linked", path);
-	return NULL;
+	goto error;
     }
 
     if (nsegs < 0) {
 	_rtld_error("%s: too few PT_LOAD segments", path);
-	return NULL;
+	goto error;
     }
 
     /*
@@ -183,13 +183,12 @@ map_object(int fd, const char *path, con
     if (mapbase == (caddr_t) -1) {
 	_rtld_error("%s: mmap of entire address space failed: %s",
 	  path, rtld_strerror(errno));
-	return NULL;
+	goto error;
     }
     if (base_addr != NULL && mapbase != base_addr) {
 	_rtld_error("%s: mmap returned wrong address: wanted %p, got %p",
 	  path, base_addr, mapbase);
-	munmap(mapbase, mapsize);
-	return NULL;
+	goto error1;
     }
 
     for (i = 0; i <= nsegs; i++) {
@@ -201,10 +200,10 @@ map_object(int fd, const char *path, con
 	data_prot = convert_prot(segs[i]->p_flags);
 	data_flags = convert_flags(segs[i]->p_flags) | MAP_FIXED;
 	if (mmap(data_addr, data_vlimit - data_vaddr, data_prot,
-	  data_flags, fd, data_offset) == (caddr_t) -1) {
+	  data_flags | MAP_PREFAULT_READ, fd, data_offset) == (caddr_t) -1) {
 	    _rtld_error("%s: mmap of data failed: %s", path,
 		rtld_strerror(errno));
-	    return NULL;
+	    goto error1;
 	}
 
 	/* Do BSS setup */
@@ -221,7 +220,7 @@ map_object(int fd, const char *path, con
 		     mprotect(clear_page, PAGE_SIZE, data_prot|PROT_WRITE)) {
 			_rtld_error("%s: mprotect failed: %s", path,
 			    rtld_strerror(errno));
-			return NULL;
+			goto error1;
 		}
 
 		memset(clear_addr, 0, nclear);
@@ -240,7 +239,7 @@ map_object(int fd, const char *path, con
 		    data_flags | MAP_ANON, -1, 0) == (caddr_t)-1) {
 		    _rtld_error("%s: mmap of bss failed: %s", path,
 			rtld_strerror(errno));
-		    return NULL;
+		    goto error1;
 		}
 	    }
 	}
@@ -273,7 +272,7 @@ map_object(int fd, const char *path, con
 	if (obj->phdr == NULL) {
 	    obj_free(obj);
 	    _rtld_error("%s: cannot allocate program header", path);
-	     return NULL;
+	    goto error1;
 	}
 	memcpy((char *)obj->phdr, (char *)hdr + hdr->e_phoff, phsize);
 	obj->phdr_alloc = true;
@@ -293,63 +292,72 @@ map_object(int fd, const char *path, con
     obj->relro_page = obj->relocbase + trunc_page(relro_page);
     obj->relro_size = round_page(relro_size);
 
-    return obj;
+    munmap(hdr, PAGE_SIZE);
+    return (obj);
+
+error1:
+    munmap(mapbase, mapsize);
+error:
+    munmap(hdr, PAGE_SIZE);
+    return (NULL);
 }
 
 static Elf_Ehdr *
-get_elf_header (int fd, const char *path)
+get_elf_header(int fd, const char *path)
 {
-    static union {
-	Elf_Ehdr hdr;
-	char buf[PAGE_SIZE];
-    } u;
-    ssize_t nbytes;
-
-    if ((nbytes = pread(fd, u.buf, PAGE_SIZE, 0)) == -1) {
-	_rtld_error("%s: read error: %s", path, rtld_strerror(errno));
-	return NULL;
-    }
-
-    /* Make sure the file is valid */
-    if (nbytes < (ssize_t)sizeof(Elf_Ehdr) || !IS_ELF(u.hdr)) {
-	_rtld_error("%s: invalid file format", path);
-	return NULL;
-    }
-    if (u.hdr.e_ident[EI_CLASS] != ELF_TARG_CLASS
-      || u.hdr.e_ident[EI_DATA] != ELF_TARG_DATA) {
-	_rtld_error("%s: unsupported file layout", path);
-	return NULL;
-    }
-    if (u.hdr.e_ident[EI_VERSION] != EV_CURRENT
-      || u.hdr.e_version != EV_CURRENT) {
-	_rtld_error("%s: unsupported file version", path);
-	return NULL;
-    }
-    if (u.hdr.e_type != ET_EXEC && u.hdr.e_type != ET_DYN) {
-	_rtld_error("%s: unsupported file type", path);
-	return NULL;
-    }
-    if (u.hdr.e_machine != ELF_TARG_MACH) {
-	_rtld_error("%s: unsupported machine", path);
-	return NULL;
-    }
+	Elf_Ehdr *hdr;
 
-    /*
-     * We rely on the program header being in the first page.  This is
-     * not strictly required by the ABI specification, but it seems to
-     * always true in practice.  And, it simplifies things considerably.
-     */
-    if (u.hdr.e_phentsize != sizeof(Elf_Phdr)) {
-	_rtld_error(
-	  "%s: invalid shared object: e_phentsize != sizeof(Elf_Phdr)", path);
-	return NULL;
-    }
-    if (u.hdr.e_phoff + u.hdr.e_phnum * sizeof(Elf_Phdr) > (size_t)nbytes) {
-	_rtld_error("%s: program header too large", path);
-	return NULL;
-    }
+	hdr = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE | MAP_PREFAULT_READ,
+	    fd, 0);
+	if (hdr == (Elf_Ehdr *)MAP_FAILED) {
+		_rtld_error("%s: read error: %s", path, rtld_strerror(errno));
+		return (NULL);
+	}
+
+	/* Make sure the file is valid */
+	if (!IS_ELF(*hdr)) {
+		_rtld_error("%s: invalid file format", path);
+		goto error;
+	}
+	if (hdr->e_ident[EI_CLASS] != ELF_TARG_CLASS ||
+	    hdr->e_ident[EI_DATA] != ELF_TARG_DATA) {
+		_rtld_error("%s: unsupported file layout", path);
+		goto error;
+	}
+	if (hdr->e_ident[EI_VERSION] != EV_CURRENT ||
+	    hdr->e_version != EV_CURRENT) {
+		_rtld_error("%s: unsupported file version", path);
+		goto error;
+	}
+	if (hdr->e_type != ET_EXEC && hdr->e_type != ET_DYN) {
+		_rtld_error("%s: unsupported file type", path);
+		goto error;
+	}
+	if (hdr->e_machine != ELF_TARG_MACH) {
+		_rtld_error("%s: unsupported machine", path);
+		goto error;
+	}
 
-    return (&u.hdr);
+	/*
+	 * We rely on the program header being in the first page.  This is
+	 * not strictly required by the ABI specification, but it seems to
+	 * always true in practice.  And, it simplifies things considerably.
+	 */
+	if (hdr->e_phentsize != sizeof(Elf_Phdr)) {
+		_rtld_error(
+	    "%s: invalid shared object: e_phentsize != sizeof(Elf_Phdr)", path);
+		goto error;
+	}
+	if (hdr->e_phoff + hdr->e_phnum * sizeof(Elf_Phdr) >
+	    (size_t)PAGE_SIZE) {
+		_rtld_error("%s: program header too large", path);
+		goto error;
+	}
+	return (hdr);
+
+error:
+	munmap(hdr, PAGE_SIZE);
+	return (NULL);
 }
 
 void

Modified: user/alc/pvh_global_lock/release/picobsd/tinyware/passwd/passwd.c
==============================================================================
--- user/alc/pvh_global_lock/release/picobsd/tinyware/passwd/passwd.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/release/picobsd/tinyware/passwd/passwd.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -64,10 +64,6 @@ int yp_errno = YP_TRUE;
 extern int yp_passwd( char * );
 #endif
 
-#ifdef KERBEROS
-#include "krb.h"
-#endif
-
 #include "extern.h"
 
 static void usage(void);
@@ -81,26 +77,12 @@ main(argc, argv)
 {
 	int ch;
 	char *uname;
-#ifdef KERBEROS
-	char *iflag = 0, *rflag = 0, *uflag = 0;
-	char *k;
-#endif
 
 #ifdef YP
-#ifdef KERBEROS
-	char realm[REALM_SZ];
-#define OPTIONS "d:h:lysfoi:r:u:"
-#else
 #define OPTIONS "d:h:lysfo"
-#endif
-#else
-#ifdef KERBEROS
-	char realm[REALM_SZ];
-#define OPTIONS "li:r:u:"
 #else
 #define OPTIONS "l"
 #endif
-#endif
 
 #ifdef YP
 	int res = 0;
@@ -113,17 +95,6 @@ main(argc, argv)
 		case 'l':		/* change local password file */
 			use_local_passwd = 1;
 			break;
-#ifdef KERBEROS
-		case 'i':
-			iflag = optarg;
-			break;
-		case 'r':
-			rflag = optarg;
-			break;
-		case 'u':
-			uflag = optarg;
-			break;
-#endif /* KERBEROS */
 #ifdef	YP
 		case 'y':			/* Change NIS password */
 			__use_yp = 1;
@@ -182,46 +153,29 @@ main(argc, argv)
 	/*
 	 * If NIS is turned on in the password database, use it, else punt.
 	 */
-#ifdef KERBEROS
-	if (__use_yp || (iflag == NULL && rflag == NULL && uflag == NULL)) {
-#endif
-		res = use_yp(uname, 0, 0);
-		if (res == USER_YP_ONLY) {
-			if (!use_local_passwd) {
-				exit(yp_passwd(uname));
-			} else {
+	res = use_yp(uname, 0, 0);
+	if (res == USER_YP_ONLY) {
+		if (!use_local_passwd) {
+			exit(yp_passwd(uname));
+		} else {
 			/*
 			 * Reject -l flag if NIS is turned on and the user
 			 * doesn't exist in the local password database.
 			 */
-				errx(1, "unknown local user: %s", uname);
-			}
-		} else if (res == USER_LOCAL_ONLY) {
-			/*
-			 * Reject -y flag if user only exists locally.
-			 */
-			if (__use_yp)
-				errx(1, "unknown NIS user: %s", uname);
-		} else if (res == USER_YP_AND_LOCAL) {
-			if (!use_local_passwd && (yp_in_pw_file || __use_yp))
-				exit(yp_passwd(uname));
+			errx(1, "unknown local user: %s", uname);
 		}
-#ifdef KERBEROS
+	} else if (res == USER_LOCAL_ONLY) {
+		/*
+		 * Reject -y flag if user only exists locally.
+		 */
+		if (__use_yp)
+			errx(1, "unknown NIS user: %s", uname);
+	} else if (res == USER_YP_AND_LOCAL) {
+		if (!use_local_passwd && (yp_in_pw_file || __use_yp))
+			exit(yp_passwd(uname));
 	}
 #endif
-#endif
 
-	if (!use_local_passwd) {
-#ifdef	KERBEROS
-		k = auth_getval("auth_list");
-		if (k && strstr(k, "kerberos"))
-		if(krb_get_lrealm(realm, 0) == KSUCCESS) {
-			setuid(getuid());
-			fprintf(stderr, "realm %s\n", realm);
-			exit(krb_passwd(argv[0], iflag, rflag, uflag));
-		}
-#endif
-	}
 	exit(local_passwd(uname));
 }
 
@@ -230,21 +184,10 @@ usage()
 {
 
 #ifdef	YP
-#ifdef	KERBEROS
-	fprintf(stderr, "%s\n%s\n",
-		"usage: passwd [-l] [-i instance] [-r realm] [-u fullname]",
-		"       passwd [-l] [-y] [-o] [-d domain [-h host]] [user]");
-#else
 	(void)fprintf(stderr,
 		"usage: passwd [-l] [-y] [-o] [-d domain [-h host]] [user]\n");
-#endif
 #else
-#ifdef	KERBEROS
-	fprintf(stderr,
-		"usage: passwd [-l] [-i instance] [-r realm] [-u fullname] [user]\n");
-#else
-	(void)fprintf(stderr, "usage: passwd user\n");
-#endif
+	(void)fprintf(stderr, "usage: passwd [-l] user\n");
 #endif
 	exit(1);
 }

Modified: user/alc/pvh_global_lock/sbin/fsck_ffs/suj.c
==============================================================================
--- user/alc/pvh_global_lock/sbin/fsck_ffs/suj.c	Sun Jun 17 03:54:10 2012	(r237180)
+++ user/alc/pvh_global_lock/sbin/fsck_ffs/suj.c	Sun Jun 17 03:59:17 2012	(r237181)
@@ -1789,6 +1789,20 @@ cg_trunc(struct suj_cg *sc)
 	}
 }
 
+static void
+cg_adj_blk(struct suj_cg *sc)
+{
+	struct suj_ino *sino;
+	int i;
+
+	for (i = 0; i < SUJ_HASHSIZE; i++) {
+		LIST_FOREACH(sino, &sc->sc_inohash[i], si_next) {
+			if (sino->si_blkadj)
+				ino_adjblks(sino);
+		}
+	}
+}
+
 /*
  * Free any partially allocated blocks and then resolve inode block
  * counts.
@@ -2720,6 +2734,7 @@ suj_check(const char *filesys)
 		printf("** Processing journal entries.\n");
 		cg_apply(cg_trunc);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
