Date: Tue, 15 Jul 2014 14:12:59 GMT From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r270886 - in soc2014/op/freebsd-base: . bin/sh bin/sh/tests/parameters cddl cddl/contrib/opensolaris cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cddl/contrib/... Message-ID: <201407151412.s6FECxhL009130@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: op Date: Tue Jul 15 14:12:58 2014 New Revision: 270886 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270886 Log: MFH @20140715161150 Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com> Added: soc2014/op/freebsd-base/bin/sh/tests/parameters/positional3.0 - copied unchanged from r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional3.0 soc2014/op/freebsd-base/bin/sh/tests/parameters/positional4.0 - copied unchanged from r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional4.0 soc2014/op/freebsd-base/bin/sh/tests/parameters/positional5.0 - copied unchanged from r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional5.0 soc2014/op/freebsd-base/lib/libedit/TEST/tc1.c - copied unchanged from r270885, mirror/FreeBSD/head/lib/libedit/TEST/tc1.c soc2014/op/freebsd-base/lib/msun/ld128/s_erfl.c - copied unchanged from r270885, mirror/FreeBSD/head/lib/msun/ld128/s_erfl.c soc2014/op/freebsd-base/lib/msun/ld80/s_erfl.c - copied unchanged from r270885, mirror/FreeBSD/head/lib/msun/ld80/s_erfl.c soc2014/op/freebsd-base/tools/build/options/WITH_INFO - copied unchanged from r270885, mirror/FreeBSD/head/tools/build/options/WITH_INFO soc2014/op/freebsd-base/usr.bin/users/users.cc - copied unchanged from r270885, mirror/FreeBSD/head/usr.bin/users/users.cc Replaced: soc2014/op/freebsd-base/sys/dev/iicbus/iic.h - copied unchanged from r270885, mirror/FreeBSD/head/sys/dev/iicbus/iic.h Deleted: soc2014/op/freebsd-base/gnu/lib/libreadline/history/ soc2014/op/freebsd-base/gnu/lib/libreadline/readline/doc/ soc2014/op/freebsd-base/lib/libedit/TEST/test.c soc2014/op/freebsd-base/share/mk/bsd.dtrace.mk soc2014/op/freebsd-base/usr.bin/users/users.c Modified: soc2014/op/freebsd-base/ (props changed) soc2014/op/freebsd-base/Makefile soc2014/op/freebsd-base/Makefile.inc1 soc2014/op/freebsd-base/ObsoleteFiles.inc soc2014/op/freebsd-base/UPDATING soc2014/op/freebsd-base/bin/sh/expand.c soc2014/op/freebsd-base/bin/sh/tests/parameters/Makefile soc2014/op/freebsd-base/cddl/ (props changed) soc2014/op/freebsd-base/cddl/contrib/opensolaris/ (props changed) soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/ (props changed) soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zhack/zhack.c soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool.8 soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/ (props changed) soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c soc2014/op/freebsd-base/contrib/bmake/ (props changed) soc2014/op/freebsd-base/contrib/bmake/ChangeLog soc2014/op/freebsd-base/contrib/bmake/Makefile soc2014/op/freebsd-base/contrib/bmake/README soc2014/op/freebsd-base/contrib/bmake/bmake.1 soc2014/op/freebsd-base/contrib/bmake/bmake.cat1 soc2014/op/freebsd-base/contrib/bmake/boot-strap soc2014/op/freebsd-base/contrib/bmake/bsd.after-import.mk soc2014/op/freebsd-base/contrib/bmake/config.h.in soc2014/op/freebsd-base/contrib/bmake/configure soc2014/op/freebsd-base/contrib/bmake/configure.in soc2014/op/freebsd-base/contrib/bmake/main.c soc2014/op/freebsd-base/contrib/bmake/make.1 soc2014/op/freebsd-base/contrib/bmake/mk/ChangeLog soc2014/op/freebsd-base/contrib/bmake/mk/autodep.mk soc2014/op/freebsd-base/contrib/bmake/mk/dirdeps.mk soc2014/op/freebsd-base/contrib/bmake/mk/dpadd.mk soc2014/op/freebsd-base/contrib/bmake/mk/gendirdeps.mk soc2014/op/freebsd-base/contrib/bmake/mk/host-target.mk soc2014/op/freebsd-base/contrib/bmake/mk/install-mk soc2014/op/freebsd-base/contrib/bmake/mk/lib.mk soc2014/op/freebsd-base/contrib/bmake/mk/meta.autodep.mk soc2014/op/freebsd-base/contrib/bmake/mk/meta2deps.py soc2014/op/freebsd-base/contrib/bmake/mk/meta2deps.sh soc2014/op/freebsd-base/contrib/bmake/mk/options.mk soc2014/op/freebsd-base/contrib/bmake/mk/rst2htm.mk soc2014/op/freebsd-base/contrib/bmake/mk/sys.mk soc2014/op/freebsd-base/contrib/bmake/mk/sys/SunOS.mk soc2014/op/freebsd-base/contrib/bmake/mk/target-flags.mk soc2014/op/freebsd-base/contrib/bmake/mk/warnings.mk soc2014/op/freebsd-base/contrib/bmake/os.sh soc2014/op/freebsd-base/contrib/bmake/parse.c soc2014/op/freebsd-base/contrib/bmake/str.c soc2014/op/freebsd-base/contrib/bmake/var.c soc2014/op/freebsd-base/contrib/ipfilter/ (props changed) soc2014/op/freebsd-base/contrib/ipfilter/lib/printipfexpr.c soc2014/op/freebsd-base/contrib/llvm/ (props changed) soc2014/op/freebsd-base/contrib/llvm/tools/lldb/ (props changed) soc2014/op/freebsd-base/contrib/llvm/tools/lldb/tools/driver/Platform.h soc2014/op/freebsd-base/games/fortune/fortune/pathnames.h soc2014/op/freebsd-base/gnu/lib/ (props changed) soc2014/op/freebsd-base/gnu/lib/Makefile soc2014/op/freebsd-base/gnu/lib/libreadline/Makefile soc2014/op/freebsd-base/gnu/lib/libreadline/readline/Makefile soc2014/op/freebsd-base/gnu/usr.bin/cc/Makefile soc2014/op/freebsd-base/gnu/usr.bin/gdb/ (props changed) soc2014/op/freebsd-base/gnu/usr.bin/gdb/Makefile.inc soc2014/op/freebsd-base/gnu/usr.bin/gdb/gdb/Makefile soc2014/op/freebsd-base/gnu/usr.bin/gdb/gdbtui/Makefile soc2014/op/freebsd-base/gnu/usr.bin/gdb/kgdb/Makefile soc2014/op/freebsd-base/include/ (props changed) soc2014/op/freebsd-base/include/dirent.h soc2014/op/freebsd-base/lib/libc/ (props changed) soc2014/op/freebsd-base/lib/libc/gen/arc4random.c soc2014/op/freebsd-base/lib/libc/gen/gen-private.h soc2014/op/freebsd-base/lib/libc/gen/opendir.c soc2014/op/freebsd-base/lib/libc/gen/readdir.c soc2014/op/freebsd-base/lib/libc/gen/readpassphrase.c soc2014/op/freebsd-base/lib/libc/gen/rewinddir.c soc2014/op/freebsd-base/lib/libc/gen/sysconf.c soc2014/op/freebsd-base/lib/libc/gen/telldir.h soc2014/op/freebsd-base/lib/libc/net/Makefile.inc soc2014/op/freebsd-base/lib/libc/stdlib/hcreate.c soc2014/op/freebsd-base/lib/libc/stdlib/strfmon.c soc2014/op/freebsd-base/lib/libc/stdlib/tsearch.c soc2014/op/freebsd-base/lib/libc/stdlib/twalk.c soc2014/op/freebsd-base/lib/libc/sys/listen.2 soc2014/op/freebsd-base/lib/libc/sys/procctl.2 soc2014/op/freebsd-base/lib/libedit/Makefile soc2014/op/freebsd-base/lib/libedit/common.c soc2014/op/freebsd-base/lib/libedit/emacs.c soc2014/op/freebsd-base/lib/libedit/filecomplete.h soc2014/op/freebsd-base/lib/libedit/histedit.h soc2014/op/freebsd-base/lib/libedit/prompt.c soc2014/op/freebsd-base/lib/libedit/prompt.h soc2014/op/freebsd-base/lib/libedit/read.h soc2014/op/freebsd-base/lib/libedit/sys.h soc2014/op/freebsd-base/lib/libedit/term.h soc2014/op/freebsd-base/lib/libedit/tty.c soc2014/op/freebsd-base/lib/libfetch/common.c soc2014/op/freebsd-base/lib/libproc/Makefile soc2014/op/freebsd-base/lib/libproc/proc_sym.c soc2014/op/freebsd-base/lib/libsbuf/Makefile soc2014/op/freebsd-base/lib/msun/Makefile soc2014/op/freebsd-base/lib/msun/Symbol.map soc2014/op/freebsd-base/lib/msun/man/erf.3 soc2014/op/freebsd-base/lib/msun/src/e_pow.c soc2014/op/freebsd-base/lib/msun/src/imprecise.c soc2014/op/freebsd-base/lib/msun/src/math.h soc2014/op/freebsd-base/lib/msun/src/s_erf.c soc2014/op/freebsd-base/lib/msun/src/s_erff.c soc2014/op/freebsd-base/libexec/atf/atf-sh/tests/Makefile soc2014/op/freebsd-base/release/doc/en_US.ISO8859-1/relnotes/article.xml soc2014/op/freebsd-base/sbin/ (props changed) soc2014/op/freebsd-base/sbin/fsck_msdosfs/check.c soc2014/op/freebsd-base/sbin/fsck_msdosfs/dir.c soc2014/op/freebsd-base/sbin/fsck_msdosfs/ext.h soc2014/op/freebsd-base/sbin/fsck_msdosfs/fat.c soc2014/op/freebsd-base/sbin/ifconfig/ifconfig.8 soc2014/op/freebsd-base/share/ (props changed) soc2014/op/freebsd-base/share/man/man5/src.conf.5 soc2014/op/freebsd-base/share/misc/organization.dot soc2014/op/freebsd-base/share/mk/Makefile soc2014/op/freebsd-base/share/mk/atf.test.mk soc2014/op/freebsd-base/share/mk/bsd.dep.mk soc2014/op/freebsd-base/share/mk/bsd.libnames.mk soc2014/op/freebsd-base/share/mk/bsd.opts.mk soc2014/op/freebsd-base/share/mk/plain.test.mk soc2014/op/freebsd-base/share/mk/src.opts.mk soc2014/op/freebsd-base/share/mk/tap.test.mk soc2014/op/freebsd-base/sys/ (props changed) soc2014/op/freebsd-base/sys/amd64/amd64/exception.S soc2014/op/freebsd-base/sys/amd64/amd64/machdep.c soc2014/op/freebsd-base/sys/amd64/amd64/pmap.c soc2014/op/freebsd-base/sys/amd64/amd64/trap.c soc2014/op/freebsd-base/sys/amd64/vmm/ (props changed) soc2014/op/freebsd-base/sys/amd64/vmm/vmm_instruction_emul.c soc2014/op/freebsd-base/sys/arm/arm/pmap-v6.c soc2014/op/freebsd-base/sys/arm/freescale/imx/imx51_gpio.c soc2014/op/freebsd-base/sys/arm/xilinx/zy7_slcr.c soc2014/op/freebsd-base/sys/arm/xilinx/zy7_slcr.h soc2014/op/freebsd-base/sys/boot/ (props changed) soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/zedboard.dts soc2014/op/freebsd-base/sys/boot/i386/boot2/boot2.c soc2014/op/freebsd-base/sys/boot/pc98/boot2/Makefile soc2014/op/freebsd-base/sys/boot/pc98/boot2/boot2.c soc2014/op/freebsd-base/sys/cam/ctl/ctl.c soc2014/op/freebsd-base/sys/cam/ctl/ctl_cmd_table.c soc2014/op/freebsd-base/sys/cam/ctl/ctl_private.h soc2014/op/freebsd-base/sys/cam/ctl/ctl_ser_table.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/ (props changed) soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c soc2014/op/freebsd-base/sys/cddl/dev/dtrace/amd64/dtrace_subr.c soc2014/op/freebsd-base/sys/cddl/dev/dtrace/i386/dtrace_subr.c soc2014/op/freebsd-base/sys/cddl/dev/dtrace/mips/dtrace_subr.c soc2014/op/freebsd-base/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c soc2014/op/freebsd-base/sys/compat/ndis/kern_ndis.c soc2014/op/freebsd-base/sys/compat/ndis/ndis_var.h soc2014/op/freebsd-base/sys/contrib/ipfilter/ (props changed) soc2014/op/freebsd-base/sys/contrib/ipfilter/netinet/ip_compat.h soc2014/op/freebsd-base/sys/dev/cadence/if_cgem.c soc2014/op/freebsd-base/sys/dev/cas/if_cas.c soc2014/op/freebsd-base/sys/dev/cxgbe/adapter.h soc2014/op/freebsd-base/sys/dev/cxgbe/common/common.h soc2014/op/freebsd-base/sys/dev/cxgbe/common/t4_hw.c soc2014/op/freebsd-base/sys/dev/cxgbe/t4_main.c soc2014/op/freebsd-base/sys/dev/cxgbe/t4_sge.c soc2014/op/freebsd-base/sys/dev/e1000/if_em.c soc2014/op/freebsd-base/sys/dev/fb/fbd.c soc2014/op/freebsd-base/sys/dev/hatm/if_hatm_intr.c soc2014/op/freebsd-base/sys/dev/iscsi_initiator/isc_soc.c soc2014/op/freebsd-base/sys/dev/lge/if_lge.c soc2014/op/freebsd-base/sys/dev/mwl/if_mwl.c soc2014/op/freebsd-base/sys/dev/netmap/netmap_freebsd.c soc2014/op/freebsd-base/sys/dev/netmap/netmap_generic.c soc2014/op/freebsd-base/sys/dev/sound/pci/hda/hdaa_patches.c soc2014/op/freebsd-base/sys/dev/sound/pci/hda/hdac.h soc2014/op/freebsd-base/sys/dev/usb/input/uhid.c soc2014/op/freebsd-base/sys/dev/usb/net/if_axge.c soc2014/op/freebsd-base/sys/dev/usb/wlan/if_urtwn.c soc2014/op/freebsd-base/sys/dev/virtio/network/if_vtnet.c soc2014/op/freebsd-base/sys/dev/virtio/network/if_vtnetvar.h soc2014/op/freebsd-base/sys/dev/virtio/virtqueue.c soc2014/op/freebsd-base/sys/dev/virtio/virtqueue.h soc2014/op/freebsd-base/sys/dev/vt/hw/efifb/efifb.c soc2014/op/freebsd-base/sys/dev/vt/vt_core.c soc2014/op/freebsd-base/sys/dev/wb/if_wb.c soc2014/op/freebsd-base/sys/fs/cd9660/cd9660_lookup.c soc2014/op/freebsd-base/sys/fs/msdosfs/msdosfs_lookup.c soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs.h soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_fifoops.c soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_fifoops.h soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_subr.c soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_vfsops.c soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_vnops.c soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_vnops.h soc2014/op/freebsd-base/sys/i386/i386/trap.c soc2014/op/freebsd-base/sys/kern/kern_descrip.c soc2014/op/freebsd-base/sys/kern/kern_exec.c soc2014/op/freebsd-base/sys/kern/kern_exit.c soc2014/op/freebsd-base/sys/kern/kern_mbuf.c soc2014/op/freebsd-base/sys/kern/kern_proc.c soc2014/op/freebsd-base/sys/kern/kern_sig.c soc2014/op/freebsd-base/sys/kern/kern_sysctl.c soc2014/op/freebsd-base/sys/kern/subr_bus.c soc2014/op/freebsd-base/sys/kern/subr_mbpool.c soc2014/op/freebsd-base/sys/kern/subr_sbuf.c soc2014/op/freebsd-base/sys/kern/uipc_mbuf.c soc2014/op/freebsd-base/sys/kern/uipc_syscalls.c soc2014/op/freebsd-base/sys/kern/uipc_usrreq.c soc2014/op/freebsd-base/sys/kern/vfs_syscalls.c soc2014/op/freebsd-base/sys/kern/vfs_vnops.c soc2014/op/freebsd-base/sys/mips/mips/trap.c soc2014/op/freebsd-base/sys/netinet/in.h soc2014/op/freebsd-base/sys/netinet/in_pcb.c soc2014/op/freebsd-base/sys/netinet/in_pcb.h soc2014/op/freebsd-base/sys/netinet/in_pcbgroup.c soc2014/op/freebsd-base/sys/netinet/in_rss.c soc2014/op/freebsd-base/sys/netinet/ip_output.c soc2014/op/freebsd-base/sys/netinet/sctp_input.c soc2014/op/freebsd-base/sys/netinet/sctp_os_bsd.h soc2014/op/freebsd-base/sys/netinet/sctp_output.c soc2014/op/freebsd-base/sys/netinet/sctp_pcb.c soc2014/op/freebsd-base/sys/netinet/sctp_timer.c soc2014/op/freebsd-base/sys/netinet/sctp_usrreq.c soc2014/op/freebsd-base/sys/netinet/sctp_var.h soc2014/op/freebsd-base/sys/netinet/sctputil.h soc2014/op/freebsd-base/sys/netinet6/in6.h soc2014/op/freebsd-base/sys/netinet6/in6_pcb.c soc2014/op/freebsd-base/sys/netinet6/in6_pcbgroup.c soc2014/op/freebsd-base/sys/netinet6/ip6_output.c soc2014/op/freebsd-base/sys/netinet6/nd6.c soc2014/op/freebsd-base/sys/netipsec/key_debug.c soc2014/op/freebsd-base/sys/netpfil/pf/if_pfsync.c soc2014/op/freebsd-base/sys/powerpc/aim/mmu_oea.c soc2014/op/freebsd-base/sys/powerpc/aim/mmu_oea64.c soc2014/op/freebsd-base/sys/powerpc/aim/trap.c soc2014/op/freebsd-base/sys/powerpc/booke/pmap.c soc2014/op/freebsd-base/sys/powerpc/powerpc/mmu_if.m soc2014/op/freebsd-base/sys/powerpc/powerpc/pmap_dispatch.c soc2014/op/freebsd-base/sys/sys/dtrace_bsd.h soc2014/op/freebsd-base/sys/sys/mbpool.h soc2014/op/freebsd-base/sys/sys/mbuf.h soc2014/op/freebsd-base/sys/sys/param.h soc2014/op/freebsd-base/sys/sys/sbuf.h soc2014/op/freebsd-base/sys/sys/sdt.h soc2014/op/freebsd-base/sys/sys/sf_buf.h soc2014/op/freebsd-base/sys/sys/signalvar.h soc2014/op/freebsd-base/sys/sys/vnode.h soc2014/op/freebsd-base/sys/ufs/ffs/ffs_vfsops.c soc2014/op/freebsd-base/sys/vm/vm_object.c soc2014/op/freebsd-base/sys/vm/vm_object.h soc2014/op/freebsd-base/sys/vm/vm_phys.c soc2014/op/freebsd-base/tools/build/mk/OptionalObsoleteFiles.inc soc2014/op/freebsd-base/tools/test/dtrace/Makefile soc2014/op/freebsd-base/usr.bin/bmake/Makefile soc2014/op/freebsd-base/usr.bin/bmake/config.h soc2014/op/freebsd-base/usr.bin/mkimg/ (props changed) soc2014/op/freebsd-base/usr.bin/mkimg/apm.c soc2014/op/freebsd-base/usr.bin/mkimg/image.c soc2014/op/freebsd-base/usr.bin/mkimg/image.h soc2014/op/freebsd-base/usr.bin/mkimg/vhd.c soc2014/op/freebsd-base/usr.bin/mkimg/vmdk.c soc2014/op/freebsd-base/usr.bin/users/Makefile (contents, props changed) soc2014/op/freebsd-base/usr.bin/vmstat/vmstat.c soc2014/op/freebsd-base/usr.sbin/bhyve/ (props changed) soc2014/op/freebsd-base/usr.sbin/bhyve/block_if.c soc2014/op/freebsd-base/usr.sbin/bhyve/block_if.h soc2014/op/freebsd-base/usr.sbin/bhyve/pci_ahci.c soc2014/op/freebsd-base/usr.sbin/bsdinstall/partedit/partedit_x86.c soc2014/op/freebsd-base/usr.sbin/ctladm/ctladm.8 soc2014/op/freebsd-base/usr.sbin/jail/ (props changed) soc2014/op/freebsd-base/usr.sbin/jail/jail.8 soc2014/op/freebsd-base/usr.sbin/service/service.sh Modified: soc2014/op/freebsd-base/Makefile ============================================================================== --- soc2014/op/freebsd-base/Makefile Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/Makefile Tue Jul 15 14:12:58 2014 (r270886) @@ -36,6 +36,7 @@ # specified with XDEV and XDEV_ARCH. # xdev-build - Build cross-development tools. # xdev-install - Install cross-development tools. +# xdev-links - Create traditional links in /usr/bin for cc, etc # # "quick" way to test all kernel builds: # _jflag=`sysctl -n hw.ncpu` @@ -110,6 +111,7 @@ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ + xdev-links \ TGTS+= ${SUBDIR_TARGETS} @@ -329,6 +331,7 @@ MMAKE= ${MMAKEENV} ${MAKE} \ -DNO_MAN -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR \ + MK_TESTS=no \ DESTDIR= PROGNAME=${MYMAKE:T} bmake: .PHONY Modified: soc2014/op/freebsd-base/Makefile.inc1 ============================================================================== --- soc2014/op/freebsd-base/Makefile.inc1 Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/Makefile.inc1 Tue Jul 15 14:12:58 2014 (r270886) @@ -1494,7 +1494,7 @@ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} -.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no" +.if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L .endif @@ -1893,7 +1893,7 @@ OSREL!= uname -r | sed -e 's/[-(].*//' .endif -.ORDER: xdev-build xdev-install +.ORDER: xdev-build xdev-install xdev-links xdev: xdev-build xdev-install .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools @@ -1943,8 +1943,8 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${XDDESTDIR}/usr/include >/dev/null -.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links -xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries +xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-cross-tools: @echo "_xi-cross-tools" @@ -1967,9 +1967,9 @@ ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ DESTDIR=${XDDESTDIR} -_xi-links: +xdev-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ - mkdir -p ../../../../usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ @@ -1977,6 +1977,6 @@ ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ done .else -xdev xdev-build xdev-install: +xdev xdev-build xdev-install xdev-links: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif Modified: soc2014/op/freebsd-base/ObsoleteFiles.inc ============================================================================== --- soc2014/op/freebsd-base/ObsoleteFiles.inc Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/ObsoleteFiles.inc Tue Jul 15 14:12:58 2014 (r270886) @@ -38,6 +38,27 @@ # xargs -n1 | sort | uniq -d; # done +# 20140712: Removal of bsd.dtrace.mk +OLD_FILES+=usr/share/mk/bsd.dtrace.mk +# 20140705: turn libreadline into an internal lib +OLD_LIBS+=lib/libreadline.so.8 +OLD_FILES+=usr/lib/libreadline.a +OLD_FILES+=usr/lib/libreadline_p.a +OLD_FILES+=usr/lib/libreadline.so +OLD_FILES+=usr/lib/libhistory.a +OLD_FILES+=usr/lib/libhistory_p.a +OLD_FILES+=usr/lib/libhistory.so +OLD_LIBS+=usr/lib/libhistory.so.8 +OLD_FILES+=usr/include/readline/chardefs.h +OLD_FILES+=usr/include/readline/history.h +OLD_FILES+=usr/include/readline/keymaps.h +OLD_FILES+=usr/include/readline/readline.h +OLD_FILES+=usr/include/readline/rlconf.h +OLD_FILES+=usr/include/readline/rlstdc.h +OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_FILES+=usr/share/info/readline.info.gz +OLD_FILES+=usr/share/man/man3/readline.3.gz # 20140625: csup removal OLD_FILES+=usr/bin/csup OLD_FILES+=usr/bin/cpasswd Modified: soc2014/op/freebsd-base/UPDATING ============================================================================== --- soc2014/op/freebsd-base/UPDATING Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/UPDATING Tue Jul 15 14:12:58 2014 (r270886) @@ -31,6 +31,18 @@ disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140709: + The GNU texinfo and GNU info pages are not built and installed + anymore, WITH_INFO knob has been added to allow to built and install + them again. + +20140708: + The GNU readline library is now an INTERNALLIB - that is, it is + statically linked into consumers (GDB and variants) in the base + system, and the shared library is no longer installed. The + devel/readline port is available for third party software that + requires readline. + 20140702: The Itanium architecture (ia64) has been removed from the list of known architectures. This is the first step in the removal of the Modified: soc2014/op/freebsd-base/bin/sh/expand.c ============================================================================== --- soc2014/op/freebsd-base/bin/sh/expand.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/bin/sh/expand.c Tue Jul 15 14:12:58 2014 (r270886) @@ -846,9 +846,11 @@ } } else if (is_digit(*name)) { char *ap; - int num = atoi(name); + long num; - if (num > shellparam.nparam) + errno = 0; + num = strtol(name, NULL, 10); + if (errno != 0 || num > shellparam.nparam) return 0; if (num == 0) @@ -928,17 +930,16 @@ STPUTC(sep, expdest); } break; - case '0': - p = arg0; - strtodest(p, flag, subtype, quoted); - break; default: if (is_digit(*name)) { num = atoi(name); - if (num > 0 && num <= shellparam.nparam) { + if (num == 0) + p = arg0; + else if (num > 0 && num <= shellparam.nparam) p = shellparam.p[num - 1]; - strtodest(p, flag, subtype, quoted); - } + else + break; + strtodest(p, flag, subtype, quoted); } break; } Modified: soc2014/op/freebsd-base/bin/sh/tests/parameters/Makefile ============================================================================== --- soc2014/op/freebsd-base/bin/sh/tests/parameters/Makefile Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/bin/sh/tests/parameters/Makefile Tue Jul 15 14:12:58 2014 (r270886) @@ -13,6 +13,9 @@ FILES+= optind2.0 FILES+= positional1.0 FILES+= positional2.0 +FILES+= positional3.0 +FILES+= positional4.0 +FILES+= positional5.0 FILES+= pwd1.0 FILES+= pwd2.0 Copied: soc2014/op/freebsd-base/bin/sh/tests/parameters/positional3.0 (from r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional3.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/op/freebsd-base/bin/sh/tests/parameters/positional3.0 Tue Jul 15 14:12:58 2014 (r270886, copy of r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional3.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +r=$(${SH} -c 'echo ${01:+yes}${010:+yes}' '' a '' '' '' '' '' '' '' '' b) +[ "$r" = yesyes ] Copied: soc2014/op/freebsd-base/bin/sh/tests/parameters/positional4.0 (from r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional4.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/op/freebsd-base/bin/sh/tests/parameters/positional4.0 Tue Jul 15 14:12:58 2014 (r270886, copy of r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional4.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +set -- "x$0" 2 3 4 5 6 7 8 9 "y$0" +[ "${01}.${010}" = "$1.${10}" ] Copied: soc2014/op/freebsd-base/bin/sh/tests/parameters/positional5.0 (from r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional5.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/op/freebsd-base/bin/sh/tests/parameters/positional5.0 Tue Jul 15 14:12:58 2014 (r270886, copy of r270885, mirror/FreeBSD/head/bin/sh/tests/parameters/positional5.0) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +i=1 +r=0 +while [ $i -lt $((0x100000000)) ]; do + t= + eval t=\${$i-x} + case $t in + x) ;; + *) echo "Problem with \${$i}" >&2; r=1 ;; + esac + i=$((i + 0x10000000)) +done +exit $r Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Jul 15 14:12:58 2014 (r270886) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. @@ -6856,6 +6856,9 @@ case ENOTSUP: err_msg = "bookmark feature not enabled"; break; + case ENOSPC: + err_msg = "out of space"; + break; default: err_msg = "unknown error"; break; @@ -6864,7 +6867,7 @@ dgettext(TEXT_DOMAIN, err_msg)); } - return (ret); + return (ret != 0); usage: usage(B_FALSE); Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zhack/zhack.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zhack/zhack.c Tue Jul 15 14:12:58 2014 (r270886) @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ @@ -362,7 +362,7 @@ feature.fi_guid); VERIFY0(dsl_sync_task(spa_name(spa), NULL, - zhack_feature_enable_sync, &feature, 5)); + zhack_feature_enable_sync, &feature, 5, ZFS_SPACE_CHECK_NORMAL)); spa_close(spa, FTAG); @@ -473,7 +473,8 @@ } VERIFY0(dsl_sync_task(spa_name(spa), NULL, - decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); + decr ? feature_decr_sync : feature_incr_sync, &feature, + 5, ZFS_SPACE_CHECK_NORMAL)); spa_close(spa, FTAG); } Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Tue Jul 15 14:12:58 2014 (r270886) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 28, 2014 +.Dd July 14, 2014 .Dt ZPOOL 8 .Os .Sh NAME @@ -1664,7 +1664,8 @@ .It Fl x Only display status for pools that are exhibiting errors or are otherwise unavailable. -Warnings about pools not using the latest on-disk format will not be included. +Warnings about pools not using the latest on-disk format, having non-native +block size or disabled features will not be included. .It Fl v Displays verbose data error information, printing out a complete list of all data errors since the last complete pool scrub. Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Jul 15 14:12:58 2014 (r270886) @@ -3076,17 +3076,10 @@ if (zprop_get_list(g_zfs, props, &cb.cb_proplist, ZFS_TYPE_POOL) != 0) usage(B_FALSE); - if ((list = pool_list_get(argc, argv, &cb.cb_proplist, &ret)) == NULL) - return (1); - - if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) { - (void) printf(gettext("no pools available\n")); - zprop_free_list(cb.cb_proplist); - return (0); - } - for (;;) { - pool_list_update(list); + if ((list = pool_list_get(argc, argv, &cb.cb_proplist, + &ret)) == NULL) + return (1); if (pool_list_count(list) == 0) break; @@ -3109,9 +3102,16 @@ if (count != 0 && --count == 0) break; + pool_list_free(list); (void) sleep(interval); } + if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) { + (void) printf(gettext("no pools available\n")); + ret = 0; + } + + pool_list_free(list); zprop_free_list(cb.cb_proplist); return (ret); } @@ -4101,6 +4101,7 @@ if (cbp->cb_explain && (reason == ZPOOL_STATUS_OK || reason == ZPOOL_STATUS_VERSION_OLDER || + reason == ZPOOL_STATUS_NON_NATIVE_ASHIFT || reason == ZPOOL_STATUS_FEAT_DISABLED)) { if (!cbp->cb_allpools) { (void) printf(gettext("pool '%s' is healthy\n"), Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Jul 15 14:12:58 2014 (r270886) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. @@ -3873,7 +3873,6 @@ strcmp(property, "none") == 0)) { flags.nounmount = B_TRUE; } - if (flags.recurse) { parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name); @@ -3888,8 +3887,7 @@ ret = -1; goto error; } - - } else { + } else if (zhp->zfs_type != ZFS_TYPE_SNAPSHOT) { if ((cl = changelist_gather(zhp, ZFS_PROP_NAME, flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0, flags.forceunmount ? MS_FORCE : 0)) == NULL) { @@ -3941,23 +3939,23 @@ * On failure, we still want to remount any filesystems that * were previously mounted, so we don't alter the system state. */ - if (!flags.recurse) + if (cl != NULL) (void) changelist_postfix(cl); } else { - if (!flags.recurse) { + if (cl != NULL) { changelist_rename(cl, zfs_get_name(zhp), target); ret = changelist_postfix(cl); } } error: - if (parentname) { + if (parentname != NULL) { free(parentname); } - if (zhrp) { + if (zhrp != NULL) { zfs_close(zhrp); } - if (cl) { + if (cl != NULL) { changelist_free(cl); } return (ret); Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Tue Jul 15 14:12:58 2014 (r270886) @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ /* @@ -736,16 +737,6 @@ if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL)) return (0); -#ifdef sun - if ((ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) { - (void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED, - dgettext(TEXT_DOMAIN, "cannot share '%s': %s"), - zfs_get_name(zhp), _sa_errorstr != NULL ? - _sa_errorstr(ret) : ""); - return (-1); - } -#endif - for (curr_proto = proto; *curr_proto != PROTO_END; curr_proto++) { /* * Return success if there are no share options. @@ -756,6 +747,17 @@ strcmp(shareopts, "off") == 0) continue; +#ifdef illumos + ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API); + if (ret != SA_OK) { + (void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED, + dgettext(TEXT_DOMAIN, "cannot share '%s': %s"), + zfs_get_name(zhp), _sa_errorstr != NULL ? + _sa_errorstr(ret) : ""); + return (-1); + } +#endif + /* * If the 'zoned' property is set, then zfs_is_mountable() * will have already bailed out if we are in the global zone. Modified: soc2014/op/freebsd-base/contrib/bmake/ChangeLog ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/ChangeLog Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/ChangeLog Tue Jul 15 14:12:58 2014 (r270886) @@ -1,3 +1,28 @@ +2014-06-20 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140620 + Merge with NetBSD make, pick up + o var.c return varNoError rather than var_Error for ::= modidiers. + +2014-05-22 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140522 + Merge with NetBSD make, pick up + o var.c detect some parse errors. + +2014-04-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * Fix spelling errors - patch from Pedro Giffuni + +2014-02-14 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140214 + Merge with NetBSD make, pick up + o .INCLUDEFROM* + o use Var_Value to get MAKEOBJDIR[PREFIX] + o reduced realloc'ign in brk_string. + * configure.in: add a check for compiler supporting __func__ + 2014-01-03 Simon J. Gerraty <sjg@bad.crufty.net> * boot-strap: ignore mksrc=none @@ -64,7 +89,7 @@ * Makefile (MAKE_VERSION): 20130716 Merge with NetBSD make, pick up - o number of gmake compatability tweaks + o number of gmake compatibility tweaks -w for gmake style entering/leaving messages if .MAKE.LEVEL > 0 indicate it in progname "make[1]" etc. handle MAKEFLAGS containing only letters. Modified: soc2014/op/freebsd-base/contrib/bmake/Makefile ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/Makefile Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/Makefile Tue Jul 15 14:12:58 2014 (r270886) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $ +# $Id: Makefile,v 1.27 2014/06/20 14:51:54 sjg Exp $ # Base version on src date -MAKE_VERSION= 20140101 +MAKE_VERSION= 20140620 PROG= bmake @@ -117,7 +117,7 @@ # turn this on by default - ignored if we are root WITH_INSTALL_AS_USER= -# supress with -DWITHOUT_* +# suppress with -DWITHOUT_* OPTIONS_DEFAULT_YES+= \ AUTOCONF_MK \ INSTALL_MK \ Modified: soc2014/op/freebsd-base/contrib/bmake/README ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/README Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/README Tue Jul 15 14:12:58 2014 (r270886) @@ -18,7 +18,7 @@ Building: -The prefered way to bootstrap bmake is: +The preferred way to bootstrap bmake is: ./bmake/boot-strap Modified: soc2014/op/freebsd-base/contrib/bmake/bmake.1 ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/bmake.1 Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/bmake.1 Tue Jul 15 14:12:58 2014 (r270886) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $ +.\" $NetBSD: make.1,v 1.229 2014/01/19 10:23:29 apb Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd October 25, 2013 +.Dd February 14, 2014 .Dt MAKE 1 .Os .Sh NAME @@ -706,6 +706,10 @@ Refer to the description of .Ql Ev PWD for more details. +.It Va .INCLUDEDFROMDIR +The directory of the file this Makefile was included from. +.It Va .INCLUDEDFROMFILE +The filename of the file this Makefile was included from. .It Ev MAKE The name that .Nm @@ -1246,6 +1250,15 @@ are orthogonal; the former specifies whether multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. +.Pp +As for the +.Cm \&:S +modifier, the +.Ar pattern +and +.Ar replacement +are subjected to variable expansion before being parsed as +regular expressions. .It Cm \&:T Replaces each word in the variable with its last component. .It Cm \&:u Modified: soc2014/op/freebsd-base/contrib/bmake/bmake.cat1 ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/bmake.cat1 Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/bmake.cat1 Tue Jul 15 14:12:58 2014 (r270886) @@ -450,6 +450,13 @@ _._C_U_R_D_I_R A path to the directory where bbmmaakkee was executed. Refer to the description of `PWD' for more details. + _._I_N_C_L_U_D_E_D_F_R_O_M_D_I_R + The directory of the file this Makefile was included + from. + + _._I_N_C_L_U_D_E_D_F_R_O_M_F_I_L_E + The filename of the file this Makefile was included from. + MAKE The name that bbmmaakkee was executed with (_a_r_g_v_[_0_]). For compatibility bbmmaakkee also sets _._M_A_K_E with the same value. The preferred variable to use is the environment variable @@ -796,6 +803,9 @@ multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. + As for the ::SS modifier, the _p_a_t_t_e_r_n and _r_e_p_l_a_c_e_m_e_n_t are subjected to + variable expansion before being parsed as regular expressions. + ::TT Replaces each word in the variable with its last component. ::uu Remove adjacent duplicate words (like uniq(1)). @@ -1384,4 +1394,4 @@ There is no way of escaping a space character in a filename. -NetBSD 5.1 October 25, 2013 NetBSD 5.1 +NetBSD 5.1 February 14, 2014 NetBSD 5.1 Modified: soc2014/op/freebsd-base/contrib/bmake/boot-strap ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/boot-strap Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/boot-strap Tue Jul 15 14:12:58 2014 (r270886) @@ -111,7 +111,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.44 2014/01/08 14:49:10 sjg Exp $ +# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -197,7 +197,7 @@ here=`'pwd'` if [ $here = $Mydir ]; then - # avoid polution + # avoid pollution OBJROOT=../ fi @@ -453,7 +453,7 @@ echo "Use --install-destdir=/somewhere to set DESTDIR during install" echo "Use --install-host-target to use INSTALL_BIN=$HOST_TARGET/bin" echo "Use -DWITH_PROG_VERSION to install as bmake-$MAKE_VERSION" - echo "Use -DWITHOUT_PROG_LINK to supress bmake -> bmake-$MAKE_VERSION symlink" + echo "Use -DWITHOUT_PROG_LINK to suppress bmake -> bmake-$MAKE_VERSION symlink" echo "Use -DWITHOUT_INSTALL_MK to skip installing files to $prefix/share/mk" fi } Modified: soc2014/op/freebsd-base/contrib/bmake/bsd.after-import.mk ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/bsd.after-import.mk Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/bsd.after-import.mk Tue Jul 15 14:12:58 2014 (r270886) @@ -1,4 +1,4 @@ -# $Id: bsd.after-import.mk,v 1.11 2012/12/29 19:32:25 sjg Exp $ +# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $ # This makefile is for use when integrating bmake into a BSD build # system. Use this makefile after importing bmake. @@ -41,15 +41,13 @@ HOST_OS!= uname .endif -# .../share/mk will find ${SRCTOP}/share/mk -# if we are within ${SRCTOP} -DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk - BOOTSTRAP_ARGS = \ - --with-default-sys-path='${DEFAULT_SYS_PATH}' \ --prefix /usr \ --share /usr/share +.if !empty(DEFAULT_SYS_PATH) +BOOTSTRAP_ARGS += --with-default-sys-path='${DEFAULT_SYS_PATH}' +.endif # run boot-strap with minimal influence bootstrap: ${BMAKE_SRC}/boot-strap ${MAKEFILE} Modified: soc2014/op/freebsd-base/contrib/bmake/config.h.in ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/config.h.in Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/config.h.in Tue Jul 15 14:12:58 2014 (r270886) @@ -144,6 +144,9 @@ `HAVE_STRUCT_STAT_ST_RDEV' instead. */ #undef HAVE_ST_RDEV +/* Define to 1 if you have the `sysctl' function. */ +#undef HAVE_SYSCTL + /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -164,6 +167,9 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H +/* Define to 1 if you have the <sys/sysctl.h> header file. */ +#undef HAVE_SYS_SYSCTL_H + /* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H @@ -298,6 +304,9 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* C99 function name */ +#undef __func__ + /* Define to empty if `const' does not conform to ANSI C. */ #undef const Modified: soc2014/op/freebsd-base/contrib/bmake/configure ============================================================================== Binary file (source and/or target). No diff available. Modified: soc2014/op/freebsd-base/contrib/bmake/configure.in ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/configure.in Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/configure.in Tue Jul 15 14:12:58 2014 (r270886) @@ -1,12 +1,12 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.51 2014/01/02 22:20:52 sjg Exp $ +dnl $Id: configure.in,v 1.52 2014/02/15 22:27:59 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20140101], [sjg@NetBSD.org]) -AC_CONFIG_HEADER(config.h) +AC_INIT([bmake], [20140214], [sjg@NetBSD.org]) +AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute case "$srcdir" in @@ -203,6 +203,11 @@ AC_HEADER_STAT AC_STRUCT_ST_RDEV dnl +echo "checking if compiler supports __func__" >&6 +AC_LANG(C) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[[const char *func = __func__;]])],, + AC_DEFINE(__func__, __FUNCTION__, C99 function name)) +dnl dnl we want this for unit-tests/Makefile echo $ECHO_N "checking if diff -u works... $ECHO_C" >&6 if diff -u /dev/null /dev/null > /dev/null 2>&1; then Modified: soc2014/op/freebsd-base/contrib/bmake/main.c ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/main.c Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/main.c Tue Jul 15 14:12:58 2014 (r270886) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $ */ +/* $NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $"); +__RCSID("$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $"); #endif #endif /* not lint */ #endif @@ -1102,11 +1102,12 @@ */ #ifndef NO_PWD_OVERRIDE if (!ignorePWD) { - char *pwd; + char *pwd, *ptmp1 = NULL, *ptmp2 = NULL; if ((pwd = getenv("PWD")) != NULL && - getenv("MAKEOBJDIRPREFIX") == NULL) { - const char *makeobjdir = getenv("MAKEOBJDIR"); + Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &ptmp1) == NULL) { + const char *makeobjdir = Var_Value("MAKEOBJDIR", + VAR_CMD, &ptmp2); if (makeobjdir == NULL || !strchr(makeobjdir, '$')) { if (stat(pwd, &sb) == 0 && @@ -1115,6 +1116,8 @@ (void)strncpy(curdir, pwd, MAXPATHLEN); } } + free(ptmp1); + free(ptmp2); } #endif Var_Set(".CURDIR", curdir, VAR_GLOBAL, 0); @@ -1131,11 +1134,13 @@ Dir_Init(curdir); (void)Main_SetObjdir(curdir); - if ((path = getenv("MAKEOBJDIRPREFIX")) != NULL) { + if ((path = Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &p1)) != NULL) { (void)snprintf(mdpath, MAXPATHLEN, "%s%s", path, curdir); (void)Main_SetObjdir(mdpath); - } else if ((path = getenv("MAKEOBJDIR")) != NULL) { + free(p1); + } else if ((path = Var_Value("MAKEOBJDIR", VAR_CMD, &p1)) != NULL) { (void)Main_SetObjdir(path); + free(p1); } else { (void)snprintf(mdpath, MAXPATHLEN, "%s.%s", _PATH_OBJDIR, machine); if (!Main_SetObjdir(mdpath) && !Main_SetObjdir(_PATH_OBJDIR)) { Modified: soc2014/op/freebsd-base/contrib/bmake/make.1 ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/make.1 Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/make.1 Tue Jul 15 14:12:58 2014 (r270886) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $ +.\" $NetBSD: make.1,v 1.230 2014/02/15 18:55:30 sjg Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd October 25, 2013 +.Dd February 14, 2014 .Dt MAKE 1 .Os .Sh NAME @@ -706,6 +706,10 @@ Refer to the description of .Ql Ev PWD for more details. +.It Va .INCLUDEDFROMDIR +The directory of the file this Makefile was included from. +.It Va .INCLUDEDFROMFILE +The filename of the file this Makefile was included from. .It Ev MAKE The name that .Nm @@ -1257,6 +1261,15 @@ are orthogonal; the former specifies whether multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. +.Pp +As for the +.Cm \&:S +modifier, the +.Ar pattern +and +.Ar replacement +are subjected to variable expansion before being parsed as +regular expressions. .It Cm \&:T Replaces each word in the variable with its last component. .It Cm \&:u Modified: soc2014/op/freebsd-base/contrib/bmake/mk/ChangeLog ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/mk/ChangeLog Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/mk/ChangeLog Tue Jul 15 14:12:58 2014 (r270886) @@ -1,3 +1,60 @@ +2014-05-22 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20140522 + + * lib.mk: use CC to link shlib for linux too + patch from Brendan MacDonell + +2014-05-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * meta.autodep.mk: add _reldir_{finish,failed} for gathering stats + if WITH_META_STATS is defined. + +2014-05-02 Simon J. Gerraty <sjg@bad.crufty.net> + + * dirdeps.mk: accept -DWITHOUT_DIRDEPS (same a as -DNO_DIRDEPS) + to supress dirdeps outside of .CURDIR. + +2014-04-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * Fix spelling errors - patch from Pedro Giffuni + +2014-03-14 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20140314 + + * dirdeps.mk (beforedirdeps): a handy hook + + * dirdeps.mk (DIRDEP_MAKE): allow the actual command we run + to visit leaf dirs to be intercepted (eg. for distributed + build). + + * dirdeps.mk (__depdirs): ensure // don't sneak in + + * gendirdeps.mk (DIRDEPS): ensure // don't sneak in + + +2014-02-21 Simon J. Gerraty <sjg@bad.crufty.net> + + * rst2htm.mk (RST2PDF): add support for rst2pdf + +2014-02-14 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): bump version + * dirdeps.mk (_last_dependfile): use .INCLUDEDFROMFILE if + available. + +2014-02-10 Simon J. Gerraty <sjg@bad.crufty.net> + + * options.mk: avoid :U so this isn't bmake dependent + +2014-02-09 Simon J. Gerraty <sjg@bad.crufty.net> + + * options.mk: cleanup and simplify semanitcs + NO_* dominates all, if both WITH_* and WITHOUT_* + are defined then result is DOMINATE_* which defaults to "no". + Ie. WITHOUT_ normally wins. + 2013-12-12 Simon J. Gerraty <sjg@bad.crufty.net> * install-mk (MK_VERSION): bump version @@ -490,7 +547,7 @@ * dep.mk: auto.dep.mk does not do 'make depend' so ignore it if asked to do that. fix/simplify the tests for when to run mkdep. - * auto.dep.mk: add some explaination of how/what we do. + * auto.dep.mk: add some explanation of how/what we do. * autodep.mk: skip the .OPTIONAL frobbing of .depend bmake's FROM_DEPEND flag makes it redundant. @@ -640,7 +697,7 @@ 2006-12-30 Simon J. Gerraty <sjg@void.crufty.net> * install-mk (MK_VERSION): bump version - * added libs.mk - analagous to progs.mk + * added libs.mk - analogous to progs.mk make both of them always inlcude {lib,prog}.mk 2006-12-28 Simon J. Gerraty <sjg@void.crufty.net> Modified: soc2014/op/freebsd-base/contrib/bmake/mk/autodep.mk ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/mk/autodep.mk Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/mk/autodep.mk Tue Jul 15 14:12:58 2014 (r270886) @@ -1,6 +1,6 @@ # # RCSid: -# $Id: autodep.mk,v 1.32 2010/04/19 17:37:56 sjg Exp $ +# $Id: autodep.mk,v 1.33 2014/04/05 22:56:54 sjg Exp $ # # @(#) Copyright (c) 1999-2010, Simon J. Gerraty # @@ -16,7 +16,7 @@ # This module provides automagic dependency generation along the # lines suggested in the GNU make.info -# The depend target is mainly for backwards compatability, +# The depend target is mainly for backwards compatibility, # dependencies are normally updated as part of compilation. # set MKDEP=autodep and dep.mk will include us Modified: soc2014/op/freebsd-base/contrib/bmake/mk/dirdeps.mk ============================================================================== --- soc2014/op/freebsd-base/contrib/bmake/mk/dirdeps.mk Tue Jul 15 13:29:36 2014 (r270885) +++ soc2014/op/freebsd-base/contrib/bmake/mk/dirdeps.mk Tue Jul 15 14:12:58 2014 (r270886) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.29 2013/10/13 18:43:53 sjg Exp $ +# $Id: dirdeps.mk,v 1.35 2014/05/03 06:27:56 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -44,7 +44,7 @@ # All unqualified entries end up being qualified with .${TARGET_SPEC} # and partially qualified (if TARGET_SPEC_VARS has multiple # entries) are also expanded to a full .<target_spec>. -# The _DIRDEPS_USE target uses the suffix to set TARGET_SPEC +# The _DIRDEP_USE target uses the suffix to set TARGET_SPEC # correctly when visiting each entry. # # The fully qualified directory entries are used to construct a @@ -71,7 +71,7 @@ # # TARGET_SPEC_VARS # The default value is just MACHINE, and for most environments -# this is sufficient. The _DIRDEPS_USE target actually sets +# this is sufficient. The _DIRDEP_USE target actually sets # both MACHINE and TARGET_SPEC to the suffix of the current # target so that in the general case TARGET_SPEC can be ignored. # @@ -196,7 +196,11 @@ # if we were included recursively _DEP_TARGET_SPEC should be valid. .if empty(_DEP_TARGET_SPEC) # we may or may not have included a dependfile yet +.if defined(.INCLUDEDFROMFILE) +_last_dependfile := ${.INCLUDEDFROMFILE:M${.MAKE.DEPENDFILE_PREFIX}*} +.else _last_dependfile := ${.MAKE.MAKEFILES:M*/${.MAKE.DEPENDFILE_PREFIX}*:[-1]} +.endif .if !empty(_debug_reldir) .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _last_dependfile='${_last_dependfile}' .endif @@ -239,7 +243,8 @@ # we can use this as a clue to do initialization and other one time things. .if !target(_DIRDEP_USE) # make sure this target exists -dirdeps: +dirdeps: beforedirdeps .WAIT +beforedirdeps: # We normally expect to be included by Makefile.depend.* # which sets the DEP_* macros below. @@ -269,12 +274,15 @@ NSkipDir = ${DEP_SKIP_DIR:${M_ListToSkip}} -.if defined(NO_DIRDEPS) || defined(NODIRDEPS) +.if defined(NO_DIRDEPS) || defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS) # confine ourselves to the original dir DIRDEPS_FILTER += M${_DEP_RELDIR}* .endif -# we supress SUBDIR when visiting the leaves +# this is what we run below +DIRDEP_MAKE?= ${.MAKE} + +# we suppress SUBDIR when visiting the leaves # we assume sys.mk will set MACHINE_ARCH # you can add extras to DIRDEP_USE_ENV # if there is no makefile in the target directory, we skip it. @@ -285,7 +293,7 @@ MACHINE_ARCH= NO_SUBDIR=1 ${DIRDEP_USE_ENV} \ TARGET_SPEC=${.TARGET:E} \ MACHINE=${.TARGET:E} \ - ${.MAKE} -C ${.TARGET:R} || exit 1; \ + ${DIRDEP_MAKE} -C ${.TARGET:R} || exit 1; \ break; \ done @@ -397,7 +405,7 @@ .endif # this is what we start with -__depdirs := ${DIRDEPS:${NSkipDir}:${DEP_DIRDEPS_FILTER:ts:}:O:u:@d@${SRCTOP}/$d@} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407151412.s6FECxhL009130>