svn commit: r271638 - in projects/sendfile: bin/sh bin/sh/tests/parser cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool...

Gleb Smirnoff glebius at FreeBSD.org
Mon Sep 15 18:09:36 UTC 2014 

Author: glebius
Date: Mon Sep 15 18:09:30 2014
New Revision: 271638
URL: http://svnweb.freebsd.org/changeset/base/271638

Log:
  Merge head r271388 through 271631. This merge required some manual
  conflict resolving and coding.

Added:
  projects/sendfile/bin/sh/tests/parser/heredoc12.0
     - copied unchanged from r271631, head/bin/sh/tests/parser/heredoc12.0
  projects/sendfile/contrib/hyperv/
     - copied from r271631, head/contrib/hyperv/
  projects/sendfile/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff
     - copied unchanged from r271631, head/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff
  projects/sendfile/contrib/openpam/lib/libpam/openpam_strlset.c
     - copied unchanged from r271631, head/contrib/openpam/lib/libpam/openpam_strlset.c
  projects/sendfile/contrib/openpam/lib/libpam/openpam_strlset.h
     - copied unchanged from r271631, head/contrib/openpam/lib/libpam/openpam_strlset.h
  projects/sendfile/etc/rc.d/hv_kvpd
     - copied unchanged from r271631, head/etc/rc.d/hv_kvpd
  projects/sendfile/libexec/hyperv/
     - copied from r271631, head/libexec/hyperv/
  projects/sendfile/share/man/man4/iscsi.4
     - copied unchanged from r271631, head/share/man/man4/iscsi.4
  projects/sendfile/sys/arm/altera/socfpga/socfpga_l3regs.h
     - copied unchanged from r271631, head/sys/arm/altera/socfpga/socfpga_l3regs.h
  projects/sendfile/sys/arm/altera/socfpga/socfpga_rstmgr.c
     - copied unchanged from r271631, head/sys/arm/altera/socfpga/socfpga_rstmgr.c
  projects/sendfile/sys/arm/altera/socfpga/socfpga_rstmgr.h
     - copied unchanged from r271631, head/sys/arm/altera/socfpga/socfpga_rstmgr.h
  projects/sendfile/sys/arm/freescale/imx/imx_iomux.c
     - copied unchanged from r271631, head/sys/arm/freescale/imx/imx_iomux.c
  projects/sendfile/sys/boot/common/zfsloader.8
     - copied unchanged from r271631, head/sys/boot/common/zfsloader.8
  projects/sendfile/sys/boot/forth/pcibios.4th
     - copied unchanged from r271631, head/sys/boot/forth/pcibios.4th
  projects/sendfile/sys/boot/i386/gptzfsboot/gptzfsboot.8
     - copied unchanged from r271631, head/sys/boot/i386/gptzfsboot/gptzfsboot.8
  projects/sendfile/sys/boot/i386/zfsboot/zfsboot.8
     - copied unchanged from r271631, head/sys/boot/i386/zfsboot/zfsboot.8
  projects/sendfile/sys/dev/fdt/fdt_pinctrl.c
     - copied unchanged from r271631, head/sys/dev/fdt/fdt_pinctrl.c
  projects/sendfile/sys/dev/fdt/fdt_pinctrl.h
     - copied unchanged from r271631, head/sys/dev/fdt/fdt_pinctrl.h
  projects/sendfile/sys/dev/fdt/fdt_pinctrl_if.m
     - copied unchanged from r271631, head/sys/dev/fdt/fdt_pinctrl_if.m
  projects/sendfile/sys/dev/hyperv/utilities/hv_kvp.c
     - copied unchanged from r271631, head/sys/dev/hyperv/utilities/hv_kvp.c
  projects/sendfile/sys/dev/hyperv/utilities/unicode.h
     - copied unchanged from r271631, head/sys/dev/hyperv/utilities/unicode.h
  projects/sendfile/tools/build/options/WITHOUT_HYPERV
     - copied unchanged from r271631, head/tools/build/options/WITHOUT_HYPERV
  projects/sendfile/tools/build/options/WITH_HYPERV
     - copied unchanged from r271631, head/tools/build/options/WITH_HYPERV
  projects/sendfile/usr.sbin/hyperv/
     - copied from r271631, head/usr.sbin/hyperv/
Deleted:
  projects/sendfile/contrib/openpam/m4/
  projects/sendfile/sys/arm/freescale/imx/imx51_iomux.c
  projects/sendfile/sys/arm/freescale/imx/imx51_iomuxreg.h
  projects/sendfile/sys/arm/freescale/imx/imx6_iomux.c
  projects/sendfile/sys/arm/freescale/imx/imx6_iomuxreg.h
Modified:
  projects/sendfile/bin/sh/input.c
  projects/sendfile/bin/sh/input.h
  projects/sendfile/bin/sh/parser.c
  projects/sendfile/bin/sh/tests/parser/Makefile
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  projects/sendfile/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  projects/sendfile/contrib/openbsm/bin/auditdistd/subr.c
  projects/sendfile/contrib/openpam/CREDITS   (contents, props changed)
  projects/sendfile/contrib/openpam/HISTORY   (contents, props changed)
  projects/sendfile/contrib/openpam/INSTALL   (contents, props changed)
  projects/sendfile/contrib/openpam/LICENSE   (contents, props changed)
  projects/sendfile/contrib/openpam/Makefile.am   (contents, props changed)
  projects/sendfile/contrib/openpam/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/README   (contents, props changed)
  projects/sendfile/contrib/openpam/RELNOTES   (contents, props changed)
  projects/sendfile/contrib/openpam/TODO
  projects/sendfile/contrib/openpam/aclocal.m4   (contents, props changed)
  projects/sendfile/contrib/openpam/autogen.sh   (contents, props changed)
  projects/sendfile/contrib/openpam/bin/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/bin/openpam_dump_policy/Makefile.in
  projects/sendfile/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c
  projects/sendfile/contrib/openpam/bin/pamtest/Makefile.in
  projects/sendfile/contrib/openpam/bin/pamtest/pamtest.1
  projects/sendfile/contrib/openpam/bin/su/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/bin/su/su.1
  projects/sendfile/contrib/openpam/config.h.in   (contents, props changed)
  projects/sendfile/contrib/openpam/configure   (contents, props changed)
  projects/sendfile/contrib/openpam/configure.ac   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_borrow_cred.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_free_data.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_free_envlist.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_get_feature.3
  projects/sendfile/contrib/openpam/doc/man/openpam_get_option.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_log.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_nullconv.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_readline.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_readlinev.3
  projects/sendfile/contrib/openpam/doc/man/openpam_readword.3
  projects/sendfile/contrib/openpam/doc/man/openpam_restore_cred.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_set_feature.3
  projects/sendfile/contrib/openpam/doc/man/openpam_set_option.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam_straddch.3
  projects/sendfile/contrib/openpam/doc/man/openpam_subst.3
  projects/sendfile/contrib/openpam/doc/man/openpam_ttyconv.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam.conf.5   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_acct_mgmt.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_authenticate.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_chauthtok.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_close_session.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_conv.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_end.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_error.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_get_authtok.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_get_data.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_get_item.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_get_user.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_getenv.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_getenvlist.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_info.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_open_session.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_prompt.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_putenv.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_set_data.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_set_item.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_setcred.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_setenv.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_sm_acct_mgmt.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_sm_authenticate.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_sm_chauthtok.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_sm_close_session.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_sm_open_session.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_sm_setcred.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_start.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_strerror.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_verror.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_vinfo.3   (contents, props changed)
  projects/sendfile/contrib/openpam/doc/man/pam_vprompt.3   (contents, props changed)
  projects/sendfile/contrib/openpam/include/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/include/security/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/include/security/openpam_version.h   (contents, props changed)
  projects/sendfile/contrib/openpam/lib/Makefile.am
  projects/sendfile/contrib/openpam/lib/Makefile.in
  projects/sendfile/contrib/openpam/lib/libpam/Makefile.am
  projects/sendfile/contrib/openpam/lib/libpam/Makefile.in
  projects/sendfile/contrib/openpam/lib/libpam/openpam_configure.c
  projects/sendfile/contrib/openpam/lib/libpam/openpam_ctype.h
  projects/sendfile/contrib/openpam/lib/libpam/openpam_dispatch.c
  projects/sendfile/contrib/openpam/lib/libpam/openpam_ttyconv.c
  projects/sendfile/contrib/openpam/lib/libpam/pam_get_authtok.c
  projects/sendfile/contrib/openpam/ltmain.sh   (contents, props changed)
  projects/sendfile/contrib/openpam/mkpkgng.in
  projects/sendfile/contrib/openpam/modules/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/modules/pam_deny/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/modules/pam_permit/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/modules/pam_unix/Makefile.in   (contents, props changed)
  projects/sendfile/contrib/openpam/pamgdb.in
  projects/sendfile/contrib/openpam/t/Makefile.am
  projects/sendfile/contrib/openpam/t/Makefile.in
  projects/sendfile/etc/defaults/rc.conf
  projects/sendfile/etc/motd
  projects/sendfile/etc/mtree/BSD.usr.dist
  projects/sendfile/etc/mtree/BSD.var.dist
  projects/sendfile/etc/network.subr
  projects/sendfile/etc/rc.d/Makefile
  projects/sendfile/etc/rc.subr
  projects/sendfile/lib/libnv/msgio.c
  projects/sendfile/lib/libnv/nv.h
  projects/sendfile/lib/libnv/nv_impl.h
  projects/sendfile/lib/libnv/nvlist.c
  projects/sendfile/lib/libnv/nvlist_impl.h
  projects/sendfile/lib/libnv/nvpair.c
  projects/sendfile/lib/libnv/nvpair_impl.h
  projects/sendfile/lib/libpam/libpam/Makefile
  projects/sendfile/lib/libpam/modules/pam_login_access/pam_login_access.c
  projects/sendfile/libexec/Makefile
  projects/sendfile/release/rc.local
  projects/sendfile/release/scripts/pkg-stage.sh
  projects/sendfile/sbin/camcontrol/camcontrol.c
  projects/sendfile/sbin/dhclient/packet.c
  projects/sendfile/sbin/dump/traverse.c
  projects/sendfile/sbin/ifconfig/ifconfig.h
  projects/sendfile/sbin/ifconfig/sfp.c
  projects/sendfile/sbin/sysctl/sysctl.c
  projects/sendfile/share/examples/bhyve/vmrun.sh
  projects/sendfile/share/man/man4/Makefile
  projects/sendfile/share/man/man4/cxgbe.4
  projects/sendfile/share/man/man5/rc.conf.5
  projects/sendfile/share/man/man5/src.conf.5
  projects/sendfile/share/man/man9/VOP_GETPAGES.9
  projects/sendfile/share/man/man9/ifnet.9
  projects/sendfile/share/man/man9/sysctl.9
  projects/sendfile/share/mk/src.opts.mk
  projects/sendfile/share/vt/keymaps/Makefile
  projects/sendfile/sys/amd64/amd64/machdep.c
  projects/sendfile/sys/amd64/amd64/mp_machdep.c
  projects/sendfile/sys/amd64/include/vmm.h   (contents, props changed)
  projects/sendfile/sys/amd64/vmm/intel/vmx.c
  projects/sendfile/sys/amd64/vmm/vmm.c
  projects/sendfile/sys/arm/altera/socfpga/files.socfpga
  projects/sendfile/sys/arm/altera/socfpga/socfpga_common.c
  projects/sendfile/sys/arm/arm/cpufunc_asm_sheeva.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_xscale.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/sendfile/sys/arm/arm/exception.S
  projects/sendfile/sys/arm/arm/fiq.c
  projects/sendfile/sys/arm/arm/gic.c
  projects/sendfile/sys/arm/arm/locore.S
  projects/sendfile/sys/arm/arm/machdep.c
  projects/sendfile/sys/arm/arm/minidump_machdep.c
  projects/sendfile/sys/arm/arm/mp_machdep.c
  projects/sendfile/sys/arm/arm/nexus.c
  projects/sendfile/sys/arm/arm/pmap-v6.c
  projects/sendfile/sys/arm/arm/pmap.c
  projects/sendfile/sys/arm/arm/trap.c
  projects/sendfile/sys/arm/arm/undefined.c
  projects/sendfile/sys/arm/arm/vm_machdep.c
  projects/sendfile/sys/arm/at91/at91.c
  projects/sendfile/sys/arm/at91/at91_aic.c
  projects/sendfile/sys/arm/at91/at91_pinctrl.c
  projects/sendfile/sys/arm/at91/files.at91
  projects/sendfile/sys/arm/cavium/cns11xx/econa.c
  projects/sendfile/sys/arm/freescale/imx/files.imx51
  projects/sendfile/sys/arm/freescale/imx/files.imx53
  projects/sendfile/sys/arm/freescale/imx/files.imx6
  projects/sendfile/sys/arm/freescale/imx/imx6_machdep.c
  projects/sendfile/sys/arm/freescale/imx/std.imx51
  projects/sendfile/sys/arm/freescale/imx/std.imx53
  projects/sendfile/sys/arm/freescale/imx/std.imx6
  projects/sendfile/sys/arm/include/armreg.h
  projects/sendfile/sys/arm/include/asm.h
  projects/sendfile/sys/arm/include/atomic.h
  projects/sendfile/sys/arm/include/intr.h
  projects/sendfile/sys/arm/include/pmap.h
  projects/sendfile/sys/arm/s3c2xx0/s3c24x0.c
  projects/sendfile/sys/arm/xscale/i80321/i80321_intr.h
  projects/sendfile/sys/arm/xscale/i80321/i80321_timer.c
  projects/sendfile/sys/arm/xscale/i80321/iq80321.c
  projects/sendfile/sys/arm/xscale/i8134x/i81342.c
  projects/sendfile/sys/arm/xscale/ixp425/ixp425.c
  projects/sendfile/sys/arm/xscale/ixp425/ixp425_pci.c
  projects/sendfile/sys/arm/xscale/ixp425/ixp425_timer.c
  projects/sendfile/sys/arm/xscale/pxa/pxa_icu.c
  projects/sendfile/sys/arm/xscale/pxa/pxa_timer.c
  projects/sendfile/sys/boot/amd64/efi/bootinfo.c
  projects/sendfile/sys/boot/amd64/efi/conf.c
  projects/sendfile/sys/boot/common/Makefile.inc
  projects/sendfile/sys/boot/efi/libefi/Makefile
  projects/sendfile/sys/boot/fdt/dts/arm/socfpga.dtsi
  projects/sendfile/sys/boot/ficl/loader.c
  projects/sendfile/sys/boot/i386/gptzfsboot/Makefile
  projects/sendfile/sys/boot/i386/libi386/biospci.c
  projects/sendfile/sys/boot/i386/libi386/comconsole.c
  projects/sendfile/sys/boot/i386/libi386/libi386.h
  projects/sendfile/sys/boot/i386/loader/Makefile
  projects/sendfile/sys/boot/i386/loader/main.c
  projects/sendfile/sys/boot/i386/zfsboot/Makefile
  projects/sendfile/sys/cam/cam_ccb.h
  projects/sendfile/sys/cam/cam_queue.c
  projects/sendfile/sys/cam/cam_queue.h
  projects/sendfile/sys/cam/cam_xpt.c
  projects/sendfile/sys/cam/ctl/ctl.c
  projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/sendfile/sys/cam/ctl/ctl_private.h
  projects/sendfile/sys/cam/ctl/ctl_ser_table.c
  projects/sendfile/sys/cam/scsi/scsi_all.h
  projects/sendfile/sys/cam/scsi/scsi_da.c
  projects/sendfile/sys/cddl/boot/zfs/zfsimpl.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/sendfile/sys/conf/files
  projects/sendfile/sys/conf/files.amd64
  projects/sendfile/sys/conf/files.i386
  projects/sendfile/sys/dev/ahci/ahci.c
  projects/sendfile/sys/dev/ahci/ahci_pci.c
  projects/sendfile/sys/dev/cxgbe/common/t4_regs.h
  projects/sendfile/sys/dev/cxgbe/t4_main.c
  projects/sendfile/sys/dev/hwpmc/hwpmc_powerpc.c
  projects/sendfile/sys/dev/hyperv/include/hyperv.h
  projects/sendfile/sys/dev/hyperv/utilities/hv_kvp.h
  projects/sendfile/sys/dev/hyperv/utilities/hv_util.c
  projects/sendfile/sys/dev/iscsi/iscsi.c
  projects/sendfile/sys/dev/mvs/mvs.c
  projects/sendfile/sys/dev/mvs/mvs_pci.c
  projects/sendfile/sys/dev/mvs/mvs_soc.c
  projects/sendfile/sys/dev/siis/siis.c
  projects/sendfile/sys/dev/usb/serial/u3g.c
  projects/sendfile/sys/dev/vt/hw/ofwfb/ofwfb.c
  projects/sendfile/sys/dev/vt/logo/logo_freebsd.c
  projects/sendfile/sys/dev/vt/vt.h
  projects/sendfile/sys/dev/vt/vt_buf.c
  projects/sendfile/sys/dev/vt/vt_consolectl.c
  projects/sendfile/sys/dev/vt/vt_core.c
  projects/sendfile/sys/fs/ext2fs/ext2_vnops.c
  projects/sendfile/sys/fs/nfsclient/nfs_clbio.c
  projects/sendfile/sys/geom/geom_map.c
  projects/sendfile/sys/i386/i386/initcpu.c
  projects/sendfile/sys/i386/i386/machdep.c
  projects/sendfile/sys/i386/i386/mp_machdep.c
  projects/sendfile/sys/i386/include/md_var.h
  projects/sendfile/sys/i386/xen/mp_machdep.c
  projects/sendfile/sys/kern/kern_cpuset.c
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_event.c
  projects/sendfile/sys/kern/sched_ule.c
  projects/sendfile/sys/kern/sys_pipe.c
  projects/sendfile/sys/kern/sys_procdesc.c
  projects/sendfile/sys/kern/tty_pts.c
  projects/sendfile/sys/kern/uipc_mqueue.c
  projects/sendfile/sys/kern/uipc_sem.c
  projects/sendfile/sys/kern/uipc_shm.c
  projects/sendfile/sys/mips/cavium/octe/ethernet-mdio.c
  projects/sendfile/sys/mips/cavium/octeon_ds1337.c
  projects/sendfile/sys/modules/hyperv/utilities/Makefile
  projects/sendfile/sys/net/if.c
  projects/sendfile/sys/net/if_var.h
  projects/sendfile/sys/net/if_vlan.c
  projects/sendfile/sys/net/route.c
  projects/sendfile/sys/net/rtsock.c
  projects/sendfile/sys/netinet/in_pcb.c
  projects/sendfile/sys/netinet/in_pcb.h
  projects/sendfile/sys/netinet/ip_fastfwd.c
  projects/sendfile/sys/netinet/ip_options.c
  projects/sendfile/sys/netinet/ip_options.h
  projects/sendfile/sys/netinet/ip_output.c
  projects/sendfile/sys/netinet/tcp_hostcache.c
  projects/sendfile/sys/netinet/tcp_hostcache.h
  projects/sendfile/sys/netinet/tcp_usrreq.c
  projects/sendfile/sys/netinet6/in6.c
  projects/sendfile/sys/netinet6/in6.h
  projects/sendfile/sys/netinet6/in6_pcb.c
  projects/sendfile/sys/netinet6/in6_pcb.h
  projects/sendfile/sys/netinet6/in6_var.h
  projects/sendfile/sys/netinet6/ip6_output.c
  projects/sendfile/sys/netinet6/nd6.c
  projects/sendfile/sys/netinet6/scope6.c
  projects/sendfile/sys/netinet6/scope6_var.h
  projects/sendfile/sys/netpfil/pf/pf_ioctl.c
  projects/sendfile/sys/nfsclient/nfs_bio.c
  projects/sendfile/sys/ofed/include/linux/linux_compat.c
  projects/sendfile/sys/opencrypto/cryptodev.c
  projects/sendfile/sys/pc98/pc98/machdep.c
  projects/sendfile/sys/sys/file.h
  projects/sendfile/sys/sys/mbuf.h
  projects/sendfile/sys/sys/param.h
  projects/sendfile/sys/ufs/ffs/ffs_vnops.c
  projects/sendfile/sys/vm/vm_object.h
  projects/sendfile/sys/vm/vm_pager.c
  projects/sendfile/sys/vm/vm_pager.h
  projects/sendfile/sys/vm/vnode_pager.c
  projects/sendfile/sys/vm/vnode_pager.h
  projects/sendfile/sys/x86/x86/identcpu.c
  projects/sendfile/sys/x86/x86/local_apic.c
  projects/sendfile/sys/x86/xen/xen_intr.c
  projects/sendfile/tests/sys/kern/unix_seqpacket_test.c
  projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc
  projects/sendfile/tools/build/options/WITHOUT_RCS
  projects/sendfile/tools/regression/acltools/01.t
  projects/sendfile/tools/regression/acltools/03.t
  projects/sendfile/tools/regression/acltools/04.t
  projects/sendfile/usr.bin/iscsictl/iscsictl.8
  projects/sendfile/usr.bin/mkimg/bsd.c
  projects/sendfile/usr.bin/mkimg/mkimg.1
  projects/sendfile/usr.bin/mkimg/mkimg.c
  projects/sendfile/usr.bin/rctl/rctl.8
  projects/sendfile/usr.bin/truss/arm-fbsd.c
  projects/sendfile/usr.bin/vmstat/vmstat.c
  projects/sendfile/usr.sbin/Makefile
  projects/sendfile/usr.sbin/Makefile.amd64
  projects/sendfile/usr.sbin/Makefile.i386
  projects/sendfile/usr.sbin/bhyve/block_if.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/part_wizard.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit.h
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit_generic.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit_pc98.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/partedit_x86.c
  projects/sendfile/usr.sbin/bsdinstall/partedit/sade.8
  projects/sendfile/usr.sbin/bsdinstall/partedit/scripted.c
  projects/sendfile/usr.sbin/bsdinstall/scripts/auto
  projects/sendfile/usr.sbin/bsdinstall/scripts/config
  projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot
  projects/sendfile/usr.sbin/ctladm/ctladm.8
  projects/sendfile/usr.sbin/ctld/ctl.conf.5
  projects/sendfile/usr.sbin/iscsid/iscsid.8
  projects/sendfile/usr.sbin/iscsid/login.c
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/cddl/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/sendfile/contrib/llvm/   (props changed)
  projects/sendfile/contrib/llvm/tools/clang/   (props changed)
  projects/sendfile/contrib/openbsm/   (props changed)
  projects/sendfile/contrib/openpam/   (props changed)
  projects/sendfile/contrib/openpam/bin/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/bin/su/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/bin/su/su.c   (props changed)
  projects/sendfile/contrib/openpam/compile   (props changed)
  projects/sendfile/contrib/openpam/config.guess   (props changed)
  projects/sendfile/contrib/openpam/config.sub   (props changed)
  projects/sendfile/contrib/openpam/depcomp   (props changed)
  projects/sendfile/contrib/openpam/doc/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/doc/man/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/doc/man/openpam.man   (props changed)
  projects/sendfile/contrib/openpam/doc/man/pam.man   (props changed)
  projects/sendfile/contrib/openpam/include/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/include/security/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/include/security/openpam.h   (props changed)
  projects/sendfile/contrib/openpam/include/security/openpam_attr.h   (props changed)
  projects/sendfile/contrib/openpam/include/security/pam_appl.h   (props changed)
  projects/sendfile/contrib/openpam/include/security/pam_constants.h   (props changed)
  projects/sendfile/contrib/openpam/include/security/pam_modules.h   (props changed)
  projects/sendfile/contrib/openpam/include/security/pam_types.h   (props changed)
  projects/sendfile/contrib/openpam/install-sh   (props changed)
  projects/sendfile/contrib/openpam/misc/gendoc.pl   (props changed)
  projects/sendfile/contrib/openpam/missing   (props changed)
  projects/sendfile/contrib/openpam/modules/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/modules/pam_deny/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/modules/pam_deny/pam_deny.c   (props changed)
  projects/sendfile/contrib/openpam/modules/pam_permit/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/modules/pam_permit/pam_permit.c   (props changed)
  projects/sendfile/contrib/openpam/modules/pam_unix/Makefile.am   (props changed)
  projects/sendfile/contrib/openpam/modules/pam_unix/pam_unix.c   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/share/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/dev/hyperv/   (props changed)
  projects/sendfile/sys/modules/hyperv/   (props changed)
  projects/sendfile/usr.bin/mkimg/   (props changed)
  projects/sendfile/usr.sbin/bhyve/   (props changed)

Modified: projects/sendfile/bin/sh/input.c
==============================================================================
--- projects/sendfile/bin/sh/input.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/bin/sh/input.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -116,33 +116,6 @@ resetinput(void)
 }
 
 
-/*
- * Read a line from the script.
- */
-
-char *
-pfgets(char *line, int len)
-{
-	char *p = line;
-	int nleft = len;
-	int c;
-
-	while (--nleft > 0) {
-		c = pgetc_macro();
-		if (c == PEOF) {
-			if (p == line)
-				return NULL;
-			break;
-		}
-		*p++ = c;
-		if (c == '\n')
-			break;
-	}
-	*p = '\0';
-	return line;
-}
-
-
 
 /*
  * Read a character from the script, returning PEOF on end of file.
@@ -338,7 +311,7 @@ pungetc(void)
  * We handle aliases this way.
  */
 void
-pushstring(char *s, int len, struct alias *ap)
+pushstring(const char *s, int len, struct alias *ap)
 {
 	struct strpush *sp;
 

Modified: projects/sendfile/bin/sh/input.h
==============================================================================
--- projects/sendfile/bin/sh/input.h	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/bin/sh/input.h	Mon Sep 15 18:09:30 2014	(r271638)
@@ -48,12 +48,11 @@ struct alias;
 struct parsefile;
 
 void resetinput(void);
-char *pfgets(char *, int);
 int pgetc(void);
 int preadbuffer(void);
 int preadateof(void);
 void pungetc(void);
-void pushstring(char *, int, struct alias *);
+void pushstring(const char *, int, struct alias *);
 void setinputfile(const char *, int);
 void setinputfd(int, int);
 void setinputstring(const char *, int);

Modified: projects/sendfile/bin/sh/parser.c
==============================================================================
--- projects/sendfile/bin/sh/parser.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/bin/sh/parser.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
  * Shell command parser.
  */
 
-#define	EOFMARKLEN	79
 #define	PROMPTLEN	128
 
 /* values of checkkwd variable */
@@ -718,7 +717,6 @@ parsefname(void)
 	if (n->type == NHERE) {
 		struct heredoc *here = heredoc;
 		struct heredoc *p;
-		int i;
 
 		if (quoteflag == 0)
 			n->type = NXHERE;
@@ -727,7 +725,7 @@ parsefname(void)
 			while (*wordtext == '\t')
 				wordtext++;
 		}
-		if (! noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
+		if (! noexpand(wordtext))
 			synerror("Illegal eof marker for << redirection");
 		rmescapes(wordtext);
 		here->eofmark = wordtext;
@@ -946,6 +944,41 @@ struct tokenstate
 
 
 /*
+ * Check to see whether we are at the end of the here document.  When this
+ * is called, c is set to the first character of the next input line.  If
+ * we are at the end of the here document, this routine sets the c to PEOF.
+ * The new value of c is returned.
+ */
+
+static int
+checkend(int c, const char *eofmark, int striptabs)
+{
+	if (striptabs) {
+		while (c == '\t')
+			c = pgetc();
+	}
+	if (c == *eofmark) {
+		int c2;
+		const char *q;
+
+		for (q = eofmark + 1; c2 = pgetc(), *q != '\0' && c2 == *q; q++)
+			;
+		if ((c2 == PEOF || c2 == '\n') && *q == '\0') {
+			c = PEOF;
+			if (c2 == '\n') {
+				plinno++;
+				needprompt = doprompt;
+			}
+		} else {
+			pungetc();
+			pushstring(eofmark + 1, q - (eofmark + 1), NULL);
+		}
+	}
+	return (c);
+}
+
+
+/*
  * Called to parse command substitutions.
  */
 
@@ -1269,7 +1302,6 @@ readcstyleesc(char *out)
  * will run code that appears at the end of readtoken1.
  */
 
-#define CHECKEND()	{goto checkend; checkend_return:;}
 #define PARSEREDIR()	{goto parseredir; parseredir_return:;}
 #define PARSESUB()	{goto parsesub; parsesub_return:;}
 #define	PARSEARITH()	{goto parsearith; parsearith_return:;}
@@ -1281,7 +1313,6 @@ readtoken1(int firstc, char const *initi
 	int c = firstc;
 	char *out;
 	int len;
-	char line[EOFMARKLEN + 1];
 	struct nodelist *bqlist;
 	int quotef;
 	int newvarnest;
@@ -1303,7 +1334,9 @@ readtoken1(int firstc, char const *initi
 
 	STARTSTACKSTR(out);
 	loop: {	/* for each line, until end of word */
-		CHECKEND();	/* set c to PEOF if at end of here document */
+		if (eofmark)
+			/* set c to PEOF if at end of here document */
+			c = checkend(c, eofmark, striptabs);
 		for (;;) {	/* until end of line or end of word */
 			CHECKSTRSPACE(4, out);	/* permit 4 calls to USTPUTC */
 
@@ -1484,40 +1517,6 @@ endword:
 
 
 /*
- * Check to see whether we are at the end of the here document.  When this
- * is called, c is set to the first character of the next input line.  If
- * we are at the end of the here document, this routine sets the c to PEOF.
- */
-
-checkend: {
-	if (eofmark) {
-		if (striptabs) {
-			while (c == '\t')
-				c = pgetc();
-		}
-		if (c == *eofmark) {
-			if (pfgets(line, sizeof line) != NULL) {
-				const char *p, *q;
-
-				p = line;
-				for (q = eofmark + 1 ; *q && *p == *q ; p++, q++);
-				if ((*p == '\0' || *p == '\n') && *q == '\0') {
-					c = PEOF;
-					if (*p == '\n') {
-						plinno++;
-						needprompt = doprompt;
-					}
-				} else {
-					pushstring(line, strlen(line), NULL);
-				}
-			}
-		}
-	}
-	goto checkend_return;
-}
-
-
-/*
  * Parse a redirection operator.  The variable "out" points to a string
  * specifying the fd to be redirected.  The variable "c" contains the
  * first character of the redirection operator.
@@ -1915,7 +1914,7 @@ char *
 getprompt(void *unused __unused)
 {
 	static char ps[PROMPTLEN];
-	char *fmt;
+	const char *fmt;
 	const char *pwd;
 	int i, trim;
 	static char internal_error[] = "??";
@@ -2029,7 +2028,7 @@ expandstr(const char *ps)
 		parser_temp = NULL;
 		setinputstring(ps, 1);
 		doprompt = 0;
-		readtoken1(pgetc(), DQSYNTAX, "\n\n", 0);
+		readtoken1(pgetc(), DQSYNTAX, "", 0);
 		if (backquotelist != NULL)
 			error("Command substitution not allowed here");
 

Modified: projects/sendfile/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/sendfile/bin/sh/tests/parser/Makefile	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/bin/sh/tests/parser/Makefile	Mon Sep 15 18:09:30 2014	(r271638)
@@ -54,6 +54,7 @@ FILES+=		heredoc8.0
 FILES+=		heredoc9.0
 FILES+=		heredoc10.0
 FILES+=		heredoc11.0
+FILES+=		heredoc12.0
 FILES+=		no-space1.0
 FILES+=		no-space2.0
 FILES+=		only-redir1.0

Copied: projects/sendfile/bin/sh/tests/parser/heredoc12.0 (from r271631, head/bin/sh/tests/parser/heredoc12.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/bin/sh/tests/parser/heredoc12.0	Mon Sep 15 18:09:30 2014	(r271638, copy of r271631, head/bin/sh/tests/parser/heredoc12.0)
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+failures=0
+
+check() {
+	if ! eval "[ $* ]"; then
+		echo "Failed: $*"
+		: $((failures += 1))
+	fi
+}
+
+longmark=`printf %01000d 4`
+longmarkstripped=`printf %0999d 0`
+
+check '"$(cat <<'"$longmark
+$longmark"'
+echo yes)" = "yes"'
+
+check '"$(cat <<\'"$longmark
+$longmark"'
+echo yes)" = "yes"'
+
+check '"$(cat <<'"$longmark
+yes
+$longmark"'
+)" = "yes"'
+
+check '"$(cat <<\'"$longmark
+yes
+$longmark"'
+)" = "yes"'
+
+check '"$(cat <<'"$longmark
+$longmarkstripped
+$longmark.
+$longmark"'
+)" = "'"$longmarkstripped
+$longmark."'"'
+
+check '"$(cat <<\'"$longmark
+$longmarkstripped
+$longmark.
+$longmark"'
+)" = "'"$longmarkstripped
+$longmark."'"'
+
+exit $((failures != 0))

Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -90,36 +90,6 @@ dprintf(int debug, const char *fmt, ...)
 	va_end(ap);
 }
 
-#if !defined(sun)
-static void
-fixsymbol(Elf *e, Elf_Data *data, size_t idx, int nprobes, char *buf,
-    dof_sec_t *sec, int *fixedprobes, char *dofstrtab)
-{
-	GElf_Sym sym;
-	char *s;
-	unsigned char *funcname;
-	dof_probe_t *prb;
-	int j = 0;
-	int ndx;
-
-	while (gelf_getsym(data, j++, &sym) != NULL) {
-		prb = (dof_probe_t *)(void *)(buf + sec->dofs_offset);
-
-		for (ndx = nprobes; ndx; ndx--, prb += 1) {
-			funcname = dofstrtab + prb->dofpr_func;
-			s = elf_strptr(e, idx, sym.st_name);
-			if (strcmp(s, funcname) == 0) {
-				dprintf(1, "fixing %s() symbol\n", s);
-				prb->dofpr_addr = sym.st_value;
-				(*fixedprobes)++;
-			}
-		}
-		if (*fixedprobes == nprobes)
-			break;
-	}
-}
-#endif
-
 #if defined(sun)
 #pragma init(dtrace_dof_init)
 #else
@@ -145,9 +115,6 @@ dtrace_dof_init(void)
 	Lmid_t lmid;
 #else
 	u_long lmid = 0;
-	dof_sec_t *sec, *secstart, *dofstrtab, *dofprobes;
-	dof_provider_t *dofprovider;
-	size_t i;
 #endif
 	int fd;
 	const char *p;
@@ -157,12 +124,9 @@ dtrace_dof_init(void)
 	Elf_Data *symtabdata = NULL, *dynsymdata = NULL, *dofdata = NULL;
 	dof_hdr_t *dof_next = NULL;
 	GElf_Shdr shdr;
-	int efd, nprobes;
+	int efd;
 	char *s;
-	char *dofstrtabraw;
 	size_t shstridx, symtabidx = 0, dynsymidx = 0;
-	unsigned char *buf;
-	int fixedprobes;
 #endif
 
 	if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL)
@@ -183,7 +147,6 @@ dtrace_dof_init(void)
 	}
 #endif
 
-
 	if ((modname = strrchr(lmp->l_name, '/')) == NULL)
 		modname = lmp->l_name;
 	else
@@ -209,9 +172,9 @@ dtrace_dof_init(void)
 		} else if (shdr.sh_type == SHT_DYNSYM) {
 			dynsymidx = shdr.sh_link;
 			dynsymdata = elf_getdata(scn, NULL);
-		} else if (shdr.sh_type == SHT_PROGBITS) {
+		} else if (shdr.sh_type == SHT_SUNW_dof) {
 			s = elf_strptr(e, shstridx, shdr.sh_name);
-			if  (s && strcmp(s, ".SUNW_dof") == 0) {
+			if  (s != NULL && strcmp(s, ".SUNW_dof") == 0) {
 				dofdata = elf_getdata(scn, NULL);
 				dof = dofdata->d_buf;
 			}
@@ -225,7 +188,6 @@ dtrace_dof_init(void)
 	}
 
 	while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) {
-		fixedprobes = 0;
 		dof_next = (void *) ((char *) dof + dof->dofh_filesz);
 #endif
 
@@ -273,76 +235,6 @@ dtrace_dof_init(void)
 		return;
 #endif
 	}
-#if !defined(sun)
-	/*
-	 * We need to fix the base address of each probe since this wasn't
-	 * done by ld(1). (ld(1) needs to grow support for parsing the
-	 * SUNW_dof section).
-	 *
-	 * The complexity of this is not that great. The first for loop
-	 * iterates over the sections inside the DOF file. There are usually
-	 * 10 sections here. We asume the STRTAB section comes first and the
-	 * PROBES section comes after. Since we are only interested in fixing
-	 * data inside the PROBES section we quit the for loop after processing
-	 * the PROBES section. It's usually the case that the first section
-	 * is the STRTAB section and the second section is the PROBES section,
-	 * so this for loop is not meaningful when doing complexity analysis.
-	 *
-	 * After finding the probes section, we iterate over the symbols
-	 * in the symtab section. When we find a symbol name that matches
-	 * the probe function name, we fix it. If we have fixed all the
-	 * probes, we exit all the loops and we are done.
-	 * The number of probes is given by the variable 'nprobes' and this
-	 * depends entirely on the user, but some optimizations were done.
-	 *
-	 * We are assuming the number of probes is less than the number of
-	 * symbols (libc can have 4k symbols, for example).
-	 */
-	secstart = sec = (dof_sec_t *)(dof + 1);
-	buf = (char *)dof;
-	for (i = 0; i < dof->dofh_secnum; i++, sec++) {
-		if (sec->dofs_type != DOF_SECT_PROVIDER)
-			continue;
-
-		dofprovider = (void *) (buf + sec->dofs_offset);
-		dofstrtab = secstart + dofprovider->dofpv_strtab;
-		dofprobes = secstart + dofprovider->dofpv_probes;
-
-		if (dofstrtab->dofs_type != DOF_SECT_STRTAB) {
-			fprintf(stderr, "WARNING: expected STRTAB section, but got %d\n",
-					dofstrtab->dofs_type);
-			break;
-		}
-		if (dofprobes->dofs_type != DOF_SECT_PROBES) {
-			fprintf(stderr, "WARNING: expected PROBES section, but got %d\n",
-			    dofprobes->dofs_type);
-			break;
-		}
-
-		dprintf(1, "found provider %p\n", dofprovider);
-		dofstrtabraw = (char *)(buf + dofstrtab->dofs_offset);
-		nprobes = dofprobes->dofs_size / dofprobes->dofs_entsize;
-		fixsymbol(e, symtabdata, symtabidx, nprobes, buf, dofprobes, &fixedprobes,
-				dofstrtabraw);
-		if (fixedprobes != nprobes) {
-			/*
-			 * If we haven't fixed all the probes using the
-			 * symtab section, look inside the dynsym
-			 * section.
-			 */
-			fixsymbol(e, dynsymdata, dynsymidx, nprobes, buf, dofprobes,
-					&fixedprobes, dofstrtabraw);
-		}
-		if (fixedprobes != nprobes) {
-			fprintf(stderr, "WARNING: number of probes "
-			    "fixed does not match the number of "
-			    "defined probes (%d != %d, "
-			    "respectively)\n", fixedprobes, nprobes);
-			fprintf(stderr, "WARNING: some probes might "
-			    "not fire or your program might crash\n");
-		}
-	}
-#endif
 	if ((gen = ioctl(fd, DTRACEHIOC_ADDDOF, &dh)) == -1)
 		dprintf(1, "DTrace ioctl failed for DOF at %p", dof);
 	else {

Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -322,7 +322,11 @@ prepare_elf64(dtrace_hdl_t *dtp, const d
 	char *strtab;
 	int i, j, nrel;
 	size_t strtabsz = 1;
+#if defined(sun)
 	uint32_t count = 0;
+#else
+	uint64_t count = 0;
+#endif
 	size_t base;
 	Elf64_Sym *sym;
 	Elf64_Rela *rel;
@@ -418,7 +422,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const d
 		s = &dofs[dofrh->dofr_tgtsec];
 
 		for (j = 0; j < nrel; j++) {
-#ifdef DOODAD
 #if defined(__arm__)
 /* XXX */
 #elif defined(__mips__)
@@ -431,8 +434,13 @@ prepare_elf64(dtrace_hdl_t *dtp, const d
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
+#if defined(sun)
 			rel->r_info = ELF64_R_INFO(count + dep->de_global,
 			    R_AMD64_64);
+#else
+			rel->r_info = ELF64_R_INFO(count + dep->de_global,
+			    R_X86_64_RELATIVE);
+#endif
 #elif defined(__sparc)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -441,7 +449,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const d
 #else
 #error unknown ISA
 #endif
-#endif
 
 			sym->st_name = base + dofr[j].dofr_name - 1;
 			sym->st_value = 0;
@@ -704,7 +711,11 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_
 
 	shp = &elf_file.shdr[ESHDR_DOF];
 	shp->sh_name = 11; /* DTRACE_SHSTRTAB64[11] = ".SUNW_dof" */
+#if defined(sun)
 	shp->sh_flags = SHF_ALLOC;
+#else
+	shp->sh_flags = SHF_WRITE | SHF_ALLOC;
+#endif
 	shp->sh_type = SHT_SUNW_dof;
 	shp->sh_offset = off;
 	shp->sh_size = dof->dofh_filesz;
@@ -1662,19 +1673,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 {
 #if !defined(sun)
 	char tfile[PATH_MAX];
-	Elf *e;
-	Elf_Scn *scn;
-	Elf_Data *data;
-	GElf_Shdr shdr;
-	int efd;
-	size_t stridx;
-	unsigned char *buf;
-	char *s;
-	int loc;
-	GElf_Ehdr ehdr;
-	Elf_Scn *scn0;
-	GElf_Shdr shdr0;
-	uint64_t off, rc;
 #endif
 	char drti[PATH_MAX];
 	dof_hdr_t *dof;
@@ -1810,21 +1808,22 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		(void) unlink(file);
 #endif
 
-#if defined(sun)
 	if (dtp->dt_oflags & DTRACE_O_LP64)
 		status = dump_elf64(dtp, dof, fd);
 	else
 		status = dump_elf32(dtp, dof, fd);
 
+#if defined(sun)
 	if (status != 0 || lseek(fd, 0, SEEK_SET) != 0) {
 		return (dt_link_error(dtp, NULL, -1, NULL,
 		    "failed to write %s: %s", file, strerror(errno)));
 	}
 #else
-	/* We don't write the ELF header, just the DOF section */
-	if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz)
+	(void)close(fd);
+	if (status != 0)
 		return (dt_link_error(dtp, NULL, -1, NULL,
-		    "failed to write %s: %s", tfile, strerror(errno)));
+		    "failed to write %s: %s", tfile,
+		    strerror(dtrace_errno(dtp))));
 #endif
 
 	if (!dtp->dt_lazyload) {
@@ -1846,7 +1845,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 
 		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, fd, drti);
 #else
-		const char *fmt = "%s -o %s -r %s";
+		const char *fmt = "%s -o %s -r %s %s";
 
 #if defined(__amd64__)
 		/*
@@ -1868,10 +1867,9 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
 		    drti) + 1;
 
-		len *= 2;
 		cmd = alloca(len);
 
-		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file,
+		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, tfile,
 		    drti);
 #endif
 		if ((status = system(cmd)) == -1) {
@@ -1894,85 +1892,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 			    file, dtp->dt_ld_path, WEXITSTATUS(status));
 			goto done;
 		}
-#if !defined(sun)
-		/*
-		 * FreeBSD's ld(1) is not instructed to interpret and add
-		 * correctly the SUNW_dof section present in tfile.
-		 * We use libelf to add this section manually and hope the next
-		 * ld invocation won't remove it.
-		 */
-		elf_version(EV_CURRENT);
-		if ((efd = open(file, O_RDWR, 0)) < 0) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to open file %s: %s",
-			    file, strerror(errno));
-			goto done;
-		}
-		if ((e = elf_begin(efd, ELF_C_RDWR, NULL)) == NULL) {
-			close(efd);
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to open elf file: %s",
-			    elf_errmsg(elf_errno()));
-			goto done;
-		}
-		/*
-		 * Add the string '.SUWN_dof' to the shstrtab section.
-		 */
-		elf_getshdrstrndx(e, &stridx);
-		scn = elf_getscn(e, stridx);
-		gelf_getshdr(scn, &shdr);
-		data = elf_newdata(scn);
-		data->d_off = shdr.sh_size;
-		data->d_buf = ".SUNW_dof";
-		data->d_size = 10;
-		data->d_type = ELF_T_BYTE;
-		loc = shdr.sh_size;
-		shdr.sh_size += data->d_size;
-		gelf_update_shdr(scn, &shdr);
-		/*
-		 * Construct the .SUNW_dof section.
-		 */
-		scn = elf_newscn(e);
-		data = elf_newdata(scn);
-		buf = mmap(NULL, dof->dofh_filesz, PROT_READ, MAP_SHARED,
-		    fd, 0);
-		if (buf == MAP_FAILED) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to mmap buffer %s", strerror(errno));
-			elf_end(e);
-			close(efd);
-			goto done;
-		}
-		data->d_buf = buf;
-		data->d_align = 4;
-		data->d_size = dof->dofh_filesz;
-		data->d_version = EV_CURRENT;
-		gelf_getshdr(scn, &shdr);
-		shdr.sh_name = loc;
-		shdr.sh_flags = SHF_ALLOC;
-		/*
-		 * Actually this should be SHT_SUNW_dof, but FreeBSD's ld(1)
-		 * will remove this 'unknown' section when we try to create an
-		 * executable using the object we are modifying, so we stop
-		 * playing by the rules and use SHT_PROGBITS.
-		 * Also, note that our drti has modifications to handle this.
-		 */
-		shdr.sh_type = SHT_PROGBITS;
-		shdr.sh_addralign = 4;
-		gelf_update_shdr(scn, &shdr);
-		if (elf_update(e, ELF_C_WRITE) < 0) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to add the SUNW_dof section: %s",
-			    elf_errmsg(elf_errno()));
-			munmap(buf, dof->dofh_filesz);
-			elf_end(e);
-			close(efd);
-			goto done;
-		}
-		munmap(buf, dof->dofh_filesz);
-		elf_end(e);
-		close(efd);
-#endif
 		(void) close(fd); /* release temporary file */
 	} else {
 		(void) close(fd);

Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  */
 
@@ -1426,21 +1426,15 @@ zpool_find_import_cached(libzfs_handle_t
 
 	elem = NULL;
 	while ((elem = nvlist_next_nvpair(raw, elem)) != NULL) {
-		verify(nvpair_value_nvlist(elem, &src) == 0);
+		src = fnvpair_value_nvlist(elem);
 
-		verify(nvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME,
-		    &name) == 0);
+		name = fnvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME);
 		if (poolname != NULL && strcmp(poolname, name) != 0)
 			continue;
 
-		verify(nvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID,
-		    &this_guid) == 0);
-		if (guid != 0) {
-			verify(nvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID,
-			    &this_guid) == 0);
-			if (guid != this_guid)
-				continue;
-		}
+		this_guid = fnvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID);
+		if (guid != 0 && guid != this_guid)
+			continue;
 
 		if (pool_active(hdl, name, this_guid, &active) != 0) {
 			nvlist_free(raw);

Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -650,6 +650,9 @@ dprintf_setup(int *argc, char **argv)
 	 */
 	if (dprintf_find_string("on"))
 		dprintf_print_all = 1;
+
+	if (dprintf_string != NULL)
+		zfs_flags |= ZFS_DEBUG_DPRINTF;
 }
 
 int

Modified: projects/sendfile/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp	Mon Sep 15 18:09:30 2014	(r271638)
@@ -300,6 +300,8 @@ void X86TargetLowering::resetOperationAc
   setTruncStoreAction(MVT::i32, MVT::i8 , Expand);
   setTruncStoreAction(MVT::i16, MVT::i8,  Expand);
 
+  setTruncStoreAction(MVT::f64, MVT::f32, Expand);
+
   // SETOEQ and SETUNE require checking two conditions.
   setCondCodeAction(ISD::SETOEQ, MVT::f32, Expand);
   setCondCodeAction(ISD::SETOEQ, MVT::f64, Expand);
@@ -1011,8 +1013,6 @@ void X86TargetLowering::resetOperationAc
       AddPromotedToType (ISD::SELECT, VT, MVT::v2i64);
     }
 
-    setTruncStoreAction(MVT::f64, MVT::f32, Expand);
-
     // Custom lower v2i64 and v2f64 selects.
     setOperationAction(ISD::LOAD,               MVT::v2f64, Legal);
     setOperationAction(ISD::LOAD,               MVT::v2i64, Legal);

Copied: projects/sendfile/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff (from r271631, head/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff	Mon Sep 15 18:09:30 2014	(r271638, copy of r271631, head/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff)
@@ -0,0 +1,46 @@
+commit 96365aef99ec463375dfdaf6eb260823e0477b6a
+Author: Adrian Prantl <aprantl at apple.com>
+Date:   Tue Apr 1 17:52:06 2014 +0000
+
+    Debug info: fix a crash when emitting IndirectFieldDecls, which were
+    previously not handled at all.
+    rdar://problem/16348575
+    
+    git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@205331 91177308-0d34-0410-b5e6-96231b3b80d8
+
+diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
+index 82db942..2556cf9 100644
+--- tools/clang/lib/CodeGen/CGDebugInfo.cpp
++++ tools/clangb/lib/CodeGen/CGDebugInfo.cpp
+@@ -1252,7 +1252,7 @@ CollectTemplateParams(const TemplateParameterList *TPList,
+         V = CGM.GetAddrOfFunction(FD);
+       // Member data pointers have special handling too to compute the fixed
+       // offset within the object.
+-      if (isa<FieldDecl>(D)) {
++      if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
+         // These five lines (& possibly the above member function pointer
+         // handling) might be able to be refactored to use similar code in
+         // CodeGenModule::getMemberPointerConstant
+diff --git a/test/CodeGenCXX/debug-info-indirect-field-decl.cpp b/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
+new file mode 100644
+index 0000000..131ceba
+--- /dev/null
++++ tools/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
+@@ -0,0 +1,17 @@
++// RUN: %clang_cc1 -emit-llvm -g -triple x86_64-apple-darwin %s -o - | FileCheck %s
++//
++// Test that indirect field decls are handled gracefully.
++// rdar://problem/16348575
++//
++template <class T, int T::*ptr> class Foo {  };
++
++struct Bar {
++  int i1;
++  // CHECK: [ DW_TAG_member ] [line [[@LINE+1]], size 32, align 32, offset 32] [from _ZTSN3BarUt_E]
++  union {
++    // CHECK: [ DW_TAG_member ] [i2] [line [[@LINE+1]], size 32, align 32, offset 0] [from int]
++    int i2;
++  };
++};
++
++Foo<Bar, &Bar::i2> the_foo;

Modified: projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
==============================================================================
--- projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Mon Sep 15 18:09:30 2014	(r271638)
@@ -1241,7 +1241,7 @@ CollectTemplateParams(const TemplatePara
         V = CGM.GetAddrOfFunction(FD);
       // Member data pointers have special handling too to compute the fixed
       // offset within the object.
-      if (isa<FieldDecl>(D)) {
+      if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
         // These five lines (& possibly the above member function pointer
         // handling) might be able to be refactored to use similar code in
         // CodeGenModule::getMemberPointerConstant

Modified: projects/sendfile/contrib/openbsm/bin/auditdistd/subr.c
==============================================================================
--- projects/sendfile/contrib/openbsm/bin/auditdistd/subr.c	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openbsm/bin/auditdistd/subr.c	Mon Sep 15 18:09:30 2014	(r271638)
@@ -228,6 +228,11 @@ wait_for_file_init(int fd)
 	PJDLOG_ASSERT(fd != -1);
 
 #ifdef HAVE_KQUEUE
+	if (wait_for_file_kq != -1) {
+		close(wait_for_file_kq);
+		wait_for_file_kq = -1;
+	}
+
 	kq = kqueue();
 	if (kq == -1) {
 		pjdlog_errno(LOG_WARNING, "kqueue() failed");

Modified: projects/sendfile/contrib/openpam/CREDITS
==============================================================================
--- projects/sendfile/contrib/openpam/CREDITS	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/CREDITS	Mon Sep 15 18:09:30 2014	(r271638)
@@ -15,6 +15,8 @@ directly or indirectly, with patches, cr
 ideas:
 
 	Andrew Morgan <morgan at transmeta.com>
+	Ankita Pal <pal.ankita.ankita at gmail.com>
+	Baptiste Daroussin <bapt at freebsd.org>
 	Brian Fundakowski Feldman <green at freebsd.org>
 	Christos Zoulas <christos at netbsd.org>
 	Daniel Richard G. <skunk at iskunk.org>
@@ -25,6 +27,7 @@ ideas:
 	Eric Melville <eric at freebsd.org>
 	Espen Grøndahl <espegro at usit.uio.no>
 	Gary Winiger <gary.winiger at sun.com>
+	Gavin Atkinson <gavin at freebsd.org>
 	Gleb Smirnoff <glebius at freebsd.org>
 	Hubert Feyrer <hubert at feyrer.de>
 	Jason Evans <jasone at freebsd.org>
@@ -46,5 +49,3 @@ ideas:
 	Takanori Saneto <sanewo at ba2.so-net.ne.jp>
 	Wojciech A. Koszek <wkoszek at freebsd.org>
 	Yar Tikhiy <yar at freebsd.org>
-
-$Id: CREDITS 648 2013-03-05 17:54:27Z des $

Modified: projects/sendfile/contrib/openpam/HISTORY
==============================================================================
--- projects/sendfile/contrib/openpam/HISTORY	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/HISTORY	Mon Sep 15 18:09:30 2014	(r271638)
@@ -1,3 +1,24 @@
+OpenPAM Ourouparia						2014-09-12
+
+ - ENHANCE: When executing a chain, require at least one service
+   function to succeed.  This mitigates fail-open scenarios caused by
+   misconfigurations or missing modules.
+
+ - ENHANCE: Make sure to overwrite buffers which may have contained an
+   authentication token when they're no longer needed.
+
+ - BUGFIX: Under certain circumstances, specifying a non-existent
+   module (or misspelling the name of a module) in a policy could
+   result in a fail-open scenario.  (CVE-2014-3879)
+
+ - FEATURE: Add a search path for modules.  This was implemented in
+   Nummularia but inadvertently left out of the release notes.
+
+ - BUGFIX: The is_upper() predicate only accepted the letter A as an
+   upper-case character instead of the entire A-Z range.  As a result,
+   service and module names containing upper-case letters other than A
+   would be rejected.
+============================================================================
 OpenPAM Nummularia						2013-09-07
 
  - ENHANCE: Rewrite the dynamic loader to improve readability and
@@ -97,7 +118,7 @@ OpenPAM Lycopsida						2011-12-18
    module before loading it.
 
  - ENHANCE: added / improved input validation in many cases, including
-   the policy file and some function arguments.
+   the policy file and some function arguments.  (CVE-2011-4122)
 ============================================================================
 OpenPAM Hydrangea						2007-12-21
 
@@ -427,5 +448,3 @@ Fixed a number of bugs in the previous r
 OpenPAM Calamite						2002-02-09
 
 First (beta) release.
-============================================================================
-$Id: HISTORY 737 2013-09-07 12:53:55Z des $

Modified: projects/sendfile/contrib/openpam/INSTALL
==============================================================================
--- projects/sendfile/contrib/openpam/INSTALL	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/INSTALL	Mon Sep 15 18:09:30 2014	(r271638)
@@ -54,5 +54,3 @@
   directory:
 
   # make install
-
-$Id: INSTALL 648 2013-03-05 17:54:27Z des $

Modified: projects/sendfile/contrib/openpam/LICENSE
==============================================================================
--- projects/sendfile/contrib/openpam/LICENSE	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/LICENSE	Mon Sep 15 18:09:30 2014	(r271638)
@@ -31,5 +31,3 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIAB
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
-$Id: LICENSE 648 2013-03-05 17:54:27Z des $

Modified: projects/sendfile/contrib/openpam/Makefile.am
==============================================================================
--- projects/sendfile/contrib/openpam/Makefile.am	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/Makefile.am	Mon Sep 15 18:09:30 2014	(r271638)
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 623 2013-02-25 07:24:51Z des $
+# $Id: Makefile.am 816 2014-09-12 07:50:22Z des $
 
 ACLOCAL_AMFLAGS = -I m4
 

Modified: projects/sendfile/contrib/openpam/Makefile.in
==============================================================================
--- projects/sendfile/contrib/openpam/Makefile.in	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/Makefile.in	Mon Sep 15 18:09:30 2014	(r271638)
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 623 2013-02-25 07:24:51Z des $
+# $Id: Makefile.am 816 2014-09-12 07:50:22Z des $
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -84,13 +84,10 @@ subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in $(srcdir)/pamgdb.in $(srcdir)/mkpkgng.in \
-	INSTALL README TODO compile config.guess config.sub depcomp \
-	install-sh missing ltmain.sh
+	INSTALL README TODO compile config.guess config.sub install-sh \
+	missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

Modified: projects/sendfile/contrib/openpam/README
==============================================================================
--- projects/sendfile/contrib/openpam/README	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/README	Mon Sep 15 18:09:30 2014	(r271638)
@@ -23,5 +23,3 @@ These are some of OpenPAM's features:
      this will be made configurable in a future release.
 
 Please direct bug reports and inquiries to <des at des.no>.
-
-$Id: README 648 2013-03-05 17:54:27Z des $

Modified: projects/sendfile/contrib/openpam/RELNOTES
==============================================================================
--- projects/sendfile/contrib/openpam/RELNOTES	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/RELNOTES	Mon Sep 15 18:09:30 2014	(r271638)
@@ -1,6 +1,6 @@
 
-		 Release notes for OpenPAM Nummularia
-		 ====================================
+                 Release notes for OpenPAM Ourouparia
+                 ====================================
 
 This release corresponds to the code used in FreeBSD HEAD as of the
 release date, and is also expected to work on almost any POSIX-like
@@ -20,5 +20,3 @@ The distribution consists of the followi
  - Unit tests for limited portions of the libraries.
 
 Please direct bug reports and inquiries to <des at des.no>.
-
-$Id: RELNOTES 741 2013-09-07 13:34:02Z des $

Modified: projects/sendfile/contrib/openpam/TODO
==============================================================================
--- projects/sendfile/contrib/openpam/TODO	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/TODO	Mon Sep 15 18:09:30 2014	(r271638)
@@ -13,5 +13,3 @@ Before the next release:
    wrapper for) openpam_log() which respects the PAM_SILENT flag and
    the no_warn module option.  This would eliminate the need for
    FreeBSD's _pam_verbose_error().
-
-$Id: TODO 736 2013-09-07 12:52:42Z des $

Modified: projects/sendfile/contrib/openpam/aclocal.m4
==============================================================================
--- projects/sendfile/contrib/openpam/aclocal.m4	Mon Sep 15 17:56:55 2014	(r271637)
+++ projects/sendfile/contrib/openpam/aclocal.m4	Mon Sep 15 18:09:30 2014	(r271638)
@@ -20,6 +20,8593 @@ You have another version of autoconf.  I
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+

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

More information about the svn-src-projects mailing list