Date: Sun, 28 Sep 2014 01:52:07 +0000 (UTC) From: Bryan Venteicher <bryanv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272235 - in projects/vxlan: . bin/csh bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/contrib/opensolaris/cmd/dtrace/test/tst/co... Message-ID: <201409280152.s8S1q7b3013773@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bryanv Date: Sun Sep 28 01:52:04 2014 New Revision: 272235 URL: http://svnweb.freebsd.org/changeset/base/272235 Log: IFC @ r272233 Added: projects/vxlan/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff - copied unchanged from r272233, head/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff projects/vxlan/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff - copied unchanged from r272233, head/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff projects/vxlan/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff - copied unchanged from r272233, head/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff projects/vxlan/contrib/openpam/lib/libpam/openpam_strlset.c - copied unchanged from r272233, head/contrib/openpam/lib/libpam/openpam_strlset.c projects/vxlan/contrib/openpam/lib/libpam/openpam_strlset.h - copied unchanged from r272233, head/contrib/openpam/lib/libpam/openpam_strlset.h projects/vxlan/contrib/pjdfstest/ - copied from r272233, head/contrib/pjdfstest/ projects/vxlan/etc/devd/hyperv.conf - copied unchanged from r272233, head/etc/devd/hyperv.conf projects/vxlan/games/primes/spsp.c - copied unchanged from r272233, head/games/primes/spsp.c projects/vxlan/lib/libproc/tests/ - copied from r272233, head/lib/libproc/tests/ projects/vxlan/lib/msun/ld128/e_lgammal_r.c - copied unchanged from r272233, head/lib/msun/ld128/e_lgammal_r.c projects/vxlan/lib/msun/ld80/e_lgammal_r.c - copied unchanged from r272233, head/lib/msun/ld80/e_lgammal_r.c projects/vxlan/lib/msun/src/e_lgammal.c - copied unchanged from r272233, head/lib/msun/src/e_lgammal.c projects/vxlan/share/man/man4/ipheth.4 - copied unchanged from r272233, head/share/man/man4/ipheth.4 projects/vxlan/share/man/man4/man4.arm/cgem.4 - copied unchanged from r272233, head/share/man/man4/man4.arm/cgem.4 projects/vxlan/share/man/man4/smsc.4 - copied unchanged from r272233, head/share/man/man4/smsc.4 projects/vxlan/sys/arm/include/sysreg.h - copied unchanged from r272233, head/sys/arm/include/sysreg.h projects/vxlan/sys/arm/samsung/s3c2xx0/ - copied from r272233, head/sys/arm/samsung/s3c2xx0/ projects/vxlan/sys/boot/common/zfsloader.8 - copied unchanged from r272233, head/sys/boot/common/zfsloader.8 projects/vxlan/sys/boot/efi/include/eficonsctl.h - copied unchanged from r272233, head/sys/boot/efi/include/eficonsctl.h projects/vxlan/sys/boot/i386/gptzfsboot/gptzfsboot.8 - copied unchanged from r272233, head/sys/boot/i386/gptzfsboot/gptzfsboot.8 projects/vxlan/sys/boot/i386/zfsboot/zfsboot.8 - copied unchanged from r272233, head/sys/boot/i386/zfsboot/zfsboot.8 projects/vxlan/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c - copied unchanged from r272233, head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c projects/vxlan/sys/compat/linux/linux_timer.c - copied unchanged from r272233, head/sys/compat/linux/linux_timer.c projects/vxlan/sys/compat/linux/linux_timer.h - copied unchanged from r272233, head/sys/compat/linux/linux_timer.h projects/vxlan/sys/dev/alpm/ - copied from r272233, head/sys/dev/alpm/ projects/vxlan/sys/dev/amdpm/ - copied from r272233, head/sys/dev/amdpm/ projects/vxlan/sys/dev/amdsmb/ - copied from r272233, head/sys/dev/amdsmb/ projects/vxlan/sys/dev/drm2/i915/i915_gem_context.c - copied unchanged from r272233, head/sys/dev/drm2/i915/i915_gem_context.c projects/vxlan/sys/dev/dwc/ - copied from r272233, head/sys/dev/dwc/ projects/vxlan/sys/dev/fdc/fdc_cbus.c - copied unchanged from r272233, head/sys/dev/fdc/fdc_cbus.c projects/vxlan/sys/dev/intpm/ - copied from r272233, head/sys/dev/intpm/ projects/vxlan/sys/dev/ncr/ - copied from r272233, head/sys/dev/ncr/ projects/vxlan/sys/dev/nfsmb/ - copied from r272233, head/sys/dev/nfsmb/ projects/vxlan/sys/dev/rl/ - copied from r272233, head/sys/dev/rl/ projects/vxlan/sys/dev/viapm/ - copied from r272233, head/sys/dev/viapm/ projects/vxlan/sys/mips/conf/TP-MR3020 - copied unchanged from r272233, head/sys/mips/conf/TP-MR3020 projects/vxlan/sys/mips/conf/TP-MR3020.hints - copied unchanged from r272233, head/sys/mips/conf/TP-MR3020.hints projects/vxlan/sys/modules/ncr/ - copied from r272233, head/sys/modules/ncr/ projects/vxlan/sys/ofed/drivers/net/mlx4/mlx4_stats.h - copied unchanged from r272233, head/sys/ofed/drivers/net/mlx4/mlx4_stats.h projects/vxlan/sys/ofed/drivers/net/mlx4/utils.c - copied unchanged from r272233, head/sys/ofed/drivers/net/mlx4/utils.c projects/vxlan/sys/ofed/drivers/net/mlx4/utils.h - copied unchanged from r272233, head/sys/ofed/drivers/net/mlx4/utils.h projects/vxlan/usr.bin/mkimg/qcow.c - copied unchanged from r272233, head/usr.bin/mkimg/qcow.c projects/vxlan/usr.bin/mkimg/tests/ - copied from r272233, head/usr.bin/mkimg/tests/ Deleted: projects/vxlan/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff projects/vxlan/contrib/openpam/m4/ projects/vxlan/etc/rc.d/hv_kvpd projects/vxlan/lib/libproc/test/ projects/vxlan/sys/amd64/vmm/vmm_msr.c projects/vxlan/sys/amd64/vmm/vmm_msr.h projects/vxlan/sys/arm/s3c2xx0/ projects/vxlan/sys/pc98/cbus/fdc.c projects/vxlan/sys/pc98/cbus/fdc_cbus.c projects/vxlan/sys/pc98/cbus/fdcreg.h projects/vxlan/sys/pc98/cbus/fdcvar.h projects/vxlan/sys/pci/ projects/vxlan/tools/regression/pjdfstest/ Modified: projects/vxlan/Makefile.inc1 projects/vxlan/ObsoleteFiles.inc projects/vxlan/UPDATING projects/vxlan/bin/csh/Makefile projects/vxlan/bin/sh/sh.1 projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/vxlan/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/vxlan/cddl/usr.sbin/Makefile projects/vxlan/contrib/apr-util/CHANGES projects/vxlan/contrib/apr-util/NOTICE projects/vxlan/contrib/apr-util/apr-util.spec projects/vxlan/contrib/apr-util/configure projects/vxlan/contrib/apr-util/crypto/apr_crypto.c projects/vxlan/contrib/apr-util/crypto/apr_passwd.c projects/vxlan/contrib/apr-util/dbd/apr_dbd_mysql.c projects/vxlan/contrib/apr-util/dbd/apr_dbd_odbc.c projects/vxlan/contrib/apr-util/dbm/NWGNUmakefile projects/vxlan/contrib/apr-util/include/apu_version.h projects/vxlan/contrib/apr-util/test/Makefile.win projects/vxlan/contrib/atf/FREEBSD-upgrade projects/vxlan/contrib/atf/NEWS projects/vxlan/contrib/atf/atf-c++/atf-c++-api.3 projects/vxlan/contrib/atf/atf-c/atf-c-api.3 projects/vxlan/contrib/atf/atf-c/macros_h_test.c projects/vxlan/contrib/atf/atf-sh/atf-check.1 projects/vxlan/contrib/atf/atf-sh/atf-sh-api.3 projects/vxlan/contrib/atf/atf-sh/atf-sh.1 projects/vxlan/contrib/atf/doc/atf-test-case.4 projects/vxlan/contrib/atf/doc/atf-test-program.1 projects/vxlan/contrib/hyperv/tools/hv_kvp_daemon.c projects/vxlan/contrib/ipfilter/lib/gethost.c projects/vxlan/contrib/ipfilter/lib/printnat.c projects/vxlan/contrib/ipfilter/tools/ipf_y.y projects/vxlan/contrib/ipfilter/tools/ipnat_y.y projects/vxlan/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff projects/vxlan/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff projects/vxlan/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff projects/vxlan/contrib/ofed/libibverbs/examples/asyncwatch.c projects/vxlan/contrib/ofed/libibverbs/examples/device_list.c projects/vxlan/contrib/ofed/libibverbs/examples/devinfo.c projects/vxlan/contrib/ofed/libmlx4/src/mlx4-abi.h projects/vxlan/contrib/one-true-awk/awk.1 projects/vxlan/contrib/one-true-awk/main.c projects/vxlan/contrib/one-true-awk/run.c projects/vxlan/contrib/openpam/CREDITS (contents, props changed) projects/vxlan/contrib/openpam/HISTORY (contents, props changed) projects/vxlan/contrib/openpam/INSTALL (contents, props changed) projects/vxlan/contrib/openpam/LICENSE (contents, props changed) projects/vxlan/contrib/openpam/Makefile.am (contents, props changed) projects/vxlan/contrib/openpam/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/README (contents, props changed) projects/vxlan/contrib/openpam/RELNOTES (contents, props changed) projects/vxlan/contrib/openpam/TODO projects/vxlan/contrib/openpam/aclocal.m4 (contents, props changed) projects/vxlan/contrib/openpam/autogen.sh (contents, props changed) projects/vxlan/contrib/openpam/bin/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/vxlan/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/vxlan/contrib/openpam/bin/pamtest/Makefile.in projects/vxlan/contrib/openpam/bin/pamtest/pamtest.1 projects/vxlan/contrib/openpam/bin/su/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/bin/su/su.1 projects/vxlan/contrib/openpam/config.h.in (contents, props changed) projects/vxlan/contrib/openpam/configure (contents, props changed) projects/vxlan/contrib/openpam/configure.ac (contents, props changed) projects/vxlan/contrib/openpam/doc/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/doc/man/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_borrow_cred.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_free_data.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_free_envlist.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_get_feature.3 projects/vxlan/contrib/openpam/doc/man/openpam_get_option.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_log.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_nullconv.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_readline.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_readlinev.3 projects/vxlan/contrib/openpam/doc/man/openpam_readword.3 projects/vxlan/contrib/openpam/doc/man/openpam_restore_cred.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_set_feature.3 projects/vxlan/contrib/openpam/doc/man/openpam_set_option.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/openpam_straddch.3 projects/vxlan/contrib/openpam/doc/man/openpam_subst.3 projects/vxlan/contrib/openpam/doc/man/openpam_ttyconv.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam.conf.5 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_acct_mgmt.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_authenticate.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_chauthtok.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_close_session.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_conv.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_end.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_error.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_get_authtok.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_get_data.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_get_item.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_get_user.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_getenv.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_getenvlist.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_info.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_open_session.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_prompt.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_putenv.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_set_data.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_set_item.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_setcred.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_setenv.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_sm_authenticate.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_sm_chauthtok.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_sm_close_session.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_sm_open_session.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_sm_setcred.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_start.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_strerror.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_verror.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_vinfo.3 (contents, props changed) projects/vxlan/contrib/openpam/doc/man/pam_vprompt.3 (contents, props changed) projects/vxlan/contrib/openpam/include/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/include/security/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/include/security/openpam_version.h (contents, props changed) projects/vxlan/contrib/openpam/lib/Makefile.am projects/vxlan/contrib/openpam/lib/Makefile.in projects/vxlan/contrib/openpam/lib/libpam/Makefile.am projects/vxlan/contrib/openpam/lib/libpam/Makefile.in projects/vxlan/contrib/openpam/lib/libpam/openpam_configure.c projects/vxlan/contrib/openpam/lib/libpam/openpam_ctype.h projects/vxlan/contrib/openpam/lib/libpam/openpam_dispatch.c projects/vxlan/contrib/openpam/lib/libpam/openpam_ttyconv.c projects/vxlan/contrib/openpam/lib/libpam/pam_get_authtok.c projects/vxlan/contrib/openpam/ltmain.sh (contents, props changed) projects/vxlan/contrib/openpam/mkpkgng.in projects/vxlan/contrib/openpam/modules/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/modules/pam_deny/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/modules/pam_permit/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/modules/pam_unix/Makefile.in (contents, props changed) projects/vxlan/contrib/openpam/pamgdb.in projects/vxlan/contrib/openpam/t/Makefile.am projects/vxlan/contrib/openpam/t/Makefile.in projects/vxlan/etc/defaults/periodic.conf projects/vxlan/etc/defaults/rc.conf projects/vxlan/etc/devd/Makefile projects/vxlan/etc/mail/Makefile projects/vxlan/etc/motd projects/vxlan/etc/mtree/BSD.tests.dist projects/vxlan/etc/rc.d/Makefile projects/vxlan/etc/rc.d/ipropd_slave projects/vxlan/etc/rc.d/routing projects/vxlan/etc/rc.d/syscons projects/vxlan/games/factor/factor.6 projects/vxlan/games/factor/factor.c projects/vxlan/games/primes/Makefile projects/vxlan/games/primes/primes.c projects/vxlan/games/primes/primes.h projects/vxlan/include/unistd.h projects/vxlan/kerberos5/lib/libasn1/Makefile projects/vxlan/lib/libc/Makefile projects/vxlan/lib/libc/gen/nlist.c projects/vxlan/lib/libc/sys/access.2 projects/vxlan/lib/libc/sys/mmap.2 projects/vxlan/lib/libc/sys/mq_open.2 projects/vxlan/lib/libgeom/geom_stats.c projects/vxlan/lib/libnv/nv.3 projects/vxlan/lib/libnv/nvpair.c projects/vxlan/lib/libpam/libpam/Makefile projects/vxlan/lib/libpam/modules/pam_login_access/pam_login_access.c projects/vxlan/lib/libproc/Makefile projects/vxlan/lib/libproc/proc_sym.c projects/vxlan/lib/libthr/libthr.3 projects/vxlan/lib/libthr/thread/thr_init.c projects/vxlan/lib/libunbound/Makefile projects/vxlan/lib/msun/Makefile projects/vxlan/lib/msun/Symbol.map projects/vxlan/lib/msun/man/lgamma.3 projects/vxlan/lib/msun/src/e_lgamma.c projects/vxlan/lib/msun/src/e_lgamma_r.c projects/vxlan/lib/msun/src/e_lgammaf_r.c projects/vxlan/lib/msun/src/imprecise.c projects/vxlan/lib/msun/src/math.h projects/vxlan/release/arm/BEAGLEBONE.conf projects/vxlan/release/arm/PANDABOARD.conf projects/vxlan/release/arm/RPI-B.conf projects/vxlan/release/arm/WANDBOARD-QUAD.conf projects/vxlan/release/arm/ZEDBOARD.conf projects/vxlan/release/arm/release.sh projects/vxlan/release/doc/en_US.ISO8859-1/hardware/article.xml projects/vxlan/release/picobsd/tinyware/simple_httpd/simple_httpd.c projects/vxlan/release/scripts/pkg-stage.sh projects/vxlan/sbin/ifconfig/ifconfig.8 projects/vxlan/sbin/ping6/Makefile projects/vxlan/sbin/ping6/ping6.c projects/vxlan/sbin/routed/defs.h projects/vxlan/sbin/routed/input.c projects/vxlan/sbin/routed/main.c projects/vxlan/sbin/routed/output.c projects/vxlan/sbin/routed/routed.8 projects/vxlan/sbin/savecore/savecore.c projects/vxlan/sbin/sysctl/sysctl.c projects/vxlan/share/man/man4/Makefile projects/vxlan/share/man/man4/ada.4 projects/vxlan/share/man/man4/cdce.4 projects/vxlan/share/man/man4/lagg.4 projects/vxlan/share/man/man4/malo.4 projects/vxlan/share/man/man4/man4.arm/Makefile projects/vxlan/share/man/man4/miibus.4 projects/vxlan/share/man/man4/urndis.4 projects/vxlan/share/man/man9/Makefile projects/vxlan/share/man/man9/SDT.9 projects/vxlan/share/man/man9/altq.9 projects/vxlan/share/man/man9/sleepqueue.9 projects/vxlan/share/man/man9/sysctl.9 projects/vxlan/share/misc/committers-src.dot projects/vxlan/share/mk/bsd.progs.mk projects/vxlan/sys/Makefile projects/vxlan/sys/amd64/amd64/fpu.c projects/vxlan/sys/amd64/amd64/machdep.c projects/vxlan/sys/amd64/amd64/pmap.c projects/vxlan/sys/amd64/amd64/trap.c projects/vxlan/sys/amd64/conf/GENERIC projects/vxlan/sys/amd64/conf/NOTES projects/vxlan/sys/amd64/include/vmm.h (contents, props changed) projects/vxlan/sys/amd64/linux32/linux.h projects/vxlan/sys/amd64/linux32/linux32_dummy.c projects/vxlan/sys/amd64/linux32/linux32_proto.h projects/vxlan/sys/amd64/linux32/linux32_syscall.h projects/vxlan/sys/amd64/linux32/linux32_syscalls.c projects/vxlan/sys/amd64/linux32/linux32_sysent.c projects/vxlan/sys/amd64/linux32/linux32_systrace_args.c projects/vxlan/sys/amd64/linux32/syscalls.master projects/vxlan/sys/amd64/vmm/intel/ept.c projects/vxlan/sys/amd64/vmm/intel/vmcs.h projects/vxlan/sys/amd64/vmm/intel/vmx.c projects/vxlan/sys/amd64/vmm/intel/vmx.h projects/vxlan/sys/amd64/vmm/intel/vmx_msr.c projects/vxlan/sys/amd64/vmm/intel/vmx_msr.h projects/vxlan/sys/amd64/vmm/io/vatpic.c projects/vxlan/sys/amd64/vmm/io/vlapic.c projects/vxlan/sys/amd64/vmm/vmm.c projects/vxlan/sys/arm/allwinner/a10_clk.c projects/vxlan/sys/arm/allwinner/if_emac.c projects/vxlan/sys/arm/altera/socfpga/files.socfpga projects/vxlan/sys/arm/arm/cpufunc_asm_armv7.S projects/vxlan/sys/arm/arm/gic.c projects/vxlan/sys/arm/arm/machdep.c projects/vxlan/sys/arm/arm/mpcore_timer.c projects/vxlan/sys/arm/at91/at91rm9200.c projects/vxlan/sys/arm/at91/at91rm92reg.h projects/vxlan/sys/arm/at91/at91sam9260reg.h projects/vxlan/sys/arm/at91/at91sam9g20reg.h projects/vxlan/sys/arm/at91/at91sam9g45reg.h projects/vxlan/sys/arm/at91/at91sam9x5reg.h projects/vxlan/sys/arm/at91/if_ate.c projects/vxlan/sys/arm/at91/if_macb.c projects/vxlan/sys/arm/cavium/cns11xx/if_ece.c projects/vxlan/sys/arm/conf/LN2410SBC projects/vxlan/sys/arm/conf/NOTES projects/vxlan/sys/arm/conf/SOCKIT projects/vxlan/sys/arm/freescale/imx/files.imx6 projects/vxlan/sys/arm/freescale/imx/imx6_machdep.c projects/vxlan/sys/arm/include/intr.h projects/vxlan/sys/arm/lpc/if_lpe.c projects/vxlan/sys/arm/ti/cpsw/if_cpsw.c projects/vxlan/sys/arm/xscale/ixp425/if_npe.c projects/vxlan/sys/boot/amd64/boot1.efi/boot1.c projects/vxlan/sys/boot/amd64/efi/bootinfo.c projects/vxlan/sys/boot/common/Makefile.inc projects/vxlan/sys/boot/efi/libefi/libefi.c projects/vxlan/sys/boot/fdt/dts/arm/socfpga-sockit.dts projects/vxlan/sys/boot/fdt/dts/arm/socfpga.dtsi projects/vxlan/sys/boot/i386/gptzfsboot/Makefile projects/vxlan/sys/boot/i386/libfirewire/fwohcireg.h projects/vxlan/sys/boot/i386/zfsboot/Makefile projects/vxlan/sys/cam/cam_xpt.c projects/vxlan/sys/cam/ctl/ctl.c projects/vxlan/sys/cam/ctl/ctl.h projects/vxlan/sys/cam/ctl/ctl_backend_block.c projects/vxlan/sys/cam/ctl/ctl_cmd_table.c projects/vxlan/sys/cam/ctl/ctl_error.c projects/vxlan/sys/cam/ctl/ctl_error.h projects/vxlan/sys/cam/ctl/ctl_frontend_iscsi.c projects/vxlan/sys/cam/ctl/ctl_private.h projects/vxlan/sys/cam/ctl/ctl_tpc.c projects/vxlan/sys/cam/scsi/scsi_all.h projects/vxlan/sys/cam/scsi/scsi_da.c projects/vxlan/sys/cddl/compat/opensolaris/sys/sdt.h projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/vxlan/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/vxlan/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/vxlan/sys/compat/freebsd32/freebsd32_misc.c projects/vxlan/sys/compat/linprocfs/linprocfs.c projects/vxlan/sys/compat/linux/linux_ioctl.c projects/vxlan/sys/compat/linux/linux_mib.c projects/vxlan/sys/conf/NOTES projects/vxlan/sys/conf/files projects/vxlan/sys/conf/files.amd64 projects/vxlan/sys/conf/files.i386 projects/vxlan/sys/conf/files.pc98 projects/vxlan/sys/conf/options projects/vxlan/sys/contrib/altq/altq/if_altq.h projects/vxlan/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/vxlan/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c projects/vxlan/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/vxlan/sys/contrib/ipfilter/netinet/ip_frag.c projects/vxlan/sys/ddb/db_main.c projects/vxlan/sys/ddb/ddb.h projects/vxlan/sys/dev/acpica/acpi.c projects/vxlan/sys/dev/acpica/acpi_pci.c projects/vxlan/sys/dev/ae/if_ae.c projects/vxlan/sys/dev/age/if_age.c projects/vxlan/sys/dev/ahci/ahci.c projects/vxlan/sys/dev/alc/if_alc.c projects/vxlan/sys/dev/ale/if_ale.c projects/vxlan/sys/dev/altera/atse/a_api.h projects/vxlan/sys/dev/altera/atse/if_atse.c projects/vxlan/sys/dev/an/if_an.c projects/vxlan/sys/dev/asmc/asmc.c projects/vxlan/sys/dev/asmc/asmcvar.h projects/vxlan/sys/dev/ath/if_ath.c projects/vxlan/sys/dev/ath/if_ath_rx.c projects/vxlan/sys/dev/ath/if_ath_rx_edma.c projects/vxlan/sys/dev/ath/if_ath_tx.c projects/vxlan/sys/dev/ath/if_athvar.h projects/vxlan/sys/dev/atkbdc/atkbd.c projects/vxlan/sys/dev/bce/if_bce.c projects/vxlan/sys/dev/bce/if_bcereg.h projects/vxlan/sys/dev/bfe/if_bfe.c projects/vxlan/sys/dev/bge/if_bge.c projects/vxlan/sys/dev/bm/if_bm.c projects/vxlan/sys/dev/bwi/if_bwi.c projects/vxlan/sys/dev/bwn/if_bwn.c projects/vxlan/sys/dev/bxe/bxe.c projects/vxlan/sys/dev/bxe/bxe_stats.c projects/vxlan/sys/dev/bxe/bxe_stats.h projects/vxlan/sys/dev/bxe/ecore_sp.h projects/vxlan/sys/dev/cadence/if_cgem.c projects/vxlan/sys/dev/cas/if_cas.c projects/vxlan/sys/dev/ce/if_ce.c projects/vxlan/sys/dev/cm/smc90cx6.c projects/vxlan/sys/dev/cp/if_cp.c projects/vxlan/sys/dev/cs/if_cs.c projects/vxlan/sys/dev/ctau/if_ct.c projects/vxlan/sys/dev/cx/if_cx.c projects/vxlan/sys/dev/cxgb/cxgb_adapter.h projects/vxlan/sys/dev/cxgb/cxgb_main.c projects/vxlan/sys/dev/cxgb/cxgb_sge.c projects/vxlan/sys/dev/cxgbe/adapter.h projects/vxlan/sys/dev/cxgbe/t4_main.c projects/vxlan/sys/dev/cxgbe/tom/t4_listen.c projects/vxlan/sys/dev/dc/if_dc.c projects/vxlan/sys/dev/de/if_de.c projects/vxlan/sys/dev/drm2/drm_gem_names.c projects/vxlan/sys/dev/drm2/drm_gem_names.h projects/vxlan/sys/dev/drm2/i915/i915_dma.c projects/vxlan/sys/dev/drm2/i915/i915_drm.h projects/vxlan/sys/dev/drm2/i915/i915_drv.c projects/vxlan/sys/dev/drm2/i915/i915_drv.h projects/vxlan/sys/dev/drm2/i915/i915_gem.c projects/vxlan/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/vxlan/sys/dev/drm2/i915/i915_gem_gtt.c projects/vxlan/sys/dev/drm2/i915/i915_irq.c projects/vxlan/sys/dev/drm2/i915/i915_reg.h projects/vxlan/sys/dev/drm2/i915/intel_ringbuffer.c projects/vxlan/sys/dev/drm2/i915/intel_ringbuffer.h projects/vxlan/sys/dev/e1000/if_em.c projects/vxlan/sys/dev/e1000/if_igb.c projects/vxlan/sys/dev/e1000/if_igb.h projects/vxlan/sys/dev/e1000/if_lem.c projects/vxlan/sys/dev/ed/if_ed.c projects/vxlan/sys/dev/en/midway.c projects/vxlan/sys/dev/ep/if_ep.c projects/vxlan/sys/dev/et/if_et.c projects/vxlan/sys/dev/ex/if_ex.c projects/vxlan/sys/dev/fatm/if_fatm.c projects/vxlan/sys/dev/fdc/fdc.c projects/vxlan/sys/dev/fdc/fdcvar.h projects/vxlan/sys/dev/fdt/fdt_common.c projects/vxlan/sys/dev/fdt/fdt_common.h projects/vxlan/sys/dev/fdt/simplebus.c projects/vxlan/sys/dev/fe/if_fe.c projects/vxlan/sys/dev/ffec/if_ffec.c projects/vxlan/sys/dev/firewire/firewire.c projects/vxlan/sys/dev/firewire/firewire.h projects/vxlan/sys/dev/firewire/firewire_phy.h projects/vxlan/sys/dev/firewire/firewirereg.h projects/vxlan/sys/dev/firewire/fwcrom.c projects/vxlan/sys/dev/firewire/fwdev.c projects/vxlan/sys/dev/firewire/fwdma.c projects/vxlan/sys/dev/firewire/fwdma.h projects/vxlan/sys/dev/firewire/fwmem.c projects/vxlan/sys/dev/firewire/fwohci.c projects/vxlan/sys/dev/firewire/fwohci_pci.c projects/vxlan/sys/dev/firewire/fwohcireg.h projects/vxlan/sys/dev/firewire/fwohcivar.h projects/vxlan/sys/dev/firewire/iec68113.h projects/vxlan/sys/dev/firewire/if_fwe.c projects/vxlan/sys/dev/firewire/if_fwip.c projects/vxlan/sys/dev/firewire/sbp.c projects/vxlan/sys/dev/firewire/sbp.h projects/vxlan/sys/dev/firewire/sbp_targ.c projects/vxlan/sys/dev/fxp/if_fxp.c projects/vxlan/sys/dev/gem/if_gem.c projects/vxlan/sys/dev/gxemul/ether/if_gx.c projects/vxlan/sys/dev/hatm/if_hatm_rx.c projects/vxlan/sys/dev/hatm/if_hatm_tx.c projects/vxlan/sys/dev/hme/if_hme.c projects/vxlan/sys/dev/hwpmc/hwpmc_powerpc.c projects/vxlan/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/vxlan/sys/dev/ie/if_ie.c projects/vxlan/sys/dev/if_ndis/if_ndis.c projects/vxlan/sys/dev/iicbus/if_ic.c projects/vxlan/sys/dev/ipw/if_ipw.c projects/vxlan/sys/dev/iscsi/iscsi.c projects/vxlan/sys/dev/isp/isp_freebsd.c projects/vxlan/sys/dev/isp/isp_freebsd.h projects/vxlan/sys/dev/iwi/if_iwi.c projects/vxlan/sys/dev/iwn/if_iwn.c projects/vxlan/sys/dev/ixgbe/ixgbe.c projects/vxlan/sys/dev/ixgbe/ixgbe.h projects/vxlan/sys/dev/ixl/i40e_alloc.h projects/vxlan/sys/dev/ixl/i40e_common.c projects/vxlan/sys/dev/ixl/i40e_osdep.c projects/vxlan/sys/dev/ixl/i40e_osdep.h projects/vxlan/sys/dev/ixl/if_ixl.c projects/vxlan/sys/dev/ixl/if_ixlv.c projects/vxlan/sys/dev/ixl/ixl.h projects/vxlan/sys/dev/ixl/ixl_txrx.c projects/vxlan/sys/dev/ixl/ixlvc.c projects/vxlan/sys/dev/jme/if_jme.c projects/vxlan/sys/dev/le/am7990.c projects/vxlan/sys/dev/le/am79900.c projects/vxlan/sys/dev/le/lance.c projects/vxlan/sys/dev/lge/if_lge.c projects/vxlan/sys/dev/lmc/if_lmc.c projects/vxlan/sys/dev/lmc/if_lmc.h projects/vxlan/sys/dev/malo/if_malo.c projects/vxlan/sys/dev/mge/if_mge.c projects/vxlan/sys/dev/mii/rgephy.c projects/vxlan/sys/dev/mii/rlphy.c projects/vxlan/sys/dev/mii/rlswitch.c projects/vxlan/sys/dev/msk/if_msk.c projects/vxlan/sys/dev/mwl/if_mwl.c projects/vxlan/sys/dev/mxge/if_mxge.c projects/vxlan/sys/dev/my/if_my.c projects/vxlan/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c projects/vxlan/sys/dev/netmap/if_lem_netmap.h projects/vxlan/sys/dev/netmap/if_re_netmap.h projects/vxlan/sys/dev/netmap/netmap.c projects/vxlan/sys/dev/netmap/netmap_kern.h projects/vxlan/sys/dev/nfe/if_nfe.c projects/vxlan/sys/dev/nge/if_nge.c projects/vxlan/sys/dev/oce/oce_if.c projects/vxlan/sys/dev/oce/oce_if.h projects/vxlan/sys/dev/ofw/ofw_bus_subr.c projects/vxlan/sys/dev/ofw/ofw_bus_subr.h projects/vxlan/sys/dev/ofw/ofwbus.c projects/vxlan/sys/dev/patm/if_patm_rx.c projects/vxlan/sys/dev/patm/if_patm_tx.c projects/vxlan/sys/dev/pci/pci.c projects/vxlan/sys/dev/pci/pci_private.h projects/vxlan/sys/dev/pcn/if_pcn.c projects/vxlan/sys/dev/pdq/pdq_ifsubr.c projects/vxlan/sys/dev/ppbus/if_plip.c projects/vxlan/sys/dev/qlxgbe/ql_hw.c projects/vxlan/sys/dev/qlxgbe/ql_isr.c projects/vxlan/sys/dev/qlxge/qls_isr.c projects/vxlan/sys/dev/ral/rt2560.c projects/vxlan/sys/dev/ral/rt2661.c projects/vxlan/sys/dev/ral/rt2860.c projects/vxlan/sys/dev/re/if_re.c projects/vxlan/sys/dev/rt/if_rt.c projects/vxlan/sys/dev/sbni/if_sbni.c projects/vxlan/sys/dev/sf/if_sf.c projects/vxlan/sys/dev/sge/if_sge.c projects/vxlan/sys/dev/sis/if_sis.c projects/vxlan/sys/dev/sk/if_sk.c projects/vxlan/sys/dev/smc/if_smc.c projects/vxlan/sys/dev/sn/if_sn.c projects/vxlan/sys/dev/snc/dp83932.c projects/vxlan/sys/dev/ste/if_ste.c projects/vxlan/sys/dev/stge/if_stge.c projects/vxlan/sys/dev/ti/if_ti.c projects/vxlan/sys/dev/tl/if_tl.c projects/vxlan/sys/dev/tsec/if_tsec.c projects/vxlan/sys/dev/tws/tws.c projects/vxlan/sys/dev/tws/tws.h projects/vxlan/sys/dev/tws/tws_cam.c projects/vxlan/sys/dev/tws/tws_hdm.c projects/vxlan/sys/dev/tws/tws_hdm.h projects/vxlan/sys/dev/tws/tws_services.c projects/vxlan/sys/dev/tx/if_tx.c projects/vxlan/sys/dev/txp/if_txp.c projects/vxlan/sys/dev/usb/controller/ohci_s3c24x0.c projects/vxlan/sys/dev/usb/controller/xhci.c projects/vxlan/sys/dev/usb/misc/uled.c projects/vxlan/sys/dev/usb/net/if_aue.c projects/vxlan/sys/dev/usb/net/if_axe.c projects/vxlan/sys/dev/usb/net/if_axge.c projects/vxlan/sys/dev/usb/net/if_cdce.c projects/vxlan/sys/dev/usb/net/if_cue.c projects/vxlan/sys/dev/usb/net/if_ipheth.c projects/vxlan/sys/dev/usb/net/if_kue.c projects/vxlan/sys/dev/usb/net/if_mos.c projects/vxlan/sys/dev/usb/net/if_rue.c projects/vxlan/sys/dev/usb/net/if_smsc.c projects/vxlan/sys/dev/usb/net/if_udav.c projects/vxlan/sys/dev/usb/net/if_urndis.c projects/vxlan/sys/dev/usb/net/if_usie.c projects/vxlan/sys/dev/usb/net/uhso.c projects/vxlan/sys/dev/usb/net/usb_ethernet.c projects/vxlan/sys/dev/usb/serial/u3g.c projects/vxlan/sys/dev/usb/usbdevs projects/vxlan/sys/dev/usb/wlan/if_rsu.c projects/vxlan/sys/dev/usb/wlan/if_rum.c projects/vxlan/sys/dev/usb/wlan/if_run.c projects/vxlan/sys/dev/usb/wlan/if_uath.c projects/vxlan/sys/dev/usb/wlan/if_upgt.c projects/vxlan/sys/dev/usb/wlan/if_ural.c projects/vxlan/sys/dev/usb/wlan/if_urtw.c projects/vxlan/sys/dev/usb/wlan/if_urtwn.c projects/vxlan/sys/dev/usb/wlan/if_zyd.c projects/vxlan/sys/dev/vge/if_vge.c projects/vxlan/sys/dev/virtio/network/if_vtnet.c projects/vxlan/sys/dev/vmware/vmxnet3/if_vmx.c projects/vxlan/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/vxlan/sys/dev/vr/if_vr.c projects/vxlan/sys/dev/vt/hw/efifb/efifb.c projects/vxlan/sys/dev/vt/hw/fb/vt_early_fb.c projects/vxlan/sys/dev/vt/hw/fb/vt_fb.c projects/vxlan/sys/dev/vt/hw/fb/vt_fb.h projects/vxlan/sys/dev/vt/vt.h projects/vxlan/sys/dev/vt/vt_buf.c projects/vxlan/sys/dev/vt/vt_core.c projects/vxlan/sys/dev/vte/if_vte.c projects/vxlan/sys/dev/vx/if_vx.c projects/vxlan/sys/dev/vxge/vxge.c projects/vxlan/sys/dev/wb/if_wb.c projects/vxlan/sys/dev/wi/if_wi.c projects/vxlan/sys/dev/wl/if_wl.c projects/vxlan/sys/dev/wpi/if_wpi.c projects/vxlan/sys/dev/wtap/if_wtap.c projects/vxlan/sys/dev/xe/if_xe.c projects/vxlan/sys/dev/xen/netback/netback.c projects/vxlan/sys/dev/xen/netfront/netfront.c projects/vxlan/sys/dev/xl/if_xl.c projects/vxlan/sys/fs/autofs/autofs.c projects/vxlan/sys/fs/autofs/autofs_vnops.c projects/vxlan/sys/fs/devfs/devfs_vnops.c projects/vxlan/sys/fs/ext2fs/ext2_vnops.c projects/vxlan/sys/geom/eli/g_eli.c projects/vxlan/sys/gnu/fs/reiserfs/reiserfs_fs_i.h projects/vxlan/sys/i386/i386/machdep.c projects/vxlan/sys/i386/i386/pmap.c projects/vxlan/sys/i386/linux/linux.h projects/vxlan/sys/i386/linux/linux_machdep.c projects/vxlan/sys/i386/linux/linux_proto.h projects/vxlan/sys/i386/linux/linux_syscall.h projects/vxlan/sys/i386/linux/linux_syscalls.c projects/vxlan/sys/i386/linux/linux_sysent.c projects/vxlan/sys/i386/linux/linux_systrace_args.c projects/vxlan/sys/i386/linux/syscalls.master projects/vxlan/sys/kern/bus_if.m projects/vxlan/sys/kern/kern_cons.c projects/vxlan/sys/kern/kern_cpuset.c projects/vxlan/sys/kern/kern_descrip.c projects/vxlan/sys/kern/kern_event.c projects/vxlan/sys/kern/kern_intr.c projects/vxlan/sys/kern/kern_malloc.c projects/vxlan/sys/kern/sched_ule.c projects/vxlan/sys/kern/subr_bus.c projects/vxlan/sys/kern/sys_pipe.c projects/vxlan/sys/kern/sys_procdesc.c projects/vxlan/sys/kern/sys_socket.c projects/vxlan/sys/kern/tty_pts.c projects/vxlan/sys/kern/uipc_mqueue.c projects/vxlan/sys/kern/uipc_sem.c projects/vxlan/sys/kern/uipc_shm.c projects/vxlan/sys/kern/uipc_sockbuf.c projects/vxlan/sys/kern/vfs_syscalls.c projects/vxlan/sys/kern/vfs_vnops.c projects/vxlan/sys/mips/adm5120/if_admsw.c projects/vxlan/sys/mips/atheros/if_arge.c projects/vxlan/sys/mips/beri/beri_simplebus.c projects/vxlan/sys/mips/cavium/ciu.c projects/vxlan/sys/mips/cavium/if_octm.c projects/vxlan/sys/mips/cavium/octe/ethernet-rx.c projects/vxlan/sys/mips/cavium/octe/ethernet-tx.c projects/vxlan/sys/mips/idt/if_kr.c projects/vxlan/sys/mips/mips/machdep.c projects/vxlan/sys/mips/nlm/dev/net/xlpge.c projects/vxlan/sys/mips/rmi/dev/nlge/if_nlge.c projects/vxlan/sys/mips/rmi/dev/xlr/rge.c projects/vxlan/sys/modules/Makefile projects/vxlan/sys/modules/bce/Makefile projects/vxlan/sys/modules/bxe/Makefile projects/vxlan/sys/modules/drm2/i915kms/Makefile projects/vxlan/sys/modules/fdc/Makefile projects/vxlan/sys/modules/i2c/controllers/alpm/Makefile projects/vxlan/sys/modules/i2c/controllers/amdpm/Makefile projects/vxlan/sys/modules/i2c/controllers/amdsmb/Makefile projects/vxlan/sys/modules/i2c/controllers/intpm/Makefile projects/vxlan/sys/modules/i2c/controllers/nfsmb/Makefile projects/vxlan/sys/modules/i2c/controllers/viapm/Makefile projects/vxlan/sys/modules/ixgbe/Makefile projects/vxlan/sys/modules/linux/Makefile projects/vxlan/sys/modules/mlx4/Makefile projects/vxlan/sys/modules/mlxen/Makefile projects/vxlan/sys/modules/netmap/Makefile projects/vxlan/sys/modules/rl/Makefile projects/vxlan/sys/modules/vmm/Makefile projects/vxlan/sys/modules/zfs/Makefile projects/vxlan/sys/net/ieee8023ad_lacp.c projects/vxlan/sys/net/ieee8023ad_lacp.h projects/vxlan/sys/net/if.c projects/vxlan/sys/net/if_arcsubr.c projects/vxlan/sys/net/if_atmsubr.c projects/vxlan/sys/net/if_bridge.c projects/vxlan/sys/net/if_debug.c projects/vxlan/sys/net/if_disc.c projects/vxlan/sys/net/if_edsc.c projects/vxlan/sys/net/if_epair.c projects/vxlan/sys/net/if_ethersubr.c projects/vxlan/sys/net/if_faith.c projects/vxlan/sys/net/if_fddisubr.c projects/vxlan/sys/net/if_fwsubr.c projects/vxlan/sys/net/if_gif.c projects/vxlan/sys/net/if_gre.c projects/vxlan/sys/net/if_gre.h projects/vxlan/sys/net/if_iso88025subr.c projects/vxlan/sys/net/if_lagg.c projects/vxlan/sys/net/if_lagg.h projects/vxlan/sys/net/if_loop.c projects/vxlan/sys/net/if_mib.c projects/vxlan/sys/net/if_spppfr.c projects/vxlan/sys/net/if_spppsubr.c projects/vxlan/sys/net/if_stf.c projects/vxlan/sys/net/if_tap.c projects/vxlan/sys/net/if_tun.c projects/vxlan/sys/net/if_var.h projects/vxlan/sys/net/if_vlan.c projects/vxlan/sys/net/ifq.h projects/vxlan/sys/net/route.c projects/vxlan/sys/net/route.h projects/vxlan/sys/net/rtsock.c projects/vxlan/sys/net80211/ieee80211.c projects/vxlan/sys/net80211/ieee80211_adhoc.c projects/vxlan/sys/net80211/ieee80211_hostap.c projects/vxlan/sys/net80211/ieee80211_input.c projects/vxlan/sys/net80211/ieee80211_mesh.c projects/vxlan/sys/net80211/ieee80211_monitor.c projects/vxlan/sys/net80211/ieee80211_output.c projects/vxlan/sys/net80211/ieee80211_sta.c projects/vxlan/sys/net80211/ieee80211_superg.c projects/vxlan/sys/net80211/ieee80211_wds.c projects/vxlan/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c projects/vxlan/sys/netgraph/bluetooth/drivers/h4/ng_h4.c projects/vxlan/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/vxlan/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h projects/vxlan/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/vxlan/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/vxlan/sys/netgraph/ng_device.c projects/vxlan/sys/netgraph/ng_eiface.c projects/vxlan/sys/netgraph/ng_iface.c projects/vxlan/sys/netgraph/ng_ppp.c projects/vxlan/sys/netgraph/ng_sppp.c projects/vxlan/sys/netgraph/ng_tty.c projects/vxlan/sys/netinet/in.c projects/vxlan/sys/netinet/in_pcb.c projects/vxlan/sys/netinet/in_rss.c projects/vxlan/sys/netinet/ip_fastfwd.c projects/vxlan/sys/netinet/ip_gre.c projects/vxlan/sys/netinet/ip_input.c projects/vxlan/sys/netinet/ip_ipsec.c projects/vxlan/sys/netinet/ip_options.c projects/vxlan/sys/netinet/ip_options.h projects/vxlan/sys/netinet/ip_output.c projects/vxlan/sys/netinet/sctp_auth.c projects/vxlan/sys/netinet/sctp_auth.h projects/vxlan/sys/netinet/sctp_cc_functions.c projects/vxlan/sys/netinet/sctp_os_bsd.h projects/vxlan/sys/netinet/sctp_output.c projects/vxlan/sys/netinet/sctp_pcb.c projects/vxlan/sys/netinet/sctp_structs.h projects/vxlan/sys/netinet/sctp_usrreq.c projects/vxlan/sys/netinet/sctputil.c projects/vxlan/sys/netinet/tcp_input.c projects/vxlan/sys/netinet/tcp_output.c projects/vxlan/sys/netinet/tcp_subr.c projects/vxlan/sys/netinet/tcp_syncache.c projects/vxlan/sys/netinet/tcp_var.h projects/vxlan/sys/netinet/toecore.c projects/vxlan/sys/netipsec/ipsec_input.c projects/vxlan/sys/netipsec/ipsec_output.c projects/vxlan/sys/netpfil/ipfw/ip_dn_io.c projects/vxlan/sys/netpfil/pf/if_pflog.c projects/vxlan/sys/netpfil/pf/if_pfsync.c projects/vxlan/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/vxlan/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/vxlan/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/vxlan/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c projects/vxlan/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/vxlan/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/vxlan/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/vxlan/sys/ofed/drivers/net/mlx4/alloc.c projects/vxlan/sys/ofed/drivers/net/mlx4/catas.c projects/vxlan/sys/ofed/drivers/net/mlx4/cmd.c projects/vxlan/sys/ofed/drivers/net/mlx4/cq.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_cq.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_main.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_netdev.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_port.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_port.h projects/vxlan/sys/ofed/drivers/net/mlx4/en_resources.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_rx.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_selftest.c projects/vxlan/sys/ofed/drivers/net/mlx4/en_tx.c projects/vxlan/sys/ofed/drivers/net/mlx4/eq.c projects/vxlan/sys/ofed/drivers/net/mlx4/fw.c projects/vxlan/sys/ofed/drivers/net/mlx4/fw.h projects/vxlan/sys/ofed/drivers/net/mlx4/icm.c projects/vxlan/sys/ofed/drivers/net/mlx4/icm.h projects/vxlan/sys/ofed/drivers/net/mlx4/intf.c projects/vxlan/sys/ofed/drivers/net/mlx4/main.c projects/vxlan/sys/ofed/drivers/net/mlx4/mcg.c projects/vxlan/sys/ofed/drivers/net/mlx4/mlx4.h projects/vxlan/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/vxlan/sys/ofed/drivers/net/mlx4/mr.c projects/vxlan/sys/ofed/drivers/net/mlx4/pd.c projects/vxlan/sys/ofed/drivers/net/mlx4/port.c projects/vxlan/sys/ofed/drivers/net/mlx4/profile.c projects/vxlan/sys/ofed/drivers/net/mlx4/qp.c projects/vxlan/sys/ofed/drivers/net/mlx4/reset.c projects/vxlan/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/vxlan/sys/ofed/drivers/net/mlx4/sense.c projects/vxlan/sys/ofed/drivers/net/mlx4/srq.c projects/vxlan/sys/ofed/drivers/net/mlx4/sys_tune.c projects/vxlan/sys/ofed/include/linux/linux_compat.c projects/vxlan/sys/ofed/include/linux/mlx4/cmd.h projects/vxlan/sys/ofed/include/linux/mlx4/cq.h projects/vxlan/sys/ofed/include/linux/mlx4/device.h projects/vxlan/sys/ofed/include/linux/mlx4/driver.h projects/vxlan/sys/ofed/include/linux/mlx4/qp.h projects/vxlan/sys/ofed/include/linux/mlx4/srq.h projects/vxlan/sys/opencrypto/cryptodev.c projects/vxlan/sys/pc98/cbus/olpt.c projects/vxlan/sys/pc98/cbus/pckbd.c projects/vxlan/sys/pc98/pc98/machdep.c projects/vxlan/sys/powerpc/aim/locore64.S projects/vxlan/sys/powerpc/aim/machdep.c projects/vxlan/sys/powerpc/booke/machdep.c projects/vxlan/sys/powerpc/ofw/ofw_pcibus.c projects/vxlan/sys/powerpc/powerpc/intr_machdep.c projects/vxlan/sys/powerpc/ps3/if_glc.c projects/vxlan/sys/powerpc/ps3/ps3_syscons.c projects/vxlan/sys/powerpc/pseries/phyp_llan.c projects/vxlan/sys/powerpc/pseries/vdevice.c projects/vxlan/sys/sparc64/pci/psycho.c projects/vxlan/sys/sparc64/sparc64/intr_machdep.c projects/vxlan/sys/sparc64/sparc64/machdep.c projects/vxlan/sys/sys/bus.h projects/vxlan/sys/sys/cpuset.h projects/vxlan/sys/sys/file.h projects/vxlan/sys/sys/filedesc.h projects/vxlan/sys/sys/interrupt.h projects/vxlan/sys/sys/ksem.h projects/vxlan/sys/sys/mman.h projects/vxlan/sys/sys/param.h projects/vxlan/sys/sys/sleepqueue.h projects/vxlan/sys/sys/sockbuf.h projects/vxlan/sys/sys/syscallsubr.h projects/vxlan/sys/sys/timex.h projects/vxlan/sys/ufs/ffs/ffs_vnops.c projects/vxlan/sys/vm/vm_map.c projects/vxlan/sys/vm/vm_mmap.c projects/vxlan/sys/vm/vm_pageout.c projects/vxlan/sys/vm/vnode_pager.c projects/vxlan/sys/vm/vnode_pager.h projects/vxlan/sys/x86/include/specialreg.h projects/vxlan/sys/x86/x86/intr_machdep.c projects/vxlan/sys/x86/xen/pv.c projects/vxlan/sys/x86/xen/xen_intr.c projects/vxlan/tests/sys/netinet/fibs_test.sh projects/vxlan/tools/build/mk/OptionalObsoleteFiles.inc projects/vxlan/tools/test/dtrace/Makefile projects/vxlan/usr.bin/calendar/calendars/calendar.freebsd projects/vxlan/usr.bin/elfdump/elfdump.1 projects/vxlan/usr.bin/grep/Makefile projects/vxlan/usr.bin/grep/regex/tre-fastmatch.c projects/vxlan/usr.bin/man/man.1 projects/vxlan/usr.bin/mkimg/Makefile projects/vxlan/usr.bin/mkimg/apm.c projects/vxlan/usr.bin/mkimg/bsd.c projects/vxlan/usr.bin/mkimg/ebr.c projects/vxlan/usr.bin/mkimg/gpt.c projects/vxlan/usr.bin/mkimg/mbr.c projects/vxlan/usr.bin/mkimg/mkimg.1 projects/vxlan/usr.bin/mkimg/mkimg.c projects/vxlan/usr.bin/mkimg/mkimg.h projects/vxlan/usr.bin/mkimg/pc98.c projects/vxlan/usr.bin/mkimg/scheme.c projects/vxlan/usr.bin/mkimg/scheme.h projects/vxlan/usr.bin/mkimg/vtoc8.c projects/vxlan/usr.bin/xinstall/xinstall.c projects/vxlan/usr.sbin/autofs/common.c projects/vxlan/usr.sbin/bhyve/bhyve.8 projects/vxlan/usr.sbin/bhyve/bhyverun.c projects/vxlan/usr.sbin/bhyve/smbiostbl.c projects/vxlan/usr.sbin/bhyve/xmsr.c projects/vxlan/usr.sbin/bhyve/xmsr.h projects/vxlan/usr.sbin/bhyvectl/bhyvectl.c projects/vxlan/usr.sbin/bsdinstall/scripts/services projects/vxlan/usr.sbin/ctld/ctld.c projects/vxlan/usr.sbin/lpr/lpd/printjob.c projects/vxlan/usr.sbin/makefs/ffs.c projects/vxlan/usr.sbin/mfiutil/mfi_properties.c projects/vxlan/usr.sbin/mtree/Makefile projects/vxlan/usr.sbin/newsyslog/newsyslog.8 Directory Properties: projects/vxlan/ (props changed) projects/vxlan/cddl/ (props changed) projects/vxlan/cddl/contrib/opensolaris/ (props changed) projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/vxlan/contrib/apr-util/ (props changed) projects/vxlan/contrib/atf/ (props changed) projects/vxlan/contrib/ipfilter/ (props changed) projects/vxlan/contrib/llvm/ (props changed) projects/vxlan/contrib/one-true-awk/ (props changed) projects/vxlan/contrib/openpam/ (props changed) projects/vxlan/contrib/openpam/bin/Makefile.am (props changed) projects/vxlan/contrib/openpam/bin/su/Makefile.am (props changed) projects/vxlan/contrib/openpam/bin/su/su.c (props changed) projects/vxlan/contrib/openpam/compile (props changed) projects/vxlan/contrib/openpam/config.guess (props changed) projects/vxlan/contrib/openpam/config.sub (props changed) projects/vxlan/contrib/openpam/depcomp (props changed) projects/vxlan/contrib/openpam/doc/Makefile.am (props changed) projects/vxlan/contrib/openpam/doc/man/Makefile.am (props changed) projects/vxlan/contrib/openpam/doc/man/openpam.man (props changed) projects/vxlan/contrib/openpam/doc/man/pam.man (props changed) projects/vxlan/contrib/openpam/include/Makefile.am (props changed) projects/vxlan/contrib/openpam/include/security/Makefile.am (props changed) projects/vxlan/contrib/openpam/include/security/openpam.h (props changed) projects/vxlan/contrib/openpam/include/security/openpam_attr.h (props changed) projects/vxlan/contrib/openpam/include/security/pam_appl.h (props changed) projects/vxlan/contrib/openpam/include/security/pam_constants.h (props changed) projects/vxlan/contrib/openpam/include/security/pam_modules.h (props changed) projects/vxlan/contrib/openpam/include/security/pam_types.h (props changed) projects/vxlan/contrib/openpam/install-sh (props changed) projects/vxlan/contrib/openpam/misc/gendoc.pl (props changed) projects/vxlan/contrib/openpam/missing (props changed) projects/vxlan/contrib/openpam/modules/Makefile.am (props changed) projects/vxlan/contrib/openpam/modules/pam_deny/Makefile.am (props changed) projects/vxlan/contrib/openpam/modules/pam_deny/pam_deny.c (props changed) projects/vxlan/contrib/openpam/modules/pam_permit/Makefile.am (props changed) projects/vxlan/contrib/openpam/modules/pam_permit/pam_permit.c (props changed) projects/vxlan/contrib/openpam/modules/pam_unix/Makefile.am (props changed) projects/vxlan/contrib/openpam/modules/pam_unix/pam_unix.c (props changed) projects/vxlan/etc/ (props changed) projects/vxlan/include/ (props changed) projects/vxlan/lib/libc/ (props changed) projects/vxlan/sbin/ (props changed) projects/vxlan/share/ (props changed) projects/vxlan/share/man/man4/ (props changed) projects/vxlan/sys/ (props changed) projects/vxlan/sys/amd64/vmm/ (props changed) projects/vxlan/sys/boot/ (props changed) projects/vxlan/sys/cddl/contrib/opensolaris/ (props changed) projects/vxlan/sys/conf/ (props changed) projects/vxlan/sys/contrib/ipfilter/ (props changed) projects/vxlan/sys/dev/hyperv/ (props changed) projects/vxlan/sys/modules/vmm/ (props changed) projects/vxlan/usr.bin/calendar/ (props changed) projects/vxlan/usr.bin/mkimg/ (props changed) projects/vxlan/usr.sbin/bhyve/ (props changed) projects/vxlan/usr.sbin/bhyvectl/ (props changed) Modified: projects/vxlan/Makefile.inc1 ============================================================================== --- projects/vxlan/Makefile.inc1 Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/Makefile.inc1 Sun Sep 28 01:52:04 2014 (r272235) @@ -352,6 +352,7 @@ WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAG .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world +LIB32_OBJTREE= ${OBJTREE}${.CURDIR}/world32 LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 .if ${TARGET_ARCH} == "amd64" @@ -387,7 +388,7 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} .endif # Yes, the flags are redundant. -LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ @@ -611,7 +612,7 @@ build32: cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ + MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor @@ -910,7 +911,7 @@ packageworld: # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: +reinstall: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -925,7 +926,7 @@ reinstall: ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif -redistribute: +redistribute: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" @@ -935,7 +936,7 @@ redistribute: DISTRIBUTION=lib32 .endif -distrib-dirs distribution: +distrib-dirs distribution: .MAKE cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} @@ -1463,7 +1464,7 @@ native-xtools: .MAKE # # hierarchy - ensure that all the needed directories are present # -hierarchy hier: +hierarchy hier: .MAKE cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # Modified: projects/vxlan/ObsoleteFiles.inc ============================================================================== --- projects/vxlan/ObsoleteFiles.inc Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/ObsoleteFiles.inc Sun Sep 28 01:52:04 2014 (r272235) @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed +OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz +OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz +# 20140917: hv_kvpd rc.d script removed in favor of devd configuration +OLD_FILES+=etc/rc.d/hv_kvpd # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 Modified: projects/vxlan/UPDATING ============================================================================== --- projects/vxlan/UPDATING Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/UPDATING Sun Sep 28 01:52:04 2014 (r272235) @@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140923: + pjdfstest has been moved from tools/regression/pjdfstest to + contrib/pjdfstest . + +20140922: + At svn r271982, The default linux compat kernel ABI has been adjusted + to 2.6.18 in support of the linux-c6 compat ports infrastructure + update. If you wish to continue using the linux-f10 compat ports, + add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are + encouraged to update their linux-compat packages to linux-c6 during + their next update cycle. + 20140729: The ofwfb driver, used to provide a graphics console on PowerPC when using vt(4), no longer allows mmap() of all of physical memory. This Modified: projects/vxlan/bin/csh/Makefile ============================================================================== --- projects/vxlan/bin/csh/Makefile Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/bin/csh/Makefile Sun Sep 28 01:52:04 2014 (r272235) @@ -94,7 +94,7 @@ GENHDRS+= iconv.h SRCS+= iconv_stub.c iconv.h: ${.CURDIR}/iconv_stub.h - cp ${.CURDIR}/iconv_stub.h ${.TARGET} + cp -f ${.CURDIR}/iconv_stub.h ${.TARGET} .endif .endif Modified: projects/vxlan/bin/sh/sh.1 ============================================================================== --- projects/vxlan/bin/sh/sh.1 Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/bin/sh/sh.1 Sun Sep 28 01:52:04 2014 (r272235) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd September 4, 2014 +.Dd September 21, 2014 .Dt SH 1 .Os .Sh NAME @@ -590,7 +590,8 @@ the following actions: Leading words of the form .Dq Li name=value are stripped off and assigned to the environment of -the simple command. +the simple command +(they do not affect expansions). Redirection operators and their arguments (as described below) are stripped off and saved for processing. Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Sep 28 01:52:04 2014 (r272235) @@ -277,6 +277,19 @@ Generate a header file containing macros specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the +.Fl G +option. +If the +.Fl o +option is present, the header file is saved using the pathname specified as the +argument for that option. +If the +.Fl o +option is not present and the DTrace program is contained within a file whose +name is +.Ar filename.d , +then the header file is saved using the name +.Ar filename.h . .It Fl H Print the pathnames of included files when invoking .Xr cpp 1 @@ -289,20 +302,6 @@ option to each .Xr cpp 1 invocation, causing it to display the list of pathnames, one for each line, to standard error. -.Fl G -option. -If the -.Fl o -option -is present, the header file is saved using the pathname specified as the -argument for that option. -If the -.Fl o -option is not present and the DTrace program is contained with a file whose -name is -.Ar filename.d , -then the header file is saved using the name -.Ar filename.h . .It Fl i Ar probe-id Op Oo Ar predicate Oc Ar action Specify probe identifier .Ar ( probe-id ) Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Sun Sep 28 01:52:04 2014 (r272235) @@ -34,14 +34,14 @@ * leading underscores. */ -#pragma weak _go = go - static int go(int a) { return (a + 1); } +#pragma weak _go = go + static void handle(int sig) { Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -29,6 +29,7 @@ dtrace=$1 t="season_8_mountain_of_madness_t" pid=$$ -rc=`$dtrace -n "BEGIN{ trace(pid$pid`$t)0); }"` +$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" +rc=$? exit $rc Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -30,6 +30,7 @@ dtrace=$1 t="season_8_mountain_of_madness_t" pid=$$ -rc=`$dtrace -n "BEGIN{ trace(pid`$t)0); }"` -p $pid +$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" -p $pid +rc=$? exit $rc Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -31,7 +31,7 @@ dtrace=$1 t="zelda_info_t" exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -25,10 +25,10 @@ if [ $# != 1 ]; then fi dtrace=$1 -t="season_7_lisa_the_vegetrian_t *" +t="season_7_lisa_the_vegetarian_t *" exe="tst.aouttype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 @@ -37,7 +37,8 @@ fi ./$exe & pid=$! -rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"` +$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }" +rc=$? kill -9 $pid Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -29,7 +29,7 @@ dtrace=$1 t="zelda_info_t" exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -29,7 +29,7 @@ dtrace=$1 t="int" exe="tst.libtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -eq 0 ]]; then echo "CTF exists in $exe, that's a bug" >&2 exit 1 @@ -38,7 +38,8 @@ fi ./$exe & pid=$! -rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"` +$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }" +rc=$? kill -9 $pid Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -28,7 +28,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -29,7 +29,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -28,7 +28,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -29,7 +29,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -29,7 +29,7 @@ dtrace=$1 t="zelda_info_t" exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh Sun Sep 28 01:52:04 2014 (r272235) @@ -28,7 +28,7 @@ fi dtrace=$1 exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Sep 28 01:52:04 2014 (r272235) @@ -4524,7 +4524,8 @@ is_root_pool(zpool_handle_t *zhp) } static void -root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) { +root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) +{ if (poolname[0] == '\0' && is_root_pool(zhp)) (void) strlcpy(poolname, zpool_get_name(zhp), size); @@ -4623,7 +4624,7 @@ upgrade_cb(zpool_handle_t *zhp, void *ar #ifdef __FreeBSD__ root_pool_upgrade_check(zhp, cbp->cb_poolname, sizeof(cbp->cb_poolname)); -#endif /* ___FreeBSD__ */ +#endif /* __FreeBSD__ */ printnl = B_TRUE; #ifdef illumos @@ -4647,6 +4648,10 @@ upgrade_cb(zpool_handle_t *zhp, void *ar if (count > 0) { cbp->cb_first = B_FALSE; printnl = B_TRUE; +#ifdef __FreeBSD__ + root_pool_upgrade_check(zhp, cbp->cb_poolname, + sizeof(cbp->cb_poolname)); +#endif /* __FreeBSD__ */ /* * If they did "zpool upgrade -a", then we could * be doing ioctls to different pools. We need @@ -4788,7 +4793,7 @@ upgrade_one(zpool_handle_t *zhp, void *d #ifdef __FreeBSD__ root_pool_upgrade_check(zhp, cbp->cb_poolname, sizeof(cbp->cb_poolname)); -#endif /* ___FreeBSD__ */ +#endif /* __FreeBSD__ */ } if (cbp->cb_version >= SPA_VERSION_FEATURES) { Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Sun Sep 28 01:52:04 2014 (r272235) @@ -653,6 +653,7 @@ get_replication(nvlist_t *nvroot, boolea dontreport = 0; vdev_size = -1ULL; for (c = 0; c < children; c++) { + boolean_t is_replacing, is_spare; nvlist_t *cnv = child[c]; char *path; struct stat64 statbuf; @@ -669,16 +670,19 @@ get_replication(nvlist_t *nvroot, boolea * If this is a replacing or spare vdev, then * get the real first child of the vdev. */ - if (strcmp(childtype, - VDEV_TYPE_REPLACING) == 0 || - strcmp(childtype, VDEV_TYPE_SPARE) == 0) { + is_replacing = strcmp(childtype, + VDEV_TYPE_REPLACING) == 0; + is_spare = strcmp(childtype, + VDEV_TYPE_SPARE) == 0; + if (is_replacing || is_spare) { nvlist_t **rchild; uint_t rchildren; verify(nvlist_lookup_nvlist_array(cnv, ZPOOL_CONFIG_CHILDREN, &rchild, &rchildren) == 0); - assert(rchildren == 2); + assert((is_replacing && rchildren == 2) + || (is_spare && rchildren >= 2)); cnv = rchild[0]; verify(nvlist_lookup_string(cnv, Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c Sun Sep 28 01:52:04 2014 (r272235) @@ -274,7 +274,7 @@ ctf_fdopen(int fd, int *errp) */ if (nbytes >= (ssize_t) sizeof (Elf32_Ehdr) && bcmp(&hdr.e32.e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) { -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN uchar_t order = ELFDATA2MSB; #else uchar_t order = ELFDATA2LSB; Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sun Sep 28 01:52:04 2014 (r272235) @@ -121,12 +121,12 @@ dtrace_dof_init(void) #if !defined(sun) Elf *e; Elf_Scn *scn = NULL; - Elf_Data *symtabdata = NULL, *dynsymdata = NULL, *dofdata = NULL; + Elf_Data *dofdata = NULL; dof_hdr_t *dof_next = NULL; GElf_Shdr shdr; int efd; char *s; - size_t shstridx, symtabidx = 0, dynsymidx = 0; + size_t shstridx; #endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) @@ -166,15 +166,9 @@ dtrace_dof_init(void) dof = NULL; while ((scn = elf_nextscn(e, scn)) != NULL) { gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SYMTAB) { - symtabidx = shdr.sh_link; - symtabdata = elf_getdata(scn, NULL); - } else if (shdr.sh_type == SHT_DYNSYM) { - dynsymidx = shdr.sh_link; - dynsymdata = elf_getdata(scn, NULL); - } else if (shdr.sh_type == SHT_SUNW_dof) { + if (shdr.sh_type == SHT_SUNW_dof) { s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { + if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { dofdata = elf_getdata(scn, NULL); dof = dofdata->d_buf; } Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Sep 28 01:52:04 2014 (r272235) @@ -1819,7 +1819,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to write %s: %s", file, strerror(errno))); } #else - (void)close(fd); if (status != 0) return (dt_link_error(dtp, NULL, -1, NULL, "failed to write %s: %s", tfile, Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c Sun Sep 28 01:52:04 2014 (r272235) @@ -167,7 +167,7 @@ print_bitfield(dt_printarg_t *pap, ulong * to the lowest 'size' bytes in 'value', and we need to shift based on * the offset from the end of the data, not the offset of the start. */ -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN buf += sizeof (value) - size; off += ep->cte_bits; #endif @@ -178,7 +178,7 @@ print_bitfield(dt_printarg_t *pap, ulong * Offsets are counted from opposite ends on little- and * big-endian machines. */ -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN shift = NBBY - shift; #endif Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sun Sep 28 01:52:04 2014 (r272235) @@ -1457,6 +1457,12 @@ zfs_setprop_error(libzfs_handle_t *hdl, (void) zfs_error(hdl, EZFS_DSREADONLY, errbuf); break; + case E2BIG: + zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, + "property value too long")); + (void) zfs_error(hdl, EZFS_BADPROP, errbuf); + break; + case ENOTSUP: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "pool and or dataset must be upgraded to set this " Modified: projects/vxlan/cddl/usr.sbin/Makefile ============================================================================== --- projects/vxlan/cddl/usr.sbin/Makefile Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/cddl/usr.sbin/Makefile Sun Sep 28 01:52:04 2014 (r272235) @@ -5,6 +5,7 @@ SUBDIR= ${_dtrace} \ ${_dtruss} \ ${_lockstat} \ + ${_plockstat} \ ${_tests} \ ${_zdb} \ ${_zhack} @@ -24,6 +25,9 @@ _zhack= zhack _dtrace= dtrace _dtruss= dtruss _lockstat= lockstat +.if defined(WITH_PLOCKSTAT) +_plockstat= plockstat +.endif .endif .if ${MACHINE_CPUARCH} == "mips" Modified: projects/vxlan/contrib/apr-util/CHANGES ============================================================================== --- projects/vxlan/contrib/apr-util/CHANGES Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/CHANGES Sun Sep 28 01:52:04 2014 (r272235) @@ -1,4 +1,30 @@ -*- coding: utf-8 -*- +Changes with APR-util 1.5.4 + + *) MySQL driver: Fix incorrect handling of bad parameter in the + driver support for apr_dbd_transaction_end(). PR 56330. + [Weiqiang Li <weiqiang_li hotmail.com>] + + *) apr_crypto_get_driver(): Fix invalid storage reference on error path. + [Philip Martin <philip.martin wandisco.com>] + + *) Fix compile failure for Android. PR 56627. [Fredrik Fornwall + <fredrik fornwall.net>, Jeff Trawick] + + *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t + [Tom Donovan] + + *) Windows cmake build: Fix incompatiblities with Visual Studio + generators with all cmake versions, and the NMake Makefile generator + with cmake 2.8.12 and later. PR 56616 and other bugs. [Jeff Trawick, + Bert Huijben] + + *) Fix detection of Berkeley DB 6.0. PR 55277. + [Lars Wendler <polynomial-c gentoo.org>] + + *) Improve platform detection for bundled expat by updating + config.guess and config.sub. [Rainer Jung] + Changes with APR-util 1.5.3 *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587. Modified: projects/vxlan/contrib/apr-util/NOTICE ============================================================================== --- projects/vxlan/contrib/apr-util/NOTICE Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/NOTICE Sun Sep 28 01:52:04 2014 (r272235) @@ -1,7 +1,7 @@ Apache Portable Runtime Utility Library -Copyright (c) 2011 The Apache Software Foundation. +Copyright (c) 2000-2014 The Apache Software Foundation. -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Portions of this software were developed at the National Center Modified: projects/vxlan/contrib/apr-util/apr-util.spec ============================================================================== --- projects/vxlan/contrib/apr-util/apr-util.spec Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/apr-util.spec Sun Sep 28 01:52:04 2014 (r272235) @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.5.3 +Version: 1.5.4 Release: 1 License: Apache Software License Group: System Environment/Libraries Modified: projects/vxlan/contrib/apr-util/configure ============================================================================== --- projects/vxlan/contrib/apr-util/configure Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/configure Sun Sep 28 01:52:04 2014 (r272235) @@ -11608,19 +11608,34 @@ fi apu_db_version=0 # Maximum supported version announced in help string. - # Although we search for all versions up to 5.9, + # Although we search for all versions up to 6.9, # we should only include existing versions in our # help string. - db_max_version=53 - db_min_version=41 dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" + db_max_version=48 + db_min_version=41 + db_version="$db_min_version" + while [ $db_version -le $db_max_version ] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done + db_max_version=53 + db_min_version=50 + db_version="$db_min_version" + while [ $db_version -le $db_max_version ] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done + db_max_version=60 + db_min_version=60 db_version="$db_min_version" while [ $db_version -le $db_max_version ] do dbm_list="$dbm_list, db$db_version" db_version=`expr $db_version + 1` done - dbm_list="$dbm_list, db60" # Check whether --with-dbm was given. @@ -12093,8 +12108,8 @@ if test "${with_berkeley_db+set}" = set; all_places="$check_places" - # Start version search at version 5.9 - db_version=59 + # Start version search at version 6.9 + db_version=69 while [ $db_version -ge 40 ] do db_major=`echo $db_version | sed -e 's/.$//'` @@ -12178,7 +12193,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then + if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -12580,7 +12595,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "3" = "3" -o "3" = "4" -o "3" = "5"; then + if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -12978,7 +12993,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "2" = "3" -o "2" = "4" -o "2" = "5"; then + if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -13376,7 +13391,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -13774,7 +13789,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -14186,7 +14201,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -14587,7 +14602,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -14988,7 +15003,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "2" = "3" -o "2" = "4" -o "2" = "5"; then + if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -15389,7 +15404,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "3" = "3" -o "3" = "4" -o "3" = "5"; then + if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -15794,7 +15809,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then + if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -16202,7 +16217,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then + if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -16534,8 +16549,8 @@ fi all_places="$check_places" - # Start version search at version 5.9 - db_version=59 + # Start version search at version 6.9 + db_version=69 while [ $db_version -ge 40 ] do db_major=`echo $db_version | sed -e 's/.$//'` @@ -16619,7 +16634,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then + if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -17021,7 +17036,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "3" = "3" -o "3" = "4" -o "3" = "5"; then + if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -17419,7 +17434,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "2" = "3" -o "2" = "4" -o "2" = "5"; then + if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -17817,7 +17832,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -18215,7 +18230,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of Modified: projects/vxlan/contrib/apr-util/crypto/apr_crypto.c ============================================================================== --- projects/vxlan/contrib/apr-util/crypto/apr_crypto.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/crypto/apr_crypto.c Sun Sep 28 01:52:04 2014 (r272235) @@ -204,7 +204,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get if (err && buffer) { apr_dso_error(dso, buffer, ERROR_SIZE - 1); err->msg = buffer; - err->reason = modname; + err->reason = apr_pstrdup(pool, modname); *result = err; } } Modified: projects/vxlan/contrib/apr-util/crypto/apr_passwd.c ============================================================================== --- projects/vxlan/contrib/apr-util/crypto/apr_passwd.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/crypto/apr_passwd.c Sun Sep 28 01:52:04 2014 (r272235) @@ -66,6 +66,12 @@ static void crypt_mutex_unlock(void) #endif #endif +#if defined(WIN32) || defined(BEOS) || defined(NETWARE) || defined(__ANDROID__) +#define CRYPT_MISSING 1 +#else +#define CRYPT_MISSING 0 +#endif + /* * Validate a plaintext password against a smashed one. Uses either * crypt() (if available) or apr_md5_encode() or apr_sha1_base64(), depending @@ -77,7 +83,7 @@ APU_DECLARE(apr_status_t) apr_password_v const char *hash) { char sample[200]; -#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) +#if !CRYPT_MISSING char *crypt_pw; #endif if (hash[0] == '$' @@ -100,7 +106,7 @@ APU_DECLARE(apr_status_t) apr_password_v /* * It's not our algorithm, so feed it to crypt() if possible. */ -#if defined(WIN32) || defined(BEOS) || defined(NETWARE) +#if CRYPT_MISSING return (strcmp(passwd, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH; #elif defined(CRYPT_R_CRYPTD) apr_status_t rv; Modified: projects/vxlan/contrib/apr-util/dbd/apr_dbd_mysql.c ============================================================================== --- projects/vxlan/contrib/apr-util/dbd/apr_dbd_mysql.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/dbd/apr_dbd_mysql.c Sun Sep 28 01:52:04 2014 (r272235) @@ -1050,9 +1050,9 @@ static int dbd_mysql_end_transaction(apr else { ret = mysql_commit(trans->handle->conn); } + ret |= mysql_autocommit(trans->handle->conn, 1); + trans->handle->trans = NULL; } - ret |= mysql_autocommit(trans->handle->conn, 1); - trans->handle->trans = NULL; return ret; } /* Whether or not transactions work depends on whether the Modified: projects/vxlan/contrib/apr-util/dbd/apr_dbd_odbc.c ============================================================================== --- projects/vxlan/contrib/apr-util/dbd/apr_dbd_odbc.c Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/dbd/apr_dbd_odbc.c Sun Sep 28 01:52:04 2014 (r272235) @@ -47,6 +47,21 @@ #include <odbc/sqlext.h> #endif +/* +* MSVC6 does not support intptr_t (C99) +* APR does not have a signed inptr type until 2.0 (r1557720) +*/ +#if defined(_MSC_VER) && _MSC_VER < 1400 +#if APR_SIZEOF_VOIDP == 8 +#define ODBC_INTPTR_T apr_int64_t +#else +#define ODBC_INTPTR_T apr_int32_t +#endif +#else +#define ODBC_INTPTR_T intptr_t +#endif + + /* Driver name is "odbc" and the entry point is 'apr_dbd_odbc_driver' * unless ODBC_DRIVER_NAME is defined and it is linked with another db library which * is ODBC source-compatible. e.g. DB2, Informix, TimesTen, mysql. @@ -114,9 +129,9 @@ struct apr_dbd_t char lastError[MAX_ERROR_STRING]; int defaultBufferSize; /* used for CLOBs in text mode, * and when fld size is indeterminate */ - intptr_t transaction_mode; - intptr_t dboptions; /* driver options re SQLGetData */ - intptr_t default_transaction_mode; + ODBC_INTPTR_T transaction_mode; + ODBC_INTPTR_T dboptions; /* driver options re SQLGetData */ + ODBC_INTPTR_T default_transaction_mode; int can_commit; /* controls end_trans behavior */ }; @@ -359,7 +374,7 @@ static SQLRETURN odbc_set_result_column( SQLHANDLE stmt) { SQLRETURN rc; - intptr_t maxsize, textsize, realsize, type, isunsigned = 1; + ODBC_INTPTR_T maxsize, textsize, realsize, type, isunsigned = 1; /* discover the sql type */ rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL, @@ -747,7 +762,7 @@ static void *odbc_get(const apr_dbd_row_ SQLRETURN rc; SQLLEN indicator; int state = row->res->colstate[col]; - intptr_t options = row->res->apr_dbd->dboptions; + ODBC_INTPTR_T options = row->res->apr_dbd->dboptions; switch (state) { case (COL_UNAVAIL): @@ -817,13 +832,13 @@ static apr_status_t odbc_parse_params(ap int *connect, SQLCHAR **datasource, SQLCHAR **user, SQLCHAR **password, int *defaultBufferSize, int *nattrs, - int **attrs, intptr_t **attrvals) + int **attrs, ODBC_INTPTR_T **attrvals) { char *seps, *last, *next, *name[MAX_PARAMS], *val[MAX_PARAMS]; int nparams = 0, i, j; *attrs = apr_pcalloc(pool, MAX_PARAMS * sizeof(char *)); - *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(intptr_t)); + *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(ODBC_INTPTR_T)); *nattrs = 0; seps = DEFAULTSEPS; name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last); @@ -1063,7 +1078,7 @@ static apr_dbd_t *odbc_open(apr_pool_t * SQLCHAR *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"", *password = (SQLCHAR *)""; int nattrs = 0, *attrs = NULL, connect = 0; - intptr_t *attrvals = NULL; + ODBC_INTPTR_T *attrvals = NULL; err_step = "SQLAllocHandle (SQL_HANDLE_DBC)"; err_htype = SQL_HANDLE_ENV; @@ -1117,10 +1132,10 @@ static apr_dbd_t *odbc_open(apr_pool_t * handle->default_transaction_mode = 0; handle->can_commit = APR_DBD_TRANSACTION_IGNORE_ERRORS; SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, - &(handle->default_transaction_mode), sizeof(intptr_t), NULL); + &(handle->default_transaction_mode), sizeof(ODBC_INTPTR_T), NULL); handle->transaction_mode = handle->default_transaction_mode; SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions), - sizeof(intptr_t), NULL); + sizeof(ODBC_INTPTR_T), NULL); apr_pool_cleanup_register(pool, handle, odbc_close_cleanup, apr_pool_cleanup_null); return handle; } Modified: projects/vxlan/contrib/apr-util/dbm/NWGNUmakefile ============================================================================== --- projects/vxlan/contrib/apr-util/dbm/NWGNUmakefile Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/dbm/NWGNUmakefile Sun Sep 28 01:52:04 2014 (r272235) @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms $(INSTDIRS) FORCE - copy $(OBJDIR)\*.nlm $(INSTALLBASE) + $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE)) # # Any specialized rules here Modified: projects/vxlan/contrib/apr-util/include/apu_version.h ============================================================================== --- projects/vxlan/contrib/apr-util/include/apu_version.h Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/include/apu_version.h Sun Sep 28 01:52:04 2014 (r272235) @@ -38,7 +38,7 @@ */ -#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \ +#define APU_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \ "Foundation or its licensors, as applicable." /* The numeric compile-time version constants. These constants are the @@ -62,7 +62,7 @@ * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APU_PATCH_VERSION 3 +#define APU_PATCH_VERSION 4 /** * The symbol APU_IS_DEV_VERSION is only defined for internal, Modified: projects/vxlan/contrib/apr-util/test/Makefile.win ============================================================================== --- projects/vxlan/contrib/apr-util/test/Makefile.win Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/apr-util/test/Makefile.win Sun Sep 28 01:52:04 2014 (r272235) @@ -88,6 +88,8 @@ APROUTDIR=$(OUTDIR) !IF "$(MODEL)" == "static" PROGRAM_DEPENDENCIES = \ $(APR_PATH)\$(APROUTDIR)\apr-1.lib \ + $(API_PATH)\$(OUTDIR)\apriconv-1.lib \ + ..\xml\expat\lib\$(OUTDIR)\xml.lib \ ..\$(OUTDIR)\aprutil-1.lib STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib Modified: projects/vxlan/contrib/atf/FREEBSD-upgrade ============================================================================== --- projects/vxlan/contrib/atf/FREEBSD-upgrade Sun Sep 28 01:45:20 2014 (r272234) +++ projects/vxlan/contrib/atf/FREEBSD-upgrade Sun Sep 28 01:52:04 2014 (r272235) @@ -7,10 +7,9 @@ branches and you are supposed to follow http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html -The ATF source code is hosted on Google Code as a subcomponent of the -Kyua project: +The ATF source code is hosted on GitHub: *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409280152.s8S1q7b3013773>