Date: Fri, 28 Aug 2015 06:07:32 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r287246 - in projects/routing: . bin/df bin/ls bin/ps bin/rm bin/sh bin/sh/tests/builtins bin/sh/tests/errors cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib contrib/libxo contrib/libxo... Message-ID: <201508280607.t7S67W1h085056@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: melifaro Date: Fri Aug 28 06:07:30 2015 New Revision: 287246 URL: https://svnweb.freebsd.org/changeset/base/287246 Log: Sync to HEAD@r287236 Added: projects/routing/bin/sh/tests/builtins/case20.0 - copied unchanged from r287244, head/bin/sh/tests/builtins/case20.0 projects/routing/bin/sh/tests/errors/bad-parm-exp7.0 - copied unchanged from r287244, head/bin/sh/tests/errors/bad-parm-exp7.0 projects/routing/bin/sh/tests/errors/bad-parm-exp8.0 - copied unchanged from r287244, head/bin/sh/tests/errors/bad-parm-exp8.0 projects/routing/contrib/libxo/INSTALL.md - copied unchanged from r287244, head/contrib/libxo/INSTALL.md projects/routing/contrib/libxo/encoder/ - copied from r287244, head/contrib/libxo/encoder/ projects/routing/contrib/libxo/libxo/add.man - copied unchanged from r287244, head/contrib/libxo/libxo/add.man projects/routing/contrib/libxo/libxo/add.man.in - copied unchanged from r287244, head/contrib/libxo/libxo/add.man.in projects/routing/contrib/libxo/libxo/xo_buf.h - copied unchanged from r287244, head/contrib/libxo/libxo/xo_buf.h projects/routing/contrib/libxo/libxo/xo_config.h - copied unchanged from r287244, head/contrib/libxo/libxo/xo_config.h projects/routing/contrib/libxo/libxo/xo_emit_err.3 - copied unchanged from r287244, head/contrib/libxo/libxo/xo_emit_err.3 projects/routing/contrib/libxo/libxo/xo_encoder.c - copied unchanged from r287244, head/contrib/libxo/libxo/xo_encoder.c projects/routing/contrib/libxo/libxo/xo_encoder.h - copied unchanged from r287244, head/contrib/libxo/libxo/xo_encoder.h projects/routing/contrib/libxo/libxo/xo_humanize.h - copied unchanged from r287244, head/contrib/libxo/libxo/xo_humanize.h projects/routing/contrib/libxo/libxo/xo_message.3 - copied unchanged from r287244, head/contrib/libxo/libxo/xo_message.3 projects/routing/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 - copied unchanged from r287244, head/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 projects/routing/contrib/libxo/libxo/xo_syslog.3 - copied unchanged from r287244, head/contrib/libxo/libxo/xo_syslog.3 projects/routing/contrib/libxo/libxo/xo_syslog.c - copied unchanged from r287244, head/contrib/libxo/libxo/xo_syslog.c projects/routing/contrib/libxo/libxo/xo_wcwidth.h - copied unchanged from r287244, head/contrib/libxo/libxo/xo_wcwidth.h projects/routing/contrib/libxo/tests/core/saved/test_01.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_01.E.err projects/routing/contrib/libxo/tests/core/saved/test_01.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_01.E.out projects/routing/contrib/libxo/tests/core/saved/test_02.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_02.E.err projects/routing/contrib/libxo/tests/core/saved/test_02.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_02.E.out projects/routing/contrib/libxo/tests/core/saved/test_03.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_03.E.err projects/routing/contrib/libxo/tests/core/saved/test_03.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_03.E.out projects/routing/contrib/libxo/tests/core/saved/test_04.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_04.E.err projects/routing/contrib/libxo/tests/core/saved/test_04.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_04.E.out projects/routing/contrib/libxo/tests/core/saved/test_05.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_05.E.err projects/routing/contrib/libxo/tests/core/saved/test_05.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_05.E.out projects/routing/contrib/libxo/tests/core/saved/test_06.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_06.E.err projects/routing/contrib/libxo/tests/core/saved/test_06.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_06.E.out projects/routing/contrib/libxo/tests/core/saved/test_07.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_07.E.err projects/routing/contrib/libxo/tests/core/saved/test_07.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_07.E.out projects/routing/contrib/libxo/tests/core/saved/test_08.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_08.E.err projects/routing/contrib/libxo/tests/core/saved/test_08.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_08.E.out projects/routing/contrib/libxo/tests/core/saved/test_09.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_09.E.err projects/routing/contrib/libxo/tests/core/saved/test_09.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_09.E.out projects/routing/contrib/libxo/tests/core/saved/test_10.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_10.E.err projects/routing/contrib/libxo/tests/core/saved/test_10.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_10.E.out projects/routing/contrib/libxo/tests/core/saved/test_11.E.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.E.err projects/routing/contrib/libxo/tests/core/saved/test_11.E.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.E.out projects/routing/contrib/libxo/tests/core/saved/test_11.H.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.H.err projects/routing/contrib/libxo/tests/core/saved/test_11.H.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.H.out projects/routing/contrib/libxo/tests/core/saved/test_11.HIPx.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.HIPx.err projects/routing/contrib/libxo/tests/core/saved/test_11.HIPx.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.HIPx.out projects/routing/contrib/libxo/tests/core/saved/test_11.HP.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.HP.err projects/routing/contrib/libxo/tests/core/saved/test_11.HP.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.HP.out projects/routing/contrib/libxo/tests/core/saved/test_11.J.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.J.err projects/routing/contrib/libxo/tests/core/saved/test_11.J.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.J.out projects/routing/contrib/libxo/tests/core/saved/test_11.JP.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.JP.err projects/routing/contrib/libxo/tests/core/saved/test_11.JP.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.JP.out projects/routing/contrib/libxo/tests/core/saved/test_11.T.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.T.err projects/routing/contrib/libxo/tests/core/saved/test_11.T.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.T.out projects/routing/contrib/libxo/tests/core/saved/test_11.X.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.X.err projects/routing/contrib/libxo/tests/core/saved/test_11.X.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.X.out projects/routing/contrib/libxo/tests/core/saved/test_11.XP.err - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.XP.err projects/routing/contrib/libxo/tests/core/saved/test_11.XP.out - copied unchanged from r287244, head/contrib/libxo/tests/core/saved/test_11.XP.out projects/routing/contrib/libxo/tests/core/test_11.c - copied unchanged from r287244, head/contrib/libxo/tests/core/test_11.c projects/routing/contrib/libxo/tests/gettext/ - copied from r287244, head/contrib/libxo/tests/gettext/ projects/routing/contrib/libxo/xopo/ - copied from r287244, head/contrib/libxo/xopo/ projects/routing/share/man/man4/ioat.4 - copied unchanged from r287244, head/share/man/man4/ioat.4 projects/routing/share/man/man4/ow.4 - copied unchanged from r287244, head/share/man/man4/ow.4 projects/routing/share/man/man4/ow_temp.4 - copied unchanged from r287244, head/share/man/man4/ow_temp.4 projects/routing/share/man/man4/owc.4 - copied unchanged from r287244, head/share/man/man4/owc.4 projects/routing/share/man/man9/owll.9 - copied unchanged from r287244, head/share/man/man9/owll.9 projects/routing/share/man/man9/own.9 - copied unchanged from r287244, head/share/man/man9/own.9 projects/routing/share/mk/bsd.stand.mk - copied unchanged from r287244, head/share/mk/bsd.stand.mk projects/routing/sys/dev/ioat/ - copied from r287244, head/sys/dev/ioat/ projects/routing/sys/dev/ow/ - copied from r287244, head/sys/dev/ow/ projects/routing/sys/modules/ioat/ - copied from r287244, head/sys/modules/ioat/ projects/routing/sys/modules/ow/ - copied from r287244, head/sys/modules/ow/ projects/routing/tools/tools/ioat/ - copied from r287244, head/tools/tools/ioat/ projects/routing/usr.sbin/ypserv/common/ - copied from r287244, head/usr.sbin/ypserv/common/ Deleted: projects/routing/contrib/libxo/libxo/xoconfig.h projects/routing/contrib/libxo/libxo/xoconfig.h.in projects/routing/contrib/libxo/libxo/xoversion.h projects/routing/contrib/libxo/libxo/xoversion.h.in Modified: projects/routing/Makefile.inc1 projects/routing/ObsoleteFiles.inc projects/routing/UPDATING projects/routing/bin/df/df.c projects/routing/bin/ls/Makefile projects/routing/bin/ps/Makefile projects/routing/bin/rm/rm.c projects/routing/bin/sh/expand.c projects/routing/bin/sh/parser.c projects/routing/bin/sh/tests/builtins/Makefile projects/routing/bin/sh/tests/errors/Makefile projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/routing/cddl/lib/Makefile projects/routing/contrib/libxo/.gitignore projects/routing/contrib/libxo/.travis.yml projects/routing/contrib/libxo/Makefile.am projects/routing/contrib/libxo/bin/Zaliases projects/routing/contrib/libxo/bin/setup.sh projects/routing/contrib/libxo/configure.ac projects/routing/contrib/libxo/doc/Makefile.am projects/routing/contrib/libxo/doc/libxo.txt projects/routing/contrib/libxo/libxo/Makefile.am projects/routing/contrib/libxo/libxo/libxo.3 projects/routing/contrib/libxo/libxo/libxo.c projects/routing/contrib/libxo/libxo/xo.h projects/routing/contrib/libxo/libxo/xo_attr.3 projects/routing/contrib/libxo/libxo/xo_create.3 projects/routing/contrib/libxo/libxo/xo_emit.3 projects/routing/contrib/libxo/libxo/xo_err.3 projects/routing/contrib/libxo/libxo/xo_error.3 projects/routing/contrib/libxo/libxo/xo_finish.3 projects/routing/contrib/libxo/libxo/xo_flush.3 projects/routing/contrib/libxo/libxo/xo_format.5 projects/routing/contrib/libxo/libxo/xo_no_setlocale.3 projects/routing/contrib/libxo/libxo/xo_open_container.3 projects/routing/contrib/libxo/libxo/xo_open_list.3 projects/routing/contrib/libxo/libxo/xo_open_marker.3 projects/routing/contrib/libxo/libxo/xo_parse_args.3 projects/routing/contrib/libxo/libxo/xo_set_allocator.3 projects/routing/contrib/libxo/libxo/xo_set_flags.3 projects/routing/contrib/libxo/libxo/xo_set_info.3 projects/routing/contrib/libxo/libxo/xo_set_options.3 projects/routing/contrib/libxo/libxo/xo_set_style.3 projects/routing/contrib/libxo/libxo/xo_set_version.3 projects/routing/contrib/libxo/libxo/xo_set_writer.3 projects/routing/contrib/libxo/tests/Makefile.am projects/routing/contrib/libxo/tests/core/Makefile.am projects/routing/contrib/libxo/tests/core/saved/test_01.H.out projects/routing/contrib/libxo/tests/core/saved/test_01.HIPx.out projects/routing/contrib/libxo/tests/core/saved/test_01.HP.out projects/routing/contrib/libxo/tests/core/saved/test_01.J.out projects/routing/contrib/libxo/tests/core/saved/test_01.JP.out projects/routing/contrib/libxo/tests/core/saved/test_01.T.out projects/routing/contrib/libxo/tests/core/saved/test_01.X.out projects/routing/contrib/libxo/tests/core/saved/test_01.XP.out projects/routing/contrib/libxo/tests/core/saved/test_02.H.out projects/routing/contrib/libxo/tests/core/saved/test_02.HIPx.out projects/routing/contrib/libxo/tests/core/saved/test_02.HP.out projects/routing/contrib/libxo/tests/core/saved/test_02.J.out projects/routing/contrib/libxo/tests/core/saved/test_02.JP.out projects/routing/contrib/libxo/tests/core/saved/test_02.T.out projects/routing/contrib/libxo/tests/core/saved/test_02.X.out projects/routing/contrib/libxo/tests/core/saved/test_02.XP.out projects/routing/contrib/libxo/tests/core/saved/test_05.H.out projects/routing/contrib/libxo/tests/core/saved/test_05.HIPx.out projects/routing/contrib/libxo/tests/core/saved/test_05.HP.out projects/routing/contrib/libxo/tests/core/saved/test_05.J.out projects/routing/contrib/libxo/tests/core/saved/test_05.JP.out (contents, props changed) projects/routing/contrib/libxo/tests/core/saved/test_05.T.out projects/routing/contrib/libxo/tests/core/saved/test_05.X.out (contents, props changed) projects/routing/contrib/libxo/tests/core/saved/test_05.XP.out (contents, props changed) projects/routing/contrib/libxo/tests/core/saved/test_08.H.err projects/routing/contrib/libxo/tests/core/saved/test_08.HIPx.err projects/routing/contrib/libxo/tests/core/saved/test_08.HIPx.out projects/routing/contrib/libxo/tests/core/saved/test_08.HP.err projects/routing/contrib/libxo/tests/core/saved/test_08.J.err projects/routing/contrib/libxo/tests/core/saved/test_08.J.out projects/routing/contrib/libxo/tests/core/saved/test_08.JP.err projects/routing/contrib/libxo/tests/core/saved/test_08.JP.out projects/routing/contrib/libxo/tests/core/saved/test_08.T.err projects/routing/contrib/libxo/tests/core/saved/test_08.X.err projects/routing/contrib/libxo/tests/core/saved/test_08.X.out projects/routing/contrib/libxo/tests/core/saved/test_08.XP.err projects/routing/contrib/libxo/tests/core/saved/test_08.XP.out projects/routing/contrib/libxo/tests/core/test_01.c projects/routing/contrib/libxo/tests/core/test_02.c projects/routing/contrib/libxo/tests/core/test_05.c projects/routing/contrib/libxo/tests/core/test_08.c projects/routing/contrib/libxo/xo/Makefile.am projects/routing/contrib/libxo/xo/xo.1 projects/routing/contrib/libxo/xo/xo.c projects/routing/contrib/libxo/xohtml/Makefile.am projects/routing/contrib/libxo/xohtml/xohtml.1 projects/routing/contrib/libxo/xolint/Makefile.am projects/routing/contrib/libxo/xolint/xolint.1 projects/routing/contrib/libxo/xolint/xolint.pl projects/routing/contrib/ncurses/ncurses/base/MKlib_gen.sh projects/routing/crypto/openssh/monitor.c projects/routing/crypto/openssh/monitor_wrap.c projects/routing/crypto/openssh/mux.c projects/routing/etc/mtree/BSD.usr.dist projects/routing/etc/network.subr projects/routing/etc/rc.d/jail projects/routing/etc/rc.d/netif projects/routing/gnu/usr.bin/binutils/Makefile projects/routing/kerberos5/Makefile.inc projects/routing/kerberos5/lib/libhdb/Makefile projects/routing/kerberos5/libexec/digest-service/Makefile projects/routing/kerberos5/libexec/kdc/Makefile projects/routing/kerberos5/usr.bin/kpasswd/Makefile projects/routing/kerberos5/usr.sbin/iprop-log/Makefile projects/routing/lib/libc/locale/utf8.c projects/routing/lib/libc/posix1e/acl_flag.c projects/routing/lib/libc/string/bcopy.3 projects/routing/lib/libc/string/bzero.3 projects/routing/lib/libc/string/strndup.c projects/routing/lib/libproc/proc_bkpt.c projects/routing/lib/libstand/Makefile projects/routing/lib/libxo/Makefile projects/routing/libexec/ftpd/Makefile projects/routing/sbin/ipfw/ipfw2.c projects/routing/sbin/ipfw/nat.c projects/routing/sbin/ipfw/tables.c projects/routing/sbin/newfs/newfs.c projects/routing/sbin/pfctl/parse.y projects/routing/sbin/pfctl/pfctl_parser.c projects/routing/sbin/savecore/Makefile projects/routing/share/man/man4/Makefile projects/routing/share/man/man4/rights.4 projects/routing/share/man/man5/pf.conf.5 projects/routing/share/man/man9/Makefile projects/routing/share/man/man9/nv.9 projects/routing/share/mk/bsd.README projects/routing/share/mk/bsd.cpu.mk projects/routing/share/mk/bsd.files.mk projects/routing/share/mk/bsd.own.mk projects/routing/share/mk/bsd.subdir.mk projects/routing/share/mk/sys.mk projects/routing/sys/amd64/amd64/exception.S projects/routing/sys/amd64/conf/NOTES projects/routing/sys/arm/arm/locore-v6.S projects/routing/sys/arm/conf/BEAGLEBONE projects/routing/sys/arm/conf/std.armv6 projects/routing/sys/arm64/arm64/db_interface.c projects/routing/sys/arm64/arm64/gic_v3_its.c projects/routing/sys/arm64/arm64/pmap.c projects/routing/sys/arm64/arm64/support.S projects/routing/sys/arm64/arm64/trap.c projects/routing/sys/arm64/arm64/unwind.c projects/routing/sys/arm64/conf/GENERIC projects/routing/sys/boot/efi/Makefile.inc projects/routing/sys/boot/ficl/Makefile projects/routing/sys/boot/i386/Makefile.inc projects/routing/sys/boot/libstand32/Makefile projects/routing/sys/boot/pc98/Makefile.inc projects/routing/sys/boot/userboot/ficl/Makefile projects/routing/sys/boot/userboot/libstand/Makefile projects/routing/sys/boot/zfs/Makefile projects/routing/sys/cam/ctl/ctl_backend_block.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/routing/sys/compat/cloudabi/cloudabi_fd.c projects/routing/sys/conf/files projects/routing/sys/conf/files.amd64 projects/routing/sys/conf/files.arm64 projects/routing/sys/conf/files.powerpc projects/routing/sys/conf/options.arm64 projects/routing/sys/contrib/dev/acpica/changes.txt projects/routing/sys/contrib/dev/acpica/common/adisasm.c projects/routing/sys/contrib/dev/acpica/common/dmtable.c projects/routing/sys/contrib/dev/acpica/compiler/aslmain.c projects/routing/sys/contrib/dev/acpica/compiler/asloperands.c projects/routing/sys/contrib/dev/acpica/compiler/asloptions.c projects/routing/sys/contrib/dev/acpica/compiler/aslstartup.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbobject.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/routing/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/routing/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/routing/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/routing/sys/contrib/dev/acpica/components/events/evregion.c projects/routing/sys/contrib/dev/acpica/components/executer/exconfig.c projects/routing/sys/contrib/dev/acpica/components/executer/exdump.c projects/routing/sys/contrib/dev/acpica/components/executer/exresnte.c projects/routing/sys/contrib/dev/acpica/components/executer/exresolv.c projects/routing/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/routing/sys/contrib/dev/acpica/components/namespace/nseval.c projects/routing/sys/contrib/dev/acpica/components/namespace/nsload.c projects/routing/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/routing/sys/contrib/dev/acpica/components/parser/psloop.c projects/routing/sys/contrib/dev/acpica/components/resources/rsdump.c projects/routing/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/routing/sys/contrib/dev/acpica/components/tables/tbfind.c projects/routing/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/routing/sys/contrib/dev/acpica/components/tables/tbutils.c projects/routing/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/routing/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/routing/sys/contrib/dev/acpica/components/utilities/utinit.c projects/routing/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/routing/sys/contrib/dev/acpica/components/utilities/utnonansi.c projects/routing/sys/contrib/dev/acpica/components/utilities/utxface.c projects/routing/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/routing/sys/contrib/dev/acpica/include/acbuffer.h projects/routing/sys/contrib/dev/acpica/include/acconfig.h projects/routing/sys/contrib/dev/acpica/include/acdebug.h projects/routing/sys/contrib/dev/acpica/include/acdisasm.h projects/routing/sys/contrib/dev/acpica/include/acexcep.h projects/routing/sys/contrib/dev/acpica/include/acglobal.h projects/routing/sys/contrib/dev/acpica/include/aclocal.h projects/routing/sys/contrib/dev/acpica/include/acpixf.h projects/routing/sys/contrib/dev/acpica/include/actables.h projects/routing/sys/contrib/dev/acpica/include/actypes.h projects/routing/sys/contrib/dev/acpica/include/acutils.h projects/routing/sys/contrib/dev/acpica/include/platform/acenv.h projects/routing/sys/dev/acpica/Osd/OsdDebug.c projects/routing/sys/dev/ath/ath_rate/sample/sample.c projects/routing/sys/dev/ath/ath_rate/sample/sample.h projects/routing/sys/dev/ath/if_ath.c projects/routing/sys/dev/ath/if_ath_beacon.c projects/routing/sys/dev/ath/if_ath_debug.h projects/routing/sys/dev/ath/if_ath_misc.h projects/routing/sys/dev/ath/if_ath_rx.c projects/routing/sys/dev/ath/if_ath_rx_edma.c projects/routing/sys/dev/ath/if_ath_sysctl.c projects/routing/sys/dev/ath/if_ath_tdma.c projects/routing/sys/dev/ath/if_ath_tx.c projects/routing/sys/dev/ath/if_ath_tx_edma.c projects/routing/sys/dev/ath/if_athvar.h projects/routing/sys/dev/bwi/bwimac.c projects/routing/sys/dev/bwi/bwiphy.c projects/routing/sys/dev/bwi/bwirf.c projects/routing/sys/dev/bwi/if_bwi.c projects/routing/sys/dev/bwi/if_bwivar.h projects/routing/sys/dev/bwn/if_bwn.c projects/routing/sys/dev/bwn/if_bwnvar.h projects/routing/sys/dev/drm2/drmP.h projects/routing/sys/dev/drm2/i915/i915_dma.c projects/routing/sys/dev/drm2/i915/i915_drv.c projects/routing/sys/dev/drm2/i915/i915_drv.h projects/routing/sys/dev/drm2/i915/i915_gem.c projects/routing/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/routing/sys/dev/drm2/i915/i915_gem_gtt.c projects/routing/sys/dev/drm2/i915/i915_gem_tiling.c projects/routing/sys/dev/drm2/i915/i915_reg.h projects/routing/sys/dev/drm2/i915/intel_ddi.c projects/routing/sys/dev/drm2/i915/intel_display.c projects/routing/sys/dev/drm2/i915/intel_pm.c projects/routing/sys/dev/e1000/e1000_82541.c projects/routing/sys/dev/e1000/e1000_82541.h projects/routing/sys/dev/e1000/e1000_82542.c projects/routing/sys/dev/e1000/e1000_82543.c projects/routing/sys/dev/e1000/e1000_82543.h projects/routing/sys/dev/e1000/e1000_82571.h projects/routing/sys/dev/e1000/e1000_82575.c projects/routing/sys/dev/e1000/e1000_api.h projects/routing/sys/dev/e1000/e1000_hw.h projects/routing/sys/dev/e1000/e1000_ich8lan.c projects/routing/sys/dev/e1000/e1000_manage.c projects/routing/sys/dev/e1000/e1000_phy.c projects/routing/sys/dev/e1000/e1000_regs.h projects/routing/sys/dev/filemon/filemon.c projects/routing/sys/dev/filemon/filemon_lock.c projects/routing/sys/dev/filemon/filemon_wrapper.c projects/routing/sys/dev/hwpmc/hwpmc_mod.c projects/routing/sys/dev/if_ndis/if_ndis.c projects/routing/sys/dev/if_ndis/if_ndisvar.h projects/routing/sys/dev/ipw/if_ipw.c projects/routing/sys/dev/ipw/if_ipwvar.h projects/routing/sys/dev/iwi/if_iwi.c projects/routing/sys/dev/iwi/if_iwivar.h projects/routing/sys/dev/iwm/if_iwm.c projects/routing/sys/dev/iwm/if_iwm_mac_ctxt.c projects/routing/sys/dev/iwm/if_iwm_phy_ctxt.c projects/routing/sys/dev/iwm/if_iwm_power.c projects/routing/sys/dev/iwm/if_iwm_scan.c projects/routing/sys/dev/iwm/if_iwmvar.h projects/routing/sys/dev/iwn/if_iwn.c projects/routing/sys/dev/iwn/if_iwnvar.h projects/routing/sys/dev/malo/if_malo.c projects/routing/sys/dev/malo/if_malo.h projects/routing/sys/dev/mmc/host/dwmmc.c projects/routing/sys/dev/mmc/mmc.c projects/routing/sys/dev/msk/if_mskreg.h projects/routing/sys/dev/mwl/if_mwl.c projects/routing/sys/dev/mwl/if_mwl_pci.c projects/routing/sys/dev/mwl/if_mwlvar.h projects/routing/sys/dev/ral/if_ral_pci.c projects/routing/sys/dev/ral/rt2560.c projects/routing/sys/dev/ral/rt2560var.h projects/routing/sys/dev/ral/rt2661.c projects/routing/sys/dev/ral/rt2661var.h projects/routing/sys/dev/ral/rt2860.c projects/routing/sys/dev/ral/rt2860var.h projects/routing/sys/dev/usb/wlan/if_rsu.c projects/routing/sys/dev/usb/wlan/if_rsureg.h projects/routing/sys/dev/usb/wlan/if_rum.c projects/routing/sys/dev/usb/wlan/if_rumvar.h projects/routing/sys/dev/usb/wlan/if_run.c projects/routing/sys/dev/usb/wlan/if_runvar.h projects/routing/sys/dev/usb/wlan/if_uath.c projects/routing/sys/dev/usb/wlan/if_uathvar.h projects/routing/sys/dev/usb/wlan/if_upgt.c projects/routing/sys/dev/usb/wlan/if_upgtvar.h projects/routing/sys/dev/usb/wlan/if_ural.c projects/routing/sys/dev/usb/wlan/if_uralvar.h projects/routing/sys/dev/usb/wlan/if_urtw.c projects/routing/sys/dev/usb/wlan/if_urtwn.c projects/routing/sys/dev/usb/wlan/if_urtwnreg.h projects/routing/sys/dev/usb/wlan/if_urtwvar.h projects/routing/sys/dev/usb/wlan/if_zyd.c projects/routing/sys/dev/usb/wlan/if_zydreg.h projects/routing/sys/dev/wi/if_wi.c projects/routing/sys/dev/wi/if_wi_macio.c projects/routing/sys/dev/wi/if_wi_pccard.c projects/routing/sys/dev/wi/if_wi_pci.c projects/routing/sys/dev/wi/if_wivar.h projects/routing/sys/dev/wpi/if_wpi.c projects/routing/sys/dev/wpi/if_wpivar.h projects/routing/sys/dev/wtap/if_wtap.c projects/routing/sys/dev/wtap/if_wtapvar.h projects/routing/sys/dev/xen/blkback/blkback.c projects/routing/sys/dev/xen/netfront/netfront.c projects/routing/sys/dev/xen/xenstore/xenstore.c projects/routing/sys/fs/devfs/devfs_vfsops.c projects/routing/sys/kern/init_main.c projects/routing/sys/kern/kern_timeout.c projects/routing/sys/kern/sched_ule.c projects/routing/sys/kern/vfs_mount.c projects/routing/sys/kern/vfs_mountroot.c projects/routing/sys/kern/vfs_subr.c projects/routing/sys/kern/vfs_syscalls.c projects/routing/sys/mips/mips/fp.S projects/routing/sys/modules/Makefile projects/routing/sys/net/altq/altq_codel.c projects/routing/sys/net/altq/altq_codel.h projects/routing/sys/net/if_ethersubr.c projects/routing/sys/net/pfvar.h projects/routing/sys/net80211/ieee80211.c projects/routing/sys/net80211/ieee80211_ddb.c projects/routing/sys/net80211/ieee80211_freebsd.c projects/routing/sys/net80211/ieee80211_ioctl.c projects/routing/sys/net80211/ieee80211_output.c projects/routing/sys/net80211/ieee80211_power.c projects/routing/sys/net80211/ieee80211_proto.c projects/routing/sys/net80211/ieee80211_proto.h projects/routing/sys/net80211/ieee80211_regdomain.c projects/routing/sys/net80211/ieee80211_scan_sta.c projects/routing/sys/net80211/ieee80211_var.h projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/tcp_timer.c projects/routing/sys/netinet/tcp_timer.h projects/routing/sys/netinet/udp_usrreq.c projects/routing/sys/netinet/udp_var.h projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6_ifattach.c projects/routing/sys/netinet6/in6_rss.c projects/routing/sys/netinet6/in6_rss.h projects/routing/sys/netinet6/in6_var.h projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/udp6_usrreq.c projects/routing/sys/netpfil/ipfw/ip_fw_private.h projects/routing/sys/netpfil/pf/pf_if.c projects/routing/sys/netpfil/pf/pf_norm.c projects/routing/sys/powerpc/booke/pmap.c projects/routing/sys/powerpc/booke/trap_subr.S projects/routing/sys/powerpc/include/tlb.h projects/routing/sys/powerpc/mpc85xx/fsl_sdhc.c projects/routing/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/routing/sys/powerpc/ofw/ofw_machdep.c projects/routing/sys/powerpc/powerpc/trap.c projects/routing/sys/sys/capsicum.h projects/routing/sys/sys/cdefs.h projects/routing/sys/sys/pcpu.h projects/routing/sys/sys/vnode.h projects/routing/sys/teken/teken_subr.h projects/routing/sys/vm/vm_page.c projects/routing/sys/vm/vm_pageout.c projects/routing/tools/tools/iwn/iwnstats/main.c projects/routing/usr.bin/at/Makefile.inc projects/routing/usr.bin/iscsictl/Makefile projects/routing/usr.bin/netstat/Makefile projects/routing/usr.bin/netstat/netstat.1 projects/routing/usr.bin/procstat/procstat_files.c projects/routing/usr.bin/script/script.1 projects/routing/usr.bin/sockstat/sockstat.1 projects/routing/usr.bin/sockstat/sockstat.c projects/routing/usr.bin/vi/catalog/Makefile projects/routing/usr.bin/w/Makefile projects/routing/usr.bin/wc/Makefile projects/routing/usr.bin/xo/Makefile projects/routing/usr.bin/ypwhich/Makefile projects/routing/usr.bin/ypwhich/ypwhich.c projects/routing/usr.sbin/acpi/acpidb/acpidb.c projects/routing/usr.sbin/config/main.c projects/routing/usr.sbin/ctld/ctl.conf.5 projects/routing/usr.sbin/ndp/ndp.c projects/routing/usr.sbin/pkg/dns_utils.c projects/routing/usr.sbin/syslogd/syslogd.c projects/routing/usr.sbin/ypserv/Makefile Directory Properties: projects/routing/ (props changed) projects/routing/cddl/ (props changed) projects/routing/cddl/contrib/opensolaris/ (props changed) projects/routing/contrib/ncurses/ (props changed) projects/routing/crypto/openssh/ (props changed) projects/routing/etc/ (props changed) projects/routing/gnu/usr.bin/binutils/ (props changed) projects/routing/lib/libc/ (props changed) projects/routing/sbin/ (props changed) projects/routing/sbin/ipfw/ (props changed) projects/routing/share/ (props changed) projects/routing/share/man/man4/ (props changed) projects/routing/sys/ (props changed) projects/routing/sys/boot/ (props changed) projects/routing/sys/cddl/contrib/opensolaris/ (props changed) projects/routing/sys/conf/ (props changed) projects/routing/sys/contrib/dev/acpica/ (props changed) projects/routing/usr.bin/procstat/ (props changed) Modified: projects/routing/Makefile.inc1 ============================================================================== --- projects/routing/Makefile.inc1 Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/Makefile.inc1 Fri Aug 28 06:07:30 2015 (r287246) @@ -449,7 +449,6 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32 PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ - LIBPRIVATEDIR=/usr/lib32/private \ DTRACE="${DTRACE} -32" LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ CXX="${XCXX} ${LIB32FLAGS}" \ @@ -1778,9 +1777,7 @@ cddl/lib/libctf__L: lib/libz__L .endif # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built # on select architectures though (see cddl/lib/Makefile) -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" +.if ${MACHINE_CPUARCH} != "sparc64" _prebuild_libs+= lib/libproc lib/librtld_db .endif Modified: projects/routing/ObsoleteFiles.inc ============================================================================== --- projects/routing/ObsoleteFiles.inc Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/ObsoleteFiles.inc Fri Aug 28 06:07:30 2015 (r287246) @@ -55,6 +55,9 @@ OLD_FILES+=usr/share/man/man4/dtrace-pro OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz +# 20150624 +OLD_LIBS+=usr/lib/libugidfw.so.4 +OLD_LIBS+=usr/lib32/libugidfw.so.4 # 20150604: Move nvlist man pages to section 9. OLD_FILES+=usr/share/man/man3/libnv.3.gz OLD_FILES+=usr/share/man/man3/nvlist.3.gz Modified: projects/routing/UPDATING ============================================================================== --- projects/routing/UPDATING Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/UPDATING Fri Aug 28 06:07:30 2015 (r287246) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150827: + pf no longer supports 'scrub fragment crop' or 'scrub fragment drop-ovl' + These configurations are now automatically interpreted as + 'scrub fragment reassemble'. + 20150817: Kernel-loadable modules for the random(4) device are back. To use them, the kernel must have Modified: projects/routing/bin/df/df.c ============================================================================== --- projects/routing/bin/df/df.c Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/df/df.c Fri Aug 28 06:07:30 2015 (r287246) @@ -311,7 +311,7 @@ main(int argc, char *argv[]) xo_close_container("storage-system-information"); xo_finish(); - return (rv); + exit(rv); } static char * Modified: projects/routing/bin/ls/Makefile ============================================================================== --- projects/routing/bin/ls/Makefile Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/ls/Makefile Fri Aug 28 06:07:30 2015 (r287246) @@ -5,7 +5,7 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -LIBADD= util xo +LIBADD= xo util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no Modified: projects/routing/bin/ps/Makefile ============================================================================== --- projects/routing/bin/ps/Makefile Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/ps/Makefile Fri Aug 28 06:07:30 2015 (r287246) @@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -LIBADD= m kvm jail xo +LIBADD= m kvm jail xo util .include <bsd.prog.mk> Modified: projects/routing/bin/rm/rm.c ============================================================================== --- projects/routing/bin/rm/rm.c Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/rm/rm.c Fri Aug 28 06:07:30 2015 (r287246) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include <fcntl.h> #include <fts.h> #include <grp.h> +#include <locale.h> #include <pwd.h> #include <stdint.h> #include <stdio.h> @@ -86,6 +87,8 @@ main(int argc, char *argv[]) int ch; char *p; + (void)setlocale(LC_ALL, ""); + /* * Test for the special case where the utility is called as * "unlink", for which the functionality provided is greatly Modified: projects/routing/bin/sh/expand.c ============================================================================== --- projects/routing/bin/sh/expand.c Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/sh/expand.c Fri Aug 28 06:07:30 2015 (r287246) @@ -1464,21 +1464,11 @@ patmatch(const char *pattern, const char bt_q = q; break; case '[': { - const char *endp; + const char *savep, *saveq; int invert, found; wchar_t chr; - endp = p; - if (*endp == '!' || *endp == '^') - endp++; - do { - while (*endp == CTLQUOTEMARK) - endp++; - if (*endp == 0) - goto dft; /* no matching ] */ - if (*endp == CTLESC) - endp++; - } while (*++endp != ']'); + savep = p, saveq = q; invert = 0; if (*p == '!' || *p == '^') { invert++; @@ -1497,6 +1487,11 @@ patmatch(const char *pattern, const char chr = (unsigned char)*q++; c = *p++; do { + if (c == '\0') { + p = savep, q = saveq; + c = '['; + goto dft; + } if (c == CTLQUOTEMARK) continue; if (c == '[' && *p == ':') { Modified: projects/routing/bin/sh/parser.c ============================================================================== --- projects/routing/bin/sh/parser.c Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/sh/parser.c Fri Aug 28 06:07:30 2015 (r287246) @@ -1662,7 +1662,7 @@ varname: pungetc(); else if (c == '\n' || c == PEOF) synerror("Unexpected end of line in substitution"); - else + else if (BASESYNTAX[c] != CCTL) USTPUTC(c, out); } if (subtype == 0) { @@ -1678,7 +1678,8 @@ varname: synerror("Unexpected end of line in substitution"); if (flags == VSNUL) STPUTC(':', out); - STPUTC(c, out); + if (BASESYNTAX[c] != CCTL) + STPUTC(c, out); subtype = VSERROR; } else subtype = p - types + VSNORMAL; Modified: projects/routing/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/routing/bin/sh/tests/builtins/Makefile Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/sh/tests/builtins/Makefile Fri Aug 28 06:07:30 2015 (r287246) @@ -39,6 +39,7 @@ FILES+= case16.0 FILES+= case17.0 FILES+= case18.0 FILES+= case19.0 +FILES+= case20.0 FILES+= cd1.0 FILES+= cd2.0 FILES+= cd3.0 Copied: projects/routing/bin/sh/tests/builtins/case20.0 (from r287244, head/bin/sh/tests/builtins/case20.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/builtins/case20.0 Fri Aug 28 06:07:30 2015 (r287246, copy of r287244, head/bin/sh/tests/builtins/case20.0) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +# Shells do not agree about what this pattern should match, but it is +# certain that it must not crash and the missing close bracket must not +# be simply ignored. + +case B in +[[:alpha:]) echo bad ;; +esac Modified: projects/routing/bin/sh/tests/errors/Makefile ============================================================================== --- projects/routing/bin/sh/tests/errors/Makefile Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/bin/sh/tests/errors/Makefile Fri Aug 28 06:07:30 2015 (r287246) @@ -19,6 +19,8 @@ FILES+= bad-parm-exp3.2 bad-parm-exp3.2 FILES+= bad-parm-exp4.2 bad-parm-exp4.2.stderr FILES+= bad-parm-exp5.2 bad-parm-exp5.2.stderr FILES+= bad-parm-exp6.2 bad-parm-exp6.2.stderr +FILES+= bad-parm-exp7.0 +FILES+= bad-parm-exp8.0 FILES+= option-error.0 FILES+= redirection-error.0 FILES+= redirection-error2.2 Copied: projects/routing/bin/sh/tests/errors/bad-parm-exp7.0 (from r287244, head/bin/sh/tests/errors/bad-parm-exp7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/errors/bad-parm-exp7.0 Fri Aug 28 06:07:30 2015 (r287246, copy of r287244, head/bin/sh/tests/errors/bad-parm-exp7.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +v=1 +eval ": $(printf '${v-${\372}}')" Copied: projects/routing/bin/sh/tests/errors/bad-parm-exp8.0 (from r287244, head/bin/sh/tests/errors/bad-parm-exp8.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/errors/bad-parm-exp8.0 Fri Aug 28 06:07:30 2015 (r287246, copy of r287244, head/bin/sh/tests/errors/bad-parm-exp8.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +v=1 +eval ": $(printf '${v-${w\372}}')" Modified: projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Aug 28 06:07:30 2015 (r287246) @@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); Modified: projects/routing/cddl/lib/Makefile ============================================================================== --- projects/routing/cddl/lib/Makefile Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/cddl/lib/Makefile Fri Aug 28 06:07:30 2015 (r287246) @@ -26,9 +26,7 @@ _libzpool= libzpool .endif .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" +.if ${MACHINE_CPUARCH} != "sparc64" _drti= drti _libdtrace= libdtrace .endif Modified: projects/routing/contrib/libxo/.gitignore ============================================================================== --- projects/routing/contrib/libxo/.gitignore Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/.gitignore Fri Aug 28 06:07:30 2015 (r287246) @@ -27,14 +27,17 @@ config.guess config.h.in config.sub depcomp +install-sh ltmain.sh missing +m4 Makefile.in configure .DS_Store xoconfig.h.in +xo_config.h.in .gdbinit .gdbinit.local Modified: projects/routing/contrib/libxo/.travis.yml ============================================================================== --- projects/routing/contrib/libxo/.travis.yml Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/.travis.yml Fri Aug 28 06:07:30 2015 (r287246) @@ -1,6 +1,6 @@ language: c -script: printenv && uname -a && /bin/sh ./bin/setup.sh && cd build && ../configure --enable-warnings && make && sudo make install && make test +script: printenv && uname -a && ls -l && /bin/sh -x ./bin/setup.sh && cd build && ../configure --enable-warnings && make && sudo make install && make test notifications: recipients: Copied: projects/routing/contrib/libxo/INSTALL.md (from r287244, head/contrib/libxo/INSTALL.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/contrib/libxo/INSTALL.md Fri Aug 28 06:07:30 2015 (r287246, copy of r287244, head/contrib/libxo/INSTALL.md) @@ -0,0 +1,15 @@ +<!--- +# $Id$ +# +# Copyright 2015, Juniper Networks, Inc. +# All rights reserved. +# This SOFTWARE is licensed under the LICENSE provided in the +# ../Copyright file. By downloading, installing, copying, or otherwise +# using the SOFTWARE, you agree to be bound by the terms of that +# LICENSE. +#--> + +## Instructions for building libxo + +Instructions for building libxo are now available in the +[wiki](http://juniper.github.io/libxo/libxo-manual.html#getting-libxo). Modified: projects/routing/contrib/libxo/Makefile.am ============================================================================== --- projects/routing/contrib/libxo/Makefile.am Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/Makefile.am Fri Aug 28 06:07:30 2015 (r287246) @@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libxo xo xolint xohtml tests doc +SUBDIRS = libxo xo xopo xolint xohtml tests doc encoder bin_SCRIPTS=libxo-config dist_doc_DATA = Copyright @@ -94,3 +94,9 @@ packages: && git commit -m 'new packaging data' \ ${GH_PACKAGING_DIR} \ && git push origin gh-pages ) ; true + +ANALYZE_DIR = ~/trash/libxo +ANALYZE_CMD = scan-build-mp-3.6 + +analyze: + ${ANALYZE_CMD} -o ${ANALYZE_DIR} ${MAKE} Modified: projects/routing/contrib/libxo/bin/Zaliases ============================================================================== --- projects/routing/contrib/libxo/bin/Zaliases Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/bin/Zaliases Fri Aug 28 06:07:30 2015 (r287246) @@ -6,6 +6,7 @@ set opts=' \ --enable-debug \ --enable-warnings \ --enable-printflike \ +--with-gettext=/opt/local \ --prefix ${HOME}/work/root \ ' set opts=`echo $opts` @@ -22,3 +23,7 @@ cd build alias xx 'cc -I.. -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Werror -Waggregate-return -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wnested-externs -Wparentheses -Wreturn-type -Wshadow -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -fno-inline-functions-called-once -g -O2 -o xtest -DUNIT_TEST libxo.c' + +alias mm "make CFLAGS='-O0 -g'" + +alias mmi 'mm && mi' Modified: projects/routing/contrib/libxo/bin/setup.sh ============================================================================== --- projects/routing/contrib/libxo/bin/setup.sh Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/bin/setup.sh Fri Aug 28 06:07:30 2015 (r287246) @@ -11,6 +11,8 @@ if [ ! -f configure ]; then vers=`autoreconf --version | head -1` echo "Using" $vers + mkdir -p m4 + autoreconf --install if [ ! -f configure ]; then Modified: projects/routing/contrib/libxo/configure.ac ============================================================================== --- projects/routing/contrib/libxo/configure.ac Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/configure.ac Fri Aug 28 06:07:30 2015 (r287246) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.3.2], [phil@juniper.net]) +AC_INIT([libxo], [0.4.5], [phil@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. @@ -54,12 +54,16 @@ AC_CHECK_FUNCS([sranddev srand strlcpy]) AC_CHECK_FUNCS([fdopen getrusage]) AC_CHECK_FUNCS([gettimeofday ctime]) AC_CHECK_FUNCS([getpass]) +AC_CHECK_FUNCS([getprogname]) AC_CHECK_FUNCS([sysctlbyname]) AC_CHECK_FUNCS([flock]) AC_CHECK_FUNCS([asprintf]) AC_CHECK_FUNCS([__flbf]) +AC_CHECK_FUNCS([sysctlbyname]) + AC_CHECK_HEADERS([dlfcn.h]) +AC_CHECK_HEADERS([dlfcn.h]) AC_CHECK_HEADERS([stdio_ext.h]) AC_CHECK_HEADERS([tzfile.h]) AC_CHECK_HEADERS([stdtime/tzfile.h]) @@ -69,10 +73,139 @@ AC_CHECK_HEADERS([sys/time.h]) AC_CHECK_HEADERS([ctype.h errno.h stdio.h stdlib.h]) AC_CHECK_HEADERS([string.h sys/param.h unistd.h ]) AC_CHECK_HEADERS([sys/sysctl.h]) +AC_CHECK_HEADERS([threads.h]) + +dnl humanize_number(3) is a great function, but it's not standard. +dnl Note Macosx has the function in libutil.a but doesn't ship the +dnl header file, so I'll need to carry my own implementation. See: +dnl https://devforums.apple.com/thread/271121 +AC_CHECK_HEADERS([libutil.h]) +AC_CHECK_LIB([util], [humanize_number], + [HAVE_HUMANIZE_NUMBER=$ac_cv_header_libutil_h], + [HAVE_HUMANIZE_NUMBER=no]) + +AC_MSG_RESULT(humanize_number results: :${HAVE_HUMANIZE_NUMBER}:${ac_cv_header_libutil_h}:) + +if test "$HAVE_HUMANIZE_NUMBER" = "yes"; then + AC_DEFINE([HAVE_HUMANIZE_NUMBER], [1], [humanize_number(3)]) +fi + +AM_CONDITIONAL([HAVE_HUMANIZE_NUMBER], [test "$HAVE_HUMANIZE_NUMBER" = "yes"]) + +AC_ARG_ENABLE([gettext], + [ --disable-gettext Turn off support for gettext], + [GETTEXT_ENABLE=$enableval], + [GETTEXT_ENABLE=yes]) + +dnl Looking for gettext(), assumably in libintl +AC_ARG_WITH(gettext, + [ --with-gettext=[PFX] Specify location of gettext installation], + [GETTEXT_PREFIX=$withval], + [GETTEXT_PREFIX=/usr], +) + +HAVE_GETTEXT=no + +if test "$GETTEXT_ENABLE" != "no"; then + + AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}]) + + _save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl" + AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <libintl.h>] + [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])], + [HAVE_GETTEXT=yes], + [HAVE_GETTEXT=no]) + CFLAGS="$_save_cflags" + + AC_MSG_RESULT([$HAVE_GETTEXT]) + + if test "$HAVE_GETTEXT" != "yes"; then + GETTEXT_PREFIX=/opt/local + AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}]) + + _save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl" + AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <libintl.h>] + [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])], + [HAVE_GETTEXT=yes], + [HAVE_GETTEXT=no]) + CFLAGS="$_save_cflags" + + AC_MSG_RESULT([$HAVE_GETTEXT]) + fi +fi + +if test "$HAVE_GETTEXT" = "yes"; then + AC_DEFINE([HAVE_GETTEXT], [1], [gettext(3)]) + GETTEXT_CFLAGS="-I${GETTEXT_PREFIX}/include" + GETTEXT_LIBS="-L${GETTEXT_PREFIX}/lib -lintl" +else + GETTEXT_PREFIX=none + GETTEXT_CFLAGS= + GETTEXT_LIBS= +fi +AC_SUBST(GETTEXT_CFLAGS) +AC_SUBST(GETTEXT_LIBS) +GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin +AC_SUBST(GETTEXT_BINDIR) +GETTEXT_LIBDIR=${GETTEXT_PREFIX}/lib +AC_SUBST(GETTEXT_LIBDIR) + +AM_CONDITIONAL([HAVE_GETTEXT], [test "$HAVE_GETTEXT" = "yes"]) + +dnl Looking for how to do thread-local variables +AC_ARG_WITH(threads, + [ --with-threads=[STYLE] Specify style of thread-local support (none)], + [THREAD_LOCAL=$withval], + [THREAD_LOCAL=unknown], +) + +AC_MSG_CHECKING([thread-locals are ${THREAD_LOCAL}]) + +if test "$THREAD_LOCAL" = "unknown"; then + AC_LINK_IFELSE([AC_LANG_SOURCE([[] + [__thread int foo; int main() { foo++; return foo; }]])], + [THREAD_LOCAL=before], + [THREAD_LOCAL=unknown]) + + AC_MSG_RESULT([$THREAD_LOCAL]) +fi + +if test "$THREAD_LOCAL" = "unknown"; then + AC_LINK_IFELSE([AC_LANG_SOURCE([[] + [int __thread foo; int main() { foo++; return foo; }]])], + [THREAD_LOCAL=after], + [THREAD_LOCAL=unknown]) + AC_MSG_RESULT([$THREAD_LOCAL]) +fi + +if test "$THREAD_LOCAL" = "unknown"; then + AC_LINK_IFELSE([AC_LANG_SOURCE([[] + [__declspec(int) foo; int main() { foo++; return foo; }]])], + [THREAD_LOCAL=declspec], + [THREAD_LOCAL=unknown]) + AC_MSG_RESULT([$THREAD_LOCAL]) +fi + +if test "$THREAD_LOCAL" != "unknown"; then + AC_DEFINE_UNQUOTED([HAVE_THREAD_LOCAL], + THREAD_LOCAL_${THREAD_LOCAL}, [thread-local setting]) +fi + +dnl Looking for libcrypto.... AC_CHECK_LIB([crypto], [MD5_Init]) AM_CONDITIONAL([HAVE_LIBCRYPTO], [test "$HAVE_LIBCRYPTO" != "no"]) +AC_CHECK_MEMBER([struct sockaddr_un.sun_len], + [HAVE_SUN_LEN=yes ; + AC_DEFINE([HAVE_SUN_LEN], [1], [Have struct sockaddr_un.sun_len])], + [HAS_SUN_LEN=no], [[#include <sys/un.h>]]) + +AC_CHECK_DECLS([__isthreaded], [], [], [#include <stdio.h>]) +HAVE_ISTHREADED=${ac_cv_have_decl___isthreaded} + dnl dnl Some packages need to be checked against version numbers so we dnl define a function here for later use @@ -107,12 +240,15 @@ then SLAX_BINDIR="`$SLAX_CONFIG --bindir | head -1`" SLAX_OXTRADOCDIR="`$SLAX_CONFIG --oxtradoc | head -1`" AC_MSG_RESULT($LIBSLAX_VERSION found) + HAVE_OXTRADOC=yes else LIBSLAX_VERSION= SLAX_BINDIR= SLAX_OXTRADOCDIR= AC_MSG_RESULT([no]) + HAVE_OXTRADOC=no fi +AM_CONDITIONAL([HAVE_OXTRADOC], [test "$HAVE_OXTRADOC" != "no"]) AC_SUBST(SLAX_BINDIR) AC_SUBST(SLAX_OXTRADOCDIR) @@ -141,6 +277,16 @@ AC_ARG_ENABLE([text-only], AC_MSG_RESULT([$LIBXO_TEXT_ONLY]) AM_CONDITIONAL([LIBXO_TEXT_ONLY], [test "$LIBXO_TEXT_ONLY" != "no"]) +AC_MSG_CHECKING([whether to build with local wcwidth implementation]) +AC_ARG_ENABLE([wcwidth], + [ --disable-wcwidth Disable local wcwidth implementation], + [LIBXO_WCWIDTH=$enableval], + [LIBXO_WCWIDTH=yes]) +AC_MSG_RESULT([$LIBXO_WCWIDTH]) +if test "${LIBXO_WCWIDTH}" != "no"; then + AC_DEFINE([LIBXO_WCWIDTH], [1], [Enable local wcwidth implementation]) +fi + AC_CHECK_LIB([m], [lrint]) AM_CONDITIONAL([HAVE_LIBM], [test "$HAVE_LIBM" != "no"]) @@ -177,13 +323,16 @@ AM_CONDITIONAL([NO_LIBXO_OPTIONS], [test case $host_os in darwin*) LIBTOOL=glibtool + XO_LIBEXT=dylib ;; Linux*|linux*) CFLAGS="-D_GNU_SOURCE $CFLAGS" LDFLAGS=-ldl + XO_LIBEXT=so ;; cygwin*|CYGWIN*) LDFLAGS=-no-undefined + XO_LIBEXT=ddl ;; esac @@ -203,6 +352,14 @@ AC_SUBST(XO_SRCDIR) AC_SUBST(XO_LIBDIR) AC_SUBST(XO_BINDIR) AC_SUBST(XO_INCLUDEDIR) +AC_SUBST(XO_LIBEXT) + +AC_ARG_WITH(encoder-dir, + [ --with-encoder-dir=[DIR] Specify location of encoder libraries], + [XO_ENCODERDIR=$withval], + [XO_ENCODERDIR=$libdir/libxo/encoder] +) +AC_SUBST(XO_ENCODERDIR) AC_ARG_WITH(share-dir, [ --with-share-dir=[DIR] Specify location of shared files], @@ -232,20 +389,34 @@ AC_SUBST(LIBXO_VERSION) AC_SUBST(LIBXO_VERSION_NUMBER) AC_SUBST(LIBXO_VERSION_EXTRA) -AC_CONFIG_HEADERS([libxo/xoconfig.h]) +AC_DEFINE_UNQUOTED(LIBXO_VERSION, ["$LIBXO_VERSION"], + [Version number as dotted value]) +AC_DEFINE_UNQUOTED(LIBXO_VERSION_NUMBER, [$LIBXO_VERSION_NUMBER], + [Version number as a number]) +AC_DEFINE_UNQUOTED(LIBXO_VERSION_STRING, ["$LIBXO_VERSION_NUMBER"], + [Version number as string]) +AC_DEFINE_UNQUOTED(LIBXO_VERSION_EXTRA, ["$LIBXO_VERSION_EXTRA"], + [Version number extra information]) + +AC_CONFIG_HEADERS([libxo/xo_config.h]) AC_CONFIG_FILES([ Makefile libxo-config xohtml/xohtml.sh libxo/Makefile - libxo/xoversion.h + libxo/add.man + encoder/Makefile + encoder/cbor/Makefile + encoder/test/Makefile xo/Makefile xolint/Makefile xohtml/Makefile + xopo/Makefile packaging/libxo.pc doc/Makefile tests/Makefile tests/core/Makefile + tests/gettext/Makefile tests/xo/Makefile packaging/libxo.spec packaging/libxo.rb.base @@ -262,6 +433,7 @@ AC_MSG_NOTICE([summary of build options: bindir: ${XO_BINDIR} includedir: ${XO_INCLUDEDIR} share dir: ${XO_SHAREDIR} + extensions dir: ${XO_ENCODERDIR} oxtradoc dir: ${SLAX_OXTRADOCDIR} compiler: ${CC} (${HAVE_GCC:-no}) @@ -273,4 +445,8 @@ AC_MSG_NOTICE([summary of build options: printf-like: ${HAVE_PRINTFLIKE:-no} libxo-options: ${LIBXO_OPTS:-no} text-only: ${LIBXO_TEXT_ONLY:-no} + gettext: ${HAVE_GETTEXT:-no} (${GETTEXT_PREFIX}) + isthreaded: ${HAVE_ISTHREADED:-no} + thread-local: ${THREAD_LOCAL:-no} + local wcwidth: ${LIBXO_WCWIDTH:-no} ]) Modified: projects/routing/contrib/libxo/doc/Makefile.am ============================================================================== --- projects/routing/contrib/libxo/doc/Makefile.am Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/doc/Makefile.am Fri Aug 28 06:07:30 2015 (r287246) @@ -8,6 +8,7 @@ # using the SOFTWARE, you agree to be bound by the terms of that # LICENSE. +if HAVE_OXTRADOC OXTRADOC_DIR = ${SLAX_OXTRADOCDIR} OXTRADOC_PREFIX = ${OXTRADOC_DIR} OXTRADOC = ${OXTRADOC_DIR}/oxtradoc @@ -38,28 +39,32 @@ OX_ARGS += -S ${SLAXPROC} -p doc OX_CMD = ${PERL} ${PERLOPTS} ${OXTRADOC} ${OX_ARGS} OXTRADOC_CMD = ${OX_CMD} - OUTPUT = libxo-manual -INPUT = libxo.txt +INPUT = libxo EXTRA_DIST = \ - ${INPUT} \ + ${INPUT}.txt \ ${OUTPUT}.html \ ${OUTPUT}.txt doc docs: ${OUTPUT}.txt ${OUTPUT}.html -${OUTPUT}.txt: ${INPUT} ${OXTRADOC} xolint.txt +${OUTPUT}.txt: ${INPUT}.txt ${OXTRADOC} xolint.txt ${OXTRADOC_CMD} -m text -o $@ $< -${OUTPUT}.html: ${INPUT} ${OXTRADOC} ${XML2HTMLBIN} xolint.txt +${OUTPUT}.html: ${INPUT}.txt ${OXTRADOC} ${XML2HTMLBIN} xolint.txt ${OXTRADOC_CMD} -m html -o $@ $< xolint.txt: ${top_srcdir}/xolint/xolint.pl perl ${top_srcdir}/xolint/xolint.pl -D > xolint.txt CLEANFILES = \ -${OUTPUT}.xml \ -${OUTPUT}.txt \ -${OUTPUT}.fxml \ -${OUTPUT}.html +xolint.txt \ +${INPUT}.xml \ +${INPUT}.txt \ +${INPUT}.fxml \ +${INPUT}.html +else +doc docs: + @${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org" +endif Modified: projects/routing/contrib/libxo/doc/libxo.txt ============================================================================== --- projects/routing/contrib/libxo/doc/libxo.txt Fri Aug 28 05:58:16 2015 (r287245) +++ projects/routing/contrib/libxo/doc/libxo.txt Fri Aug 28 06:07:30 2015 (r287246) @@ -8,7 +8,7 @@ # Phil Shafer, July 2014 # -* libxo +* Overview libxo - A Library for Generating Text, XML, JSON, and HTML Output @@ -28,10 +28,10 @@ decides at run time which output style s application calls a function "xo_emit" to product output that is described in a format string. A "field descriptor" tells libxo what the field is and what it means. Each field descriptor is placed in -braces with a printf-like format string: +braces with a printf-like format string (^format-strings^): xo_emit(" {:lines/%7ju} {:words/%7ju} " - "{:characters/%7ju}{d:filename/%s}\n", + "{:characters/%7ju} {d:filename/%s}\n", linect, wordct, charct, file); Each field can have a role, with the 'value' role being the default, @@ -43,10 +43,10 @@ can then be generated in various style, % wc --libxo xml,pretty,warn /etc/motd <wc> <file> - <filename>/etc/motd</filename> <lines>25</lines> <words>165</words> <characters>1140</characters> + <filename>/etc/motd</filename> </file> </wc> % wc --libxo json,pretty,warn /etc/motd @@ -54,10 +54,10 @@ can then be generated in various style, "wc": { "file": [ { - "filename": "/etc/motd", "lines": 25, "words": 165, - "characters": 1140 + "characters": 1140, + "filename": "/etc/motd" } ] } @@ -95,10 +95,151 @@ command: We're using semantic release numbering, as defined in ^http://semver.org/spec/v2.0.0.html^. -libxo is open source, distributed under the BSD license. It -is shipped as part of FreeBSD 11.0. +libxo is open source, distributed under the BSD license. It shipped +as part of the FreeBSD operating system starting with release 11.0. -* Overview +Issues, problems, and bugs should be directly to the issues page on +our github site. + +*** Downloading libxo Source Code + +You can retrieve the source for libxo in two ways: + +A) Use a "distfile" for a specific release. We use +github to maintain our releases. Visit +github release page (^https://github.com/Juniper/libxo/releases^) +to see the list of releases. To download the latest, look for the +release with the green "Latest release" button and the green +"libxo-RELEASE.tar.gz" button under that section. + +After downloading that release's distfile, untar it as follows: + + tar -zxf libxo-RELEASE.tar.gz + cd libxo-RELEASE + +[Note: for Solaris users, your "tar" command lacks the "-z" flag, +so you'll need to substitute "gzip -dc "file" | tar xf -" instead of +"tar -zxf "file"".] + +B) Use the current build from github. This gives you the most recent +source code, which might be less stable than a specific release. To +build libxo from the git repo: + + git clone https://github.com/Juniper/libxo.git + cd libxo + +_BE AWARE_: The github repository does _not_ contain the files +generated by "autoreconf", with the notable exception of the "m4" +directory. Since these files (depcomp, configure, missing, +install-sh, etc) are generated files, we keep them out of the source +code repository. + +This means that if you download the a release distfile, these files +will be ready and you'll just need to run "configure", but if you +download the source code from svn, then you'll need to run +"autoreconf" by hand. This step is done for you by the "setup.sh" +script, described in the next section. + +*** Building libxo + +To build libxo, you'll need to set up the build, run the "configure" +script, run the "make" command, and run the regression tests. + +The following is a summary of the commands needed. These commands are +explained in detail in the rest of this section. + + sh bin/setup.sh + cd build + ../configure + make + make test + sudo make install + +The following sections will walk thru each of these steps with +additional details and options, but the above directions should be all +that's needed. + +**** Setting up the build + +[If you downloaded a distfile, you can skip this step.] + +Run the "setup.sh" script to set up the build. This script runs the +"autoreconf" command to generate the "configure" script and other +generated files. + + sh bin/setup.sh + +Note: We're are currently using autoreconf version 2.69. + +**** Running the "configure" Script + +Configure (and autoconf in general) provides a means of building +software in diverse environments. Our configure script supports +a set of options that can be used to adjust to your operating +environment. Use "configure --help" to view these options. + +We use the "build" directory to keep object files and generated files +away from the source tree. + +To run the configure script, change into the "build" directory, and +run the "configure" script. Add any required options to the +"../configure" command line. + + cd build + ../configure + +Expect to see the "configure" script generate the following error: + + /usr/bin/rm: cannot remove `libtoolT': No such file or directory + +This error is harmless and can be safely ignored. + +By default, libxo installs architecture-independent files, including +extension library files, in the /usr/local directories. To specify an +installation prefix other than /usr/local for all installation files, +include the --prefix=prefix option and specify an alternate +location. To install just the extension library files in a different, +user-defined location, include the --with-extensions-dir=dir option +and specify the location where the extension libraries will live. + + cd build + ../configure [OPTION]... [VAR=VALUE]... + +**** Running the "make" command + +Once the "configure" script is run, build the images using the "make" +command: + + make + +**** Running the Regression Tests + +libxo includes a set of regression tests that can be run to ensure +the software is working properly. These test are optional, but will +help determine if there are any issues running libxo on your +machine. To run the regression tests: + + make test + +**** Installing libxo + +Once the software is built, you'll need to install libxo using the +"make install" command. If you are the root user, or the owner of the +installation directory, simply issue the command: + + make install + +If you are not the "root" user and are using the "sudo" package, use: + + sudo make install + +Verify the installation by viewing the output of "xo --version": + + % xo --version + libxo version 0.3.5-git-develop + xo version 0.3.5-git-develop + +* Formatting with libxo Most unix commands emit text output aimed at humans. It is designed to be parsed and understood by a user. Humans are gifted at @@ -128,26 +269,41 @@ A single libxo function call in source c xo_emit("Connecting to {:host}.{:domain}...\n", host, domain); - Text: - Connection to my-box.example.com... + TEXT: + Connecting to my-box.example.com... XML: <host>my-box</host> <domain>example.com</domain> JSON: "host": "my-box", "domain": "example.com" - -For brevity, the HTML output is emitted. + HTML: + <div class="line"> + <div class="text">Connecting to </div> + <div class="data" data-tag="host" + data-xpath="/top/host">my-box</div> + <div class="text">.</div> + <div class="data" data-tag="domain" + data-xpath="/top/domain">example.com</div> + <div class="text">...</div> + </div> ** Encoding Styles -There are four encoding styles supported by libxo: TEXT, HTML, JSON, -and XML. JSON and XML are suitable for encoding data, while TEXT and -HTML are suited for display to the user. TEXT output can be display -on a terminal session, allowing compatibility with traditional usage. -HTML can be matched with a small CSS file to permit rendering in any -HTML5 browser. XML output is suitable for tools like XPath and -protocols like NETCONF. JSON output can be used for RESTful APIs. +There are four encoding styles supported by libxo: + +- TEXT output can be display on a terminal session, allowing +compatibility with traditional command line usage. +- XML output is suitable for tools like XPath and protocols like +NETCONF. +- JSON output can be used for RESTful APIs and integration with +languages like Javascript and Python. +- HTML can be matched with a small CSS file to permit rendering in any +HTML5 browser. + +In general, XML and JSON are suitable for encoding data, while TEXT is +suited for terminal output and HTML is suited for display in a web +browser (see ^xohtml^). *** Text Output @@ -164,7 +320,7 @@ data might look like: printf("%d\t%s\n", num_blocks, path); Simple, direct, obvious. But it's only making text output. Imagine -using a single code path to make text, XML, JSON or HTML, deciding at +using a single code path to make TEXT, XML, JSON or HTML, deciding at run time which to generate. libxo expands on the idea of printf format strings to make a single @@ -257,7 +413,7 @@ field descriptions within the format str The field description is given as follows: - '{' [ role | modifier ]* ':' [ content ] + '{' [ role | modifier ]* [',' long-names ]* ':' [ content ] [ '/' field-format [ '/' encoding-format ]] '}' The role describes the function of the field, while the modifiers @@ -271,23 +427,31 @@ label ("In stock"), and the third is a v in-stock field has a "%u" format that will parse the next argument passed to the xo_emit function as an unsigned integer. - xo_emit("{P: }{Lwc:In stock}{:in-stock/%u}\n", 65); + xo_emit("{P: }{Lwc:In stock}{:in-stock/%u}\n", 65); This single line of code can generate text (" In stock: 65\n"), XML ("<in-stock>65</in-stock>"), JSON ('"in-stock": 6'), or HTML (too lengthy to be listed here). -*** Modifier Roles +While roles and modifiers typically use single character for brevity, +there are alternative names for each which allow more verbose +formatting strings. These names must be preceded by a comma, and may +follow any single-character values: + + xo_emit("{L,white,colon:In stock}{,key:in-stock/%u}\n", 65); -Modifiers are optional, and indicate the role and formatting of the +*** Field Roles + +Field roles are optional, and indicate the role and formatting of the content. The roles are listed below; only one role is permitted: |---+--------------+-------------------------------------------------| -| M | Name | Description | +| R | Name | Description | |---+--------------+-------------------------------------------------| -| C | color/effect | Field has color and effect controls | +| C | color | Field has color and effect controls | | D | decoration | Field is non-text (e.g., colon, comma) | | E | error | Field is an error message | +| G | gettext | Call gettext(3) on the format string | | L | label | Field is text that prefixes a value | | N | note | Field is text that follows a value | | P | padding | Field is spaces needed for vertical alignment | @@ -295,25 +459,59 @@ content. The roles are listed below; on | U | units | Field is the units for the previous value field | | V | value | Field is the name of field (the default) | | W | warning | Field is a warning message | -| [ | start anchor | Begin a section of anchored variable-width text | -| ] | stop anchor | End a section of anchored variable-width text | +| [ | start-anchor | Begin a section of anchored variable-width text | +| ] | stop-anchor | End a section of anchored variable-width text | |---+--------------+-------------------------------------------------| -**** The Color Role ({C:}) + EXAMPLE: + xo_emit("{L:Free}{D::}{P: }{:free/%u} {U:Blocks}\n", + free_blocks); + +When a role is not provided, the "value" role is used as the default. + +Roles and modifiers can also use more verbose names, when preceeded by +a comma: + + EXAMPLE: + xo_emit("{,label:Free}{,decoration::}{,padding: }" + "{,value:free/%u} {,units:Blocks}\n", *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508280607.t7S67W1h085056>