from:"Phil Shafer"

svn commit: r357125 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/csv contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved lib/libxo lib/libxo/libxo usr.bi...

2020-01-25 Thread Phil Shafer

Author: phil
Date: Sat Jan 25 21:16:45 2020
New Revision: 357125
URL: https://svnweb.freebsd.org/changeset/base/357125

Log:
  Import libxo-1.4.0:
  
  - Two changes to encoder options:
  encoder options may use plus or colon, but only one
  encoder names can be specified as "@name"
  This results in the syntax:
  
  df --libxo @csv:no-header:leafs=name.available-blocks /
  
  - If xo_set_program is called before xo_parse_args, honor the requested 
value
  - add xo_errorn* function; repair newline-adding-on-xo_error bug
  - test programs now use fixed name, since linux libtool prefixs "lt-"
  - Fix "horse butt" comment in source code
  - update test cases
  
  PR:   242686

Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/api.rst
  head/contrib/libxo/doc/encoders.rst
  head/contrib/libxo/doc/options.rst
  head/contrib/libxo/encoder/csv/enc_csv.c
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo.h
  head/contrib/libxo/libxo/xo_encoder.c
  head/contrib/libxo/libxo/xo_encoder.h
  head/contrib/libxo/tests/core/Makefile.am
  head/contrib/libxo/tests/core/saved/test_02.H.out
  head/contrib/libxo/tests/core/saved/test_02.HIPx.out
  head/contrib/libxo/tests/core/saved/test_02.HP.out
  head/contrib/libxo/tests/core/saved/test_02.J.out
  head/contrib/libxo/tests/core/saved/test_02.JP.out
  head/contrib/libxo/tests/core/saved/test_02.T.err
  head/contrib/libxo/tests/core/saved/test_02.X.out
  head/contrib/libxo/tests/core/saved/test_02.XP.out
  head/contrib/libxo/tests/core/test_02.c
  head/contrib/libxo/tests/core/test_12.c
  head/lib/libxo/add.man
  head/lib/libxo/libxo/xo_config.h
  head/usr.bin/xohtml/xohtml.sh
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Sat Jan 25 21:09:27 2020
(r357124)
+++ head/contrib/libxo/configure.ac Sat Jan 25 21:16:45 2020
(r357125)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.3.1], [p...@juniper.net])
+AC_INIT([libxo], [1.4.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/api.rst
==
--- head/contrib/libxo/doc/api.rst  Sat Jan 25 21:09:27 2020
(r357124)
+++ head/contrib/libxo/doc/api.rst  Sat Jan 25 21:16:45 2020
(r357125)
@@ -1204,6 +1204,11 @@ message associated with either *errno* or the *code* p
 xo_err(1, "cannot open file '%s'", filename);
 
 .. index:: xo_error
+.. index:: xo_error_h
+.. index:: xo_error_hv
+.. index:: xo_errorn
+.. index:: xo_errorn_h
+.. index:: xo_errorn_hv
 
 xo_error
 
@@ -1214,6 +1219,50 @@ xo_error
   :type fmt: const char *
   :returns: void
 
+.. c:function:: void xo_error_h (xo_handle_t *xop, const char *fmt, ...)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param fmt: Format string
+  :type fmt: const char *
+  :returns: void
+
+.. c:function:: void xo_error_hv (xo_handle_t *xop, const char *fmt, va_list 
vap)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param fmt: Format string
+  :type fmt: const char *
+  :param vap: variadic arguments
+  :type xop: va_list
+  :returns: void
+
+.. c:function:: void xo_errorn (const char *fmt, ...)
+
+  :param fmt: Format string
+  :type fmt: const char *
+  :returns: void
+
+.. c:function:: void xo_errorn_h (xo_handle_t *xop, const char *fmt, ...)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param fmt: Format string
+  :type fmt: const char *
+  :returns: void
+
+.. c:function:: void xo_errorn_hv (xo_handle_t *xop, int need_newline, const 
char *fmt, va_list vap)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param need_newline: boolean indicating need for trailing newline
+  :type need_newline: int
+  :param fmt: Format string
+  :type fmt: const char *
+  :param vap: variadic arguments
+  :type xop: va_list
+  :returns: void
+
   The `xo_error` function can be used for generic errors that should
   be reported over the handle, rather than to stderr.  The `xo_error`
   function behaves like `xo_err` for TEXT and HTML output styles, but
@@ -1225,6 +1274,16 @@ xo_error
 Does not compute
 JSON::
 "error": { "message": "Does not compute" }
+
+  The `xo_error_h` and `xo_error_hv` add a handle object and a
+  variadic-ized parameter to the signature, respectively.
+
+  The `xo_errorn` function supplies a newline at the end the error
+  message if the format string does not include one.  The
+  `xo_errorn_h` and `xo_errorn_hv` functions add a handle object and
+  a variadic-ized parameter to the signature, respectively.  The
+  `xo_errorn_hv` funct

svn commit: r357124 - vendor/Juniper/libxo/1.4.0

2020-01-25 Thread Phil Shafer

Author: phil
Date: Sat Jan 25 21:09:27 2020
New Revision: 357124
URL: https://svnweb.freebsd.org/changeset/base/357124

Log:
  Tag libxo 1.4.0

Added:
 - copied from r357123, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/1.4.0/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r357123 - in vendor/Juniper/libxo/dist: . doc encoder/csv libxo tests/core tests/core/saved

2020-01-25 Thread Phil Shafer

Author: phil
Date: Sat Jan 25 21:09:12 2020
New Revision: 357123
URL: https://svnweb.freebsd.org/changeset/base/357123

Log:
  Import libxo 1.4.0

Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/api.rst
  vendor/Juniper/libxo/dist/doc/encoders.rst
  vendor/Juniper/libxo/dist/doc/options.rst
  vendor/Juniper/libxo/dist/encoder/csv/enc_csv.c
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo.h
  vendor/Juniper/libxo/dist/libxo/xo_encoder.c
  vendor/Juniper/libxo/dist/libxo/xo_encoder.h
  vendor/Juniper/libxo/dist/tests/core/Makefile.am
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.T.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_02.c
  vendor/Juniper/libxo/dist/tests/core/test_12.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Sat Jan 25 16:46:39 2020
(r357122)
+++ vendor/Juniper/libxo/dist/configure.ac  Sat Jan 25 21:09:12 2020
(r357123)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.3.1], [p...@juniper.net])
+AC_INIT([libxo], [1.4.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/api.rst
==
--- vendor/Juniper/libxo/dist/doc/api.rst   Sat Jan 25 16:46:39 2020
(r357122)
+++ vendor/Juniper/libxo/dist/doc/api.rst   Sat Jan 25 21:09:12 2020
(r357123)
@@ -1204,6 +1204,11 @@ message associated with either *errno* or the *code* p
 xo_err(1, "cannot open file '%s'", filename);
 
 .. index:: xo_error
+.. index:: xo_error_h
+.. index:: xo_error_hv
+.. index:: xo_errorn
+.. index:: xo_errorn_h
+.. index:: xo_errorn_hv
 
 xo_error
 
@@ -1214,6 +1219,50 @@ xo_error
   :type fmt: const char *
   :returns: void
 
+.. c:function:: void xo_error_h (xo_handle_t *xop, const char *fmt, ...)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param fmt: Format string
+  :type fmt: const char *
+  :returns: void
+
+.. c:function:: void xo_error_hv (xo_handle_t *xop, const char *fmt, va_list 
vap)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param fmt: Format string
+  :type fmt: const char *
+  :param vap: variadic arguments
+  :type xop: va_list
+  :returns: void
+
+.. c:function:: void xo_errorn (const char *fmt, ...)
+
+  :param fmt: Format string
+  :type fmt: const char *
+  :returns: void
+
+.. c:function:: void xo_errorn_h (xo_handle_t *xop, const char *fmt, ...)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param fmt: Format string
+  :type fmt: const char *
+  :returns: void
+
+.. c:function:: void xo_errorn_hv (xo_handle_t *xop, int need_newline, const 
char *fmt, va_list vap)
+
+  :param xop: libxo handle pointer
+  :type xop: xo_handle_t *
+  :param need_newline: boolean indicating need for trailing newline
+  :type need_newline: int
+  :param fmt: Format string
+  :type fmt: const char *
+  :param vap: variadic arguments
+  :type xop: va_list
+  :returns: void
+
   The `xo_error` function can be used for generic errors that should
   be reported over the handle, rather than to stderr.  The `xo_error`
   function behaves like `xo_err` for TEXT and HTML output styles, but
@@ -1225,6 +1274,16 @@ xo_error
 Does not compute
 JSON::
 "error": { "message": "Does not compute" }
+
+  The `xo_error_h` and `xo_error_hv` add a handle object and a
+  variadic-ized parameter to the signature, respectively.
+
+  The `xo_errorn` function supplies a newline at the end the error
+  message if the format string does not include one.  The
+  `xo_errorn_h` and `xo_errorn_hv` functions add a handle object and
+  a variadic-ized parameter to the signature, respectively.  The
+  `xo_errorn_hv` function also adds a boolean to indicate the need for
+  a trailing newline.
 
 .. index:: xo_no_setlocale
 .. index:: Locale

Modified: vendor/Juniper/libxo/dist/doc/encoders.rst
==
--- vendor/Juniper/libxo/dist/doc/encoders.rst  Sat Jan 25 16:46:39 2020
(r357122)
+++ vendor/Juniper/libxo/dist/doc/encoders.rst  Sat Jan 25 21:09:12 2020
(r357123)
@@ -26,12 +26,13 @@ example uses the "cbor" encoder, saving the output int
 df --libxo encoder=cbor > df-output.cbor
 
 Encoders

svn commit: r355826 - head/lib/libxo head/lib/libxo/encoder/csv head/lib/libxo/libxo head/lib/libxo/tests head/lib/libxo/tests/encoder head/usr.bin/xo vendor/Juniper/libxo

2019-12-16 Thread Phil Shafer

Author: phil
Date: Mon Dec 16 22:05:03 2019
New Revision: 355826
URL: https://svnweb.freebsd.org/changeset/base/355826

Log:
  Allow proper builds of libxo's CSV encoder:
  - Move libxo.a build to subdirectory (lib/libxo/libxo/Makefile)
  - Add .WAIT target to delay encoder build til after libxo
  - Use FILES to install encoder library as csv.enc
  - Update import script to put xo_config.h in new location

Modified:
  vendor/Juniper/libxo/.svnignore
  vendor/Juniper/libxo/import.sh
Directory Properties:
  vendor/Juniper/libxo/   (props changed)

Changes in other areas also in this revision:
Added:
  head/lib/libxo/libxo/
  head/lib/libxo/libxo/Makefile   (contents, props changed)
  head/lib/libxo/libxo/xo_config.h
 - copied unchanged from r355672, head/lib/libxo/xo_config.h
Deleted:
  head/lib/libxo/xo_config.h
Modified:
  head/lib/libxo/Makefile
  head/lib/libxo/encoder/csv/Makefile
  head/lib/libxo/tests/Makefile
  head/lib/libxo/tests/encoder/Makefile
  head/usr.bin/xo/Makefile

Modified: vendor/Juniper/libxo/.svnignore
==
--- vendor/Juniper/libxo/.svnignore Mon Dec 16 21:52:12 2019
(r355825)
+++ vendor/Juniper/libxo/.svnignore Mon Dec 16 22:05:03 2019
(r355826)
@@ -1,6 +1,6 @@
-libxo-0.4.6
-libxo-0.4.7
-libxo-0.6.0
-libxo-0.6.1
-libxo-0.6.2
+libxo-1.0.2
+libxo-1.0.4
+libxo-1.1.0
+libxo-1.3.0
+libxo-1.3.1
 tag.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Mon Dec 16 21:52:12 2019
(r355825)
+++ vendor/Juniper/libxo/import.sh  Mon Dec 16 22:05:03 2019
(r355826)
@@ -290,7 +290,7 @@ run "build for real" \
 # Move over and build the source tree
 Cd $HEAD
 
-run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat 
$CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h"
+run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat 
$CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/libxo/xo_config.h"
 run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat 
$CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man"
 run "copying xohtml.sh" "(echo '#!/bin/sh' ; echo '# \$FreeBSD\$' ; cat 
$CWD/dist/build/xohtml/xohtml.sh ) > $HEAD/usr.bin/xohtml/xohtml.sh"
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r355826 - head/lib/libxo head/lib/libxo/encoder/csv head/lib/libxo/libxo head/lib/libxo/tests head/lib/libxo/tests/encoder head/usr.bin/xo vendor/Juniper/libxo

2019-12-16 Thread Phil Shafer

Author: phil
Date: Mon Dec 16 22:05:03 2019
New Revision: 355826
URL: https://svnweb.freebsd.org/changeset/base/355826

Log:
  Allow proper builds of libxo's CSV encoder:
  - Move libxo.a build to subdirectory (lib/libxo/libxo/Makefile)
  - Add .WAIT target to delay encoder build til after libxo
  - Use FILES to install encoder library as csv.enc
  - Update import script to put xo_config.h in new location

Added:
  head/lib/libxo/libxo/
  head/lib/libxo/libxo/Makefile   (contents, props changed)
  head/lib/libxo/libxo/xo_config.h
 - copied unchanged from r355672, head/lib/libxo/xo_config.h
Deleted:
  head/lib/libxo/xo_config.h
Modified:
  head/lib/libxo/Makefile
  head/lib/libxo/encoder/csv/Makefile
  head/lib/libxo/tests/Makefile
  head/lib/libxo/tests/encoder/Makefile
  head/usr.bin/xo/Makefile

Changes in other areas also in this revision:
Modified:
  vendor/Juniper/libxo/.svnignore
  vendor/Juniper/libxo/import.sh
Directory Properties:
  vendor/Juniper/libxo/   (props changed)

Modified: head/lib/libxo/Makefile
==
--- head/lib/libxo/Makefile Mon Dec 16 21:52:12 2019(r355825)
+++ head/lib/libxo/Makefile Mon Dec 16 22:05:03 2019(r355826)
@@ -1,119 +1,10 @@
 # $FreeBSD$
 
-SHLIBDIR?=  /lib
-
 .include 
 
-PACKAGE=   runtime
-
-LIBXOSRC=  ${SRCTOP}/contrib/libxo
-
-.PATH: ${LIBXOSRC}/libxo
-
-LIB=   xo
-SHLIB_MAJOR=0
-
-SRCS=  libxo.c xo_encoder.c xo_syslog.c
-
-CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
-CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
-
-INCS=  xo.h xo_encoder.h
-INCSDIR=${INCLUDEDIR}/libxo
-
-LIBADD=util
-
-WARNS?= 5
-
-MAN+=  libxo.3
-MAN+=  xo_attr.3 \
-   xo_create.3 \
-   xo_emit.3 \
-   xo_emit_err.3 \
-   xo_err.3 \
-   xo_error.3 \
-   xo_finish.3 \
-   xo_flush.3 \
-   xo_message.3 \
-   xo_no_setlocale.3 \
-   xo_open_container.3 \
-   xo_open_list.3 \
-   xo_open_marker.3 \
-   xo_parse_args.3 \
-   xo_set_allocator.3 \
-   xo_set_flags.3 \
-   xo_set_info.3 \
-   xo_set_options.3 \
-   xo_set_style.3 \
-   xo_set_syslog_enterprise_id.3 \
-   xo_set_version.3 \
-   xo_set_writer.3 \
-   xo_syslog.3
-
-MAN+=  xo_format.5
-
-MAN+=  xo_options.7
-
-MLINKS=xo_attr.3 xo_attr_h.3 \
-   xo_attr.3 xo_attr_hv.3 \
-   xo_create.3 xo_create_to_file.3 \
-   xo_create.3 xo_destroy.3 \
-   xo_emit.3 xo_emit_h.3 \
-   xo_emit.3 xo_emit_hv.3 \
-   xo_emit_err.3 xo_emit_errc.3 \
-   xo_emit_err.3 xo_emit_errx.3 \
-   xo_emit_err.3 xo_emit_warn.3 \
-   xo_emit_err.3 xo_emit_warnx.3 \
-   xo_emit_err.3 xo_emit_warn_c.3 \
-   xo_emit_err.3 xo_emit_warn_hc.3 \
-   xo_err.3 xo_errc.3 \
-   xo_err.3 xo_errx.3 \
-   xo_err.3 xo_warn.3 \
-   xo_err.3 xo_warnx.3 \
-   xo_err.3 xo_warn_c.3 \
-   xo_err.3 xo_warn_hc.3 \
-   xo_finish.3 xo_finish_h.3 \
-   xo_flush.3 xo_flush_h.3 \
-   xo_message.3 xo_message_c.3 \
-   xo_message.3 xo_message_hc.3 \
-   xo_message.3 xo_message_hcv.3 \
-   xo_open_container.3 xo_open_container_h.3 \
-   xo_open_container.3 xo_open_container_hd.3 \
-   xo_open_container.3 xo_open_container_d.3 \
-   xo_open_container.3 xo_close_container.3 \
-   xo_open_container.3 xo_close_container_h.3 \
-   xo_open_container.3 xo_close_container_hd.3 \
-   xo_open_container.3 xo_close_container_d.3 \
-   xo_open_list.3 xo_open_list_h.3 \
-   xo_open_list.3 xo_open_list_hd.3 \
-   xo_open_list.3 xo_open_list_d.3 \
-   xo_open_list.3 xo_open_instance.3 \
-   xo_open_list.3 xo_open_instance_h.3 \
-   xo_open_list.3 xo_open_instance_hd.3 \
-   xo_open_list.3 xo_open_instance_d.3 \
-   xo_open_list.3 xo_close_instance.3 \
-   xo_open_list.3 xo_close_instance_h.3 \
-   xo_open_list.3 xo_close_instance_hd.3 \
-   xo_open_list.3 xo_close_instance_d.3 \
-   xo_open_list.3 xo_close_list.3 \
-   xo_open_list.3 xo_close_list_h.3 \
-   xo_open_list.3 xo_close_list_hd.3 \
-   xo_open_list.3 xo_close_list_d.3 \
-   xo_open_marker.3 xo_open_marker_h.3 \
-   xo_open_marker.3 xo_close_marker.3 \
-   xo_open_marker.3 xo_close_marker_h.3 \
-   xo_parse_args.3 xo_set_program.3 \
-   xo_set_flags.3 xo_clear_flags.3 \
-   xo_set_style.3 xo_set_style_name.3 \
-   xo_set_version.3 xo_set_version_h.3 \
-   xo_syslog.3 xo_close_log.3 \
-   xo_syslog.3 xo_open_log.3 \
-   xo_syslog.3 xo_set_logmask.3 \
-   xo_syslog.3 xo_vsyslog.3
-
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
-#SUBDIR = encoder
+SUBDIR = libxo .WAIT encoder
 
-.include 
+.include 

Modified: head/lib/libxo/encoder/csv/Makefile
==
--- head/lib/libxo/encoder/csv/Makefile Mon Dec 16 21:52:12 2019
(r355825)
+++ head/lib/libxo/encoder/csv/Ma

svn commit: r354456 - vendor/Juniper/libxo

2019-11-07 Thread Phil Shafer

Author: phil
Date: Thu Nov  7 18:07:34 2019
New Revision: 354456
URL: https://svnweb.freebsd.org/changeset/base/354456

Log:
  Remove oxtradoc version of documentation; move to RST/Sphinx

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Thu Nov  7 18:06:44 2019
(r354455)
+++ vendor/Juniper/libxo/import.sh  Thu Nov  7 18:07:34 2019
(r354456)
@@ -26,14 +26,19 @@ GMAKE=${GMAKE:-gmake}
 
 # For consistency...
 Error() {
-   echo ERROR: ${1+"$@"} >&2
-   exit 1
+echo ERROR: ${1+"$@"} >&2
+exit 1
 }
 
 Cd() {
-   [ $# -eq 1 ] || Error "Cd() takes a single parameter."
-   cd $1 || Error "cannot \"cd $1\" from $PWD"
-info "Directory =" `pwd`
+[ $# -eq 1 ] || Error "Cd() takes a single parameter."
+cd $1 || Error "cannot \"cd $1\" from $PWD"
+info "Directory =" `pwd`
+ 
+if [ "$DOC" = doc ]; then
+   echo "cd $1"
+   echo "  "
+fi
 }
 
 siginfo() {
@@ -51,8 +56,8 @@ run() {
 CMD="$2"
 
 if [ "$DOC" = doc ]; then
-echo " == $desc"
-echo " - $cmd"
+echo "## $desc"
+echo " $cmd"
 echo " "
 else
 echo ""
@@ -66,7 +71,7 @@ run() {
 }
 
 info() {
-echo " -- " "$@"
+echo "## -- " "$@"
 }
 
 okay() {
@@ -182,13 +187,7 @@ fi
 
 # We need the release tar ball for the HTML docs, nothing more
 
DOCURL=https://github.com/Juniper/libxo/releases/download/$VERS/libxo-$VERS.tar.gz
-DOCBALL=~/tars/doc-$BASEURL
 
-if [ "$FETCH" = "yes" -o ! -f $DOCBALL ]; then
-run "fetching doc tarball" "fetch -o $DOCBALL $DOCURL"
-test -s ${DOCBALL} || Error need DOCBALL
-fi
-
 # BASE should match what the TARBALL contains
 BASE=`basename $TARBALL .tar.gz`
 VERSION=`echo $BASE | sed 's/libxo-//'`
@@ -196,8 +195,6 @@ VERSION=`echo $BASE | sed 's/libxo-//'`
 TF=$BASE/info
 
 run "untarring source files TARBALL" "tar zxf $TARBALL"
-run "untarring html manual" \
-"tar zxf $DOCBALL libxo-$VERS/doc/libxo-manual.html"
 
 # List of top-level files we want to ignore
 TOPJUNKFILES="\
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r354455 - in head: contrib/libxo contrib/libxo/libxo contrib/libxo/tests/core lib/libxo lib/libxo/encoder/csv usr.bin/xohtml

2019-11-07 Thread Phil Shafer

Author: phil
Date: Thu Nov  7 18:06:44 2019
New Revision: 354455
URL: https://svnweb.freebsd.org/changeset/base/354455

Log:
  Import libxo-1.3.1:
  - handle argv[0] without '/'
  - add test case for argv[0] without '/'

Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/tests/core/test_01.c
  head/lib/libxo/add.man
  head/lib/libxo/encoder/csv/Makefile
  head/lib/libxo/xo_config.h
  head/usr.bin/xohtml/xohtml.sh
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Thu Nov  7 18:05:38 2019
(r354454)
+++ head/contrib/libxo/configure.ac Thu Nov  7 18:06:44 2019
(r354455)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.3.0], [p...@juniper.net])
+AC_INIT([libxo], [1.3.1], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cThu Nov  7 18:05:38 2019
(r354454)
+++ head/contrib/libxo/libxo/libxo.cThu Nov  7 18:06:44 2019
(r354455)
@@ -8104,12 +8104,14 @@ xo_parse_args (int argc, char **argv)
 cp = strrchr(xo_program, '/');
 if (cp)
xo_program = ++cp;
+else
+   cp = argv[0];   /* Reset to front of string */
 
 /* GNU tools add an annoying ".test" as the program extension; remove it */
 size_t len = strlen(xo_program);
 static const char gnu_ext[] = ".test";
 if (len >= sizeof(gnu_ext)) {
-   cp = &cp[len + 1 - sizeof(gnu_ext)];
+   cp += len + 1 - sizeof(gnu_ext);
if (xo_streq(cp, gnu_ext))
*cp = '\0';
 }

Modified: head/contrib/libxo/tests/core/test_01.c
==
--- head/contrib/libxo/tests/core/test_01.c Thu Nov  7 18:05:38 2019
(r354454)
+++ head/contrib/libxo/tests/core/test_01.c Thu Nov  7 18:06:44 2019
(r354455)
@@ -50,6 +50,9 @@ main (int argc, char **argv)
{ "sold", "number", "Number of items sold" },
{ XO_INFO_NULL },
 };
+
+char name[] = "test_01.test";  /* test trimming of xo_program */
+argv[0] = name;
 
 argc = xo_parse_args(argc, argv);
 if (argc < 0)

Modified: head/lib/libxo/add.man
==
--- head/lib/libxo/add.man  Thu Nov  7 18:05:38 2019(r354454)
+++ head/lib/libxo/add.man  Thu Nov  7 18:06:44 2019(r354455)
@@ -3,10 +3,10 @@
 .Fx
 uses
 .Nm libxo
-version 1.3.0.
+version 1.3.1.
 Complete documentation can be found on github:
 .Bd -literal -offset indent
-https://juniper.github.io/libxo/1.3.0/html/index.html
+https://juniper.github.io/libxo/1.3.1/html/index.html
 .Ed
 .Pp
 .Nm libxo

Modified: head/lib/libxo/encoder/csv/Makefile
==
--- head/lib/libxo/encoder/csv/Makefile Thu Nov  7 18:05:38 2019
(r354454)
+++ head/lib/libxo/encoder/csv/Makefile Thu Nov  7 18:06:44 2019
(r354455)
@@ -2,7 +2,7 @@
 
 LIBXODIR=   ${STAGEDIR}${PREFIX}/usr/lib/libxo/encoder
 SHLIBDIR?=  ${LIBXODIR}
-LIBDIR?=  ${LIBXODIR}
+LIBDIR?=${LIBXODIR}
 
 .include 
 
@@ -21,6 +21,7 @@ CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
 CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
 
 LIBADD=util xo
+LDFLAGS += -L${.OBJDIR}/../../wildebeast
 
 WARNS?= 5
 

Modified: head/lib/libxo/xo_config.h
==
--- head/lib/libxo/xo_config.h  Thu Nov  7 18:05:38 2019(r354454)
+++ head/lib/libxo/xo_config.h  Thu Nov  7 18:06:44 2019(r354455)
@@ -183,16 +183,16 @@
 /* #undef LIBXO_TEXT_ONLY */
 
 /* Version number as dotted value */
-#define LIBXO_VERSION "1.3.0"
+#define LIBXO_VERSION "1.3.1"
 
 /* Version number extra information */
 #define LIBXO_VERSION_EXTRA ""
 
 /* Version number as a number */
-#define LIBXO_VERSION_NUMBER 1003000
+#define LIBXO_VERSION_NUMBER 1003001
 
 /* Version number as string */
-#define LIBXO_VERSION_STRING "1003000"
+#define LIBXO_VERSION_STRING "1003001"
 
 /* Enable local wcwidth implementation */
 #define LIBXO_WCWIDTH 1
@@ -210,7 +210,7 @@
 #define PACKAGE_NAME "libxo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxo 1.3.0"
+#define PACKAGE_STRING "libxo 1.3.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxo"
@@ -219,7 +219,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.0"
+#define PACKAGE_VERSION "1.3.1"
 
 /* If using the C implementat

svn commit: r354454 - vendor/Juniper/libxo/1.3.1

2019-11-07 Thread Phil Shafer

Author: phil
Date: Thu Nov  7 18:05:38 2019
New Revision: 354454
URL: https://svnweb.freebsd.org/changeset/base/354454

Log:
  Tag libxo 1.3.1

Added:
 - copied from r354453, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/1.3.1/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r354453 - in vendor/Juniper/libxo/dist: . libxo tests/core

2019-11-07 Thread Phil Shafer

Author: phil
Date: Thu Nov  7 18:05:26 2019
New Revision: 354453
URL: https://svnweb.freebsd.org/changeset/base/354453

Log:
  Import libxo 1.3.1

Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/tests/core/test_01.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Thu Nov  7 17:34:44 2019
(r354452)
+++ vendor/Juniper/libxo/dist/configure.ac  Thu Nov  7 18:05:26 2019
(r354453)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.3.0], [p...@juniper.net])
+AC_INIT([libxo], [1.3.1], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==
--- vendor/Juniper/libxo/dist/libxo/libxo.c Thu Nov  7 17:34:44 2019
(r354452)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Thu Nov  7 18:05:26 2019
(r354453)
@@ -8104,12 +8104,14 @@ xo_parse_args (int argc, char **argv)
 cp = strrchr(xo_program, '/');
 if (cp)
xo_program = ++cp;
+else
+   cp = argv[0];   /* Reset to front of string */
 
 /* GNU tools add an annoying ".test" as the program extension; remove it */
 size_t len = strlen(xo_program);
 static const char gnu_ext[] = ".test";
 if (len >= sizeof(gnu_ext)) {
-   cp = &cp[len + 1 - sizeof(gnu_ext)];
+   cp += len + 1 - sizeof(gnu_ext);
if (xo_streq(cp, gnu_ext))
*cp = '\0';
 }

Modified: vendor/Juniper/libxo/dist/tests/core/test_01.c
==
--- vendor/Juniper/libxo/dist/tests/core/test_01.c  Thu Nov  7 17:34:44 
2019(r354452)
+++ vendor/Juniper/libxo/dist/tests/core/test_01.c  Thu Nov  7 18:05:26 
2019(r354453)
@@ -50,6 +50,9 @@ main (int argc, char **argv)
{ "sold", "number", "Number of items sold" },
{ XO_INFO_NULL },
 };
+
+char name[] = "test_01.test";  /* test trimming of xo_program */
+argv[0] = name;
 
 argc = xo_parse_args(argc, argv);
 if (argc < 0)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r354431 - head/lib/libxo

2019-11-06 Thread Phil Shafer

Author: phil
Date: Thu Nov  7 07:09:28 2019
New Revision: 354431
URL: https://svnweb.freebsd.org/changeset/base/354431

Log:
  Back out encoder compilation to unbreak HEAD.

Modified:
  head/lib/libxo/Makefile

Modified: head/lib/libxo/Makefile
==
--- head/lib/libxo/Makefile Thu Nov  7 07:09:10 2019(r354430)
+++ head/lib/libxo/Makefile Thu Nov  7 07:09:28 2019(r354431)
@@ -114,6 +114,6 @@ MLINKS= xo_attr.3 xo_attr_h.3 \
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
-SUBDIR = encoder
+#SUBDIR = encoder
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r354427 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder contrib/libxo/encoder/cbor contrib/libxo/encoder/csv contrib/libxo/encoder/test contrib/libxo/libxo contrib/lib

2019-11-06 Thread Phil Shafer via svn-src-all


On 7 Nov 2019, at 1:15, Li-Wen Hsu wrote:

I'm not sure if this helps, but I found this error only happens in a
clean build. It might have something to do with the dependency
setting.


Well at least that may explain why it snuck in:  My import script does 
an "svn update", followed by a full build of the fresh tree, and then 
does a build with the incoming source, but I add a -DNO_CLEAN since I'm 
WITH_META_MODE.  The old bit it was it seemed to fail for all builds 
except amd64 (the one I build against).


I've got a fix building now. slowly

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r354427 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder contrib/libxo/encoder/cbor contrib/libxo/encoder/csv contrib/libxo/encoder/test contrib/libxo/libxo contrib/lib

2019-11-06 Thread Phil Shafer via svn-src-all

On 6 Nov 2019, at 22:57, Phil Shafer wrote:
>   Import libxo-1.3.0:
>   - move from "oxtradoc" to RST/Sphinx documentation
>   - new "csv" encoder, which allows path and leaf lists
>   - address warnings from PVS-Stdio tool
>   - add "xolint" detected errors to the documentation

Apologies; this commit has broken HEAD with:

--- all_subdir_lib/libxo ---
/usr/obj/usr/src/mips.mips64/tmp/usr/bin/ld: cannot find -lxo
*** [libenc_csv.so.0.full] Error code 1

I'm investigating now.

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r354427 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder contrib/libxo/encoder/cbor contrib/libxo/encoder/csv contrib/libxo/encoder/test contrib/libxo/libxo contrib/libx...

2019-11-06 Thread Phil Shafer

ribute operations,

Modified: head/contrib/libxo/doc/conf.py
==
--- head/contrib/libxo/doc/conf.py  Thu Nov  7 03:47:13 2019
(r354426)
+++ head/contrib/libxo/doc/conf.py  Thu Nov  7 03:57:04 2019
(r354427)
@@ -21,7 +21,15 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 
+import subprocess
 
+#
+# Instead of hardcoding the version number here, we read it from the
+# project's configure script
+#
+vers_cmd = "grep AC_INIT ../configure.ac | awk '{ print substr($2, 2, 
length($2) - 3);}'"
+version = subprocess.check_output(vers_cmd, shell=True).decode("utf-8") 
+
 # -- General configuration 
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -47,7 +55,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'libxo'
-copyright = '2017, Juniper Networks'
+copyright = '2017-2019, Juniper Networks Inc'
 author = 'Phil Shafer'
 default_role = 'code'
 primary_domain = 'c'
@@ -58,9 +66,9 @@ smart_quotes = False
 # built documents.
 #
 # The short X.Y version.
-version = '0.8.4'
+#version = 'develop'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.4'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Copied: head/contrib/libxo/doc/encoders.rst (from r354426, 
vendor/Juniper/libxo/dist/doc/encoders.rst)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/libxo/doc/encoders.rst Thu Nov  7 03:57:04 2019
(r354427, copy of r354426, vendor/Juniper/libxo/dist/doc/encoders.rst)
@@ -0,0 +1,269 @@
+.. index:: encoder
+
+Encoders
+
+
+This section gives an overview of encoders, details on the encoders
+that ship with libxo, and documentation for developers of future
+encoders.
+
+Overview
+
+
+The libxo library contains software to generate four "built-in"
+formats: text, XML, JSON, and HTML.  These formats are common and
+useful, but there are other common and useful formats that users will
+want, and including them all in the libxo software would be difficult
+and cumbersome.
+
+To allow support for additional encodings, libxo includes a
+"pluggable" extension mechanism for dynamically loading new encoders.
+libxo-based applications can automatically use any installed encoder.
+
+Use the "encoder=XXX" option to access encoders.  The following
+example uses the "cbor" encoder, saving the output into a file::
+
+df --libxo encoder=cbor > df-output.cbor
+
+Encoders can support specific options that can be accessed by
+following the encoder name with a colon (':') and one of more options,
+separated by a plus sign "+"::
+
+df --libxo encoder=csv:path=filesystem+leaf=name+no-header
+
+This example instructs libxo to load the "csv" encoder and pass the
+following options::
+
+   path=filesystem
+   leaf=name
+   no-header
+
+Each of these option is interpreted by the encoder, and all such
+options names and semantics are specific to the particular encoder.
+Refer to the intended encoder for documentation on its options.
+
+.. _csv_encoder:
+
+CSV - Comma Separated Values
+
+
+libxo ships with a custom encoder for "CSV" files, a common format for
+comma separated values.  The output of the CSV encoder can be loaded
+directly into spreadsheets or similar applications.
+
+A standard for CSV files is provided in :RFC:`4180`, but since the
+format predates that standard by decades, there are many minor
+differences in CSV file consumers and their expectations.  The CSV
+encoder has a number of options to tailor output to those
+expectations.
+
+Consider the following XML::
+
+  % list-items --libxo xml,pretty
+  
+
+  
+GRO-000-415
+gum
+1412
+54
+10
+  
+  
+HRD-000-212
+rope
+85
+4
+2
+  
+  
+HRD-000-517
+ladder
+0
+2
+1
+  
+
+  
+
+This output is a list of `instances` (named "item"), each containing a
+set of `leafs` ("sku", "name", etc).
+
+The CSV encoder will emit the leaf values in this output as `fields`
+inside a CSV `record`, which is a line containing a set of
+comma-separated values::
+
+  % list-items --libxo encoder=csv
+  sku,name,sold,in-stock,on-order
+  GRO-000-415,gum,1412,54,10
+  HRD-000-212,rope,85,4,2
+  HRD-000-517,ladder,0,2,1
+
+Be aware that since the CSV encoder looks for data instances, when
+used with :ref:`xo`, the `--insta

svn commit: r354426 - vendor/Juniper/libxo/1.3.0

2019-11-06 Thread Phil Shafer

Author: phil
Date: Thu Nov  7 03:47:13 2019
New Revision: 354426
URL: https://svnweb.freebsd.org/changeset/base/354426

Log:
  Tag libxo 1.3.0

Added:
 - copied from r354425, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/1.3.0/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r354425 - in vendor/Juniper/libxo/dist: . doc encoder encoder/cbor encoder/csv encoder/test libxo tests/core tests/core/saved tests/gettext tests/gettext/saved tests/xo/saved xo xolint

2019-11-06 Thread Phil Shafer

f the construct.  For string, content, and attribute operations,

Modified: vendor/Juniper/libxo/dist/doc/conf.py
==
--- vendor/Juniper/libxo/dist/doc/conf.py   Thu Nov  7 00:28:50 2019
(r354424)
+++ vendor/Juniper/libxo/dist/doc/conf.py   Thu Nov  7 03:46:17 2019
(r354425)
@@ -21,7 +21,15 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 
+import subprocess
 
+#
+# Instead of hardcoding the version number here, we read it from the
+# project's configure script
+#
+vers_cmd = "grep AC_INIT ../configure.ac | awk '{ print substr($2, 2, 
length($2) - 3);}'"
+version = subprocess.check_output(vers_cmd, shell=True).decode("utf-8") 
+
 # -- General configuration 
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -47,7 +55,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'libxo'
-copyright = '2017, Juniper Networks'
+copyright = '2017-2019, Juniper Networks Inc'
 author = 'Phil Shafer'
 default_role = 'code'
 primary_domain = 'c'
@@ -58,9 +66,9 @@ smart_quotes = False
 # built documents.
 #
 # The short X.Y version.
-version = '0.8.4'
+#version = 'develop'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.4'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Added: vendor/Juniper/libxo/dist/doc/encoders.rst
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/dist/doc/encoders.rst  Thu Nov  7 03:46:17 2019
(r354425)
@@ -0,0 +1,269 @@
+.. index:: encoder
+
+Encoders
+
+
+This section gives an overview of encoders, details on the encoders
+that ship with libxo, and documentation for developers of future
+encoders.
+
+Overview
+
+
+The libxo library contains software to generate four "built-in"
+formats: text, XML, JSON, and HTML.  These formats are common and
+useful, but there are other common and useful formats that users will
+want, and including them all in the libxo software would be difficult
+and cumbersome.
+
+To allow support for additional encodings, libxo includes a
+"pluggable" extension mechanism for dynamically loading new encoders.
+libxo-based applications can automatically use any installed encoder.
+
+Use the "encoder=XXX" option to access encoders.  The following
+example uses the "cbor" encoder, saving the output into a file::
+
+df --libxo encoder=cbor > df-output.cbor
+
+Encoders can support specific options that can be accessed by
+following the encoder name with a colon (':') and one of more options,
+separated by a plus sign "+"::
+
+df --libxo encoder=csv:path=filesystem+leaf=name+no-header
+
+This example instructs libxo to load the "csv" encoder and pass the
+following options::
+
+   path=filesystem
+   leaf=name
+   no-header
+
+Each of these option is interpreted by the encoder, and all such
+options names and semantics are specific to the particular encoder.
+Refer to the intended encoder for documentation on its options.
+
+.. _csv_encoder:
+
+CSV - Comma Separated Values
+
+
+libxo ships with a custom encoder for "CSV" files, a common format for
+comma separated values.  The output of the CSV encoder can be loaded
+directly into spreadsheets or similar applications.
+
+A standard for CSV files is provided in :RFC:`4180`, but since the
+format predates that standard by decades, there are many minor
+differences in CSV file consumers and their expectations.  The CSV
+encoder has a number of options to tailor output to those
+expectations.
+
+Consider the following XML::
+
+  % list-items --libxo xml,pretty
+  
+
+  
+GRO-000-415
+gum
+1412
+54
+10
+  
+  
+HRD-000-212
+rope
+85
+4
+2
+  
+  
+HRD-000-517
+ladder
+0
+2
+1
+  
+
+  
+
+This output is a list of `instances` (named "item"), each containing a
+set of `leafs` ("sku", "name", etc).
+
+The CSV encoder will emit the leaf values in this output as `fields`
+inside a CSV `record`, which is a line containing a set of
+comma-separated values::
+
+  % list-items --libxo encoder=csv
+  sku,name,sold,in-stock,on-order
+  GRO-000-415,gum,1412,54,10
+  HRD-000-212,rope,85,4,2
+  HRD-000-517,ladder,0,2,1
+
+Be aware that since the CSV encoder looks for data instances, when
+used with :ref:`xo`, the `--instance` option will be needed::
+
+  % xo --libxo

Re: svn commit: r345967 - head/contrib/libxo/libxo

2019-09-03 Thread Phil Shafer via svn-src-all

On 5 Apr 2019, at 16:23, Enji Cooper wrote:
> Could you please add a test for this as well upstream?

Yup, it's in the same libxo patch in GitHub.

Thanks,
 Phil


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345967 - head/contrib/libxo/libxo

2019-09-03 Thread Phil Shafer

Author: phil
Date: Fri Apr  5 19:42:54 2019
New Revision: 345967
URL: https://svnweb.freebsd.org/changeset/base/345967

Log:
  Emergency fix for NULL deref in xo_xml_leader_len

Modified:
  head/contrib/libxo/libxo/libxo.c

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cFri Apr  5 19:32:26 2019
(r345966)
+++ head/contrib/libxo/libxo/libxo.cFri Apr  5 19:42:54 2019
(r345967)
@@ -600,7 +600,7 @@ xo_no_setlocale (void)
 static const char *
 xo_xml_leader_len (xo_handle_t *xop, const char *name, xo_ssize_t nlen)
 {
-if (isalpha(name[0]) || name[0] == '_')
+if (name == NULL || isalpha(name[0]) || name[0] == '_')
 return "";
 
 xo_failure(xop, "invalid XML tag name: '%.*s'", nlen, name);


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345856 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved tests/gettext tests/gettext/po/pig_latin tests/gettext/saved tests/xo tests/xo/saved xo

2019-09-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 21:47:19 2019
New Revision: 345856
URL: https://svnweb.freebsd.org/changeset/base/345856

Log:
  Import libxo 1.0.2

Added:
  vendor/Juniper/libxo/dist/libxo/xo_explicit.h   (contents, props changed)
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.out
  vendor/Juniper/libxo/dist/tests/xo/xo_02.sh   (contents, props changed)
Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/api.rst
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/doc/xo.rst
  vendor/Juniper/libxo/dist/libxo/Makefile.am
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo.h
  vendor/Juniper/libxo/dist/libxo/xo_attr.3
  vendor/Juniper/libxo/dist/libxo/xo_buf.h
  vendor/Juniper/libxo/dist/libxo/xo_emit.3
  vendor/Juniper/libxo/dist/libxo/xo_emit_f.3
  vendor/Juniper/libxo/dist/libxo/xo_finish.3
  vendor/Juniper/libxo/dist/libxo/xo_flush.3
  vendor/Juniper/libxo/dist/libxo/xo_open_container.3
  vendor/Juniper/libxo/dist/libxo/xo_open_list.3
  vendor/Juniper/libxo/dist/libxo/xo_open_marker.3
  vendor/Juniper/libxo/dist/libxo/xo_set_writer.3
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_04.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_05.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_05.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_06.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_07.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_08.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_09.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_10.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_11.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_12.c
  vendor/Juniper/libxo/dist/tests/gettext/po/pig_latin/strerror.po
  vendor/Juniper/libxo/dist/tests/gettext/saved/gt_01.J.out
  vendor/Juniper/libxo/dist/tests/gettext/strerror.pot
  vendor/Juniper/libxo/dist/tests/xo/Makefile.am
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.H.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.HIPx.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.HP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.J.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.JP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.T.out
  vendor/Juniper/libxo/dist/tests/xo/xo_01.sh
  vendor/Juniper/libxo/dist/xo/xo.1
  vendor/Juniper/libxo/dist/xo/xo.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Wed Apr  3 21:01:53 2019
(r345855)
+++ vendor/Juniper/libxo/dist/configure.ac  Wed Apr  3 21:47:19 2019
(r345856)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.9.0], [p...@juniper.net])
+AC_INIT([libxo], [1.0.2], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 #

svn commit: r345857 - vendor/Juniper/libxo/1.0.2

2019-09-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 21:48:09 2019
New Revision: 345857
URL: https://svnweb.freebsd.org/changeset/base/345857

Log:
  Tag libxo 1.0.2

Added:
 - copied from r345856, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/1.0.2/   (props changed)


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345859 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/tests/gettext/po/pig_latin contrib/libxo/tes...

2019-09-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 21:55:39 2019
New Revision: 345859
URL: https://svnweb.freebsd.org/changeset/base/345859

Log:
  Import libxo-1.0.2
  
  from 1.0.0:
  Add "continuation" flag, to allow multiple "xo" invocations in a single 
line of output (#58)
  Add --top-wrap to make top-level JSON wrappers
  Add --{open,close}-{list,instace} options
  Add xo_xml_leader(), to detect use of some bogus XML tags. It's still bad 
form, but it's a little safer now
  Avoid call to xo_write before xo_flush, since the latter calls the former
  Check return code from xo_flush_h properly (<0) (FreeBSD Bug 236935)
  For JSON output, avoid newline before a container's close brace (#62)
  Merge branch 'text_only' of https://github.com/zvr/libxo into 
zvr-text_only
  Use XO_USE_INT_RETURN_CODES, not USE_INT_RETURN_CODES
  add docs for --continuation
  add docs for --not-first
  call xo_state_set_flags before values and close containers; add 
XOIF_MADE_OUTPUT flag to track state; make proper empty JSON objects in 
xo_finish
  color_map code has to be #ifdef'd out, since the struct definition
  correct xo_flush_func_t (doesn't use xo_ssize_t)
  make depth change for --top-wrap only for JSON
  fix to handle --top-wrap in "xo" by being more consistent with handling 
trailing newlines
  fix to handle text-only version #64 (from zvr)
  fix xo_buf_has_room for round up to the next XO_BUFSIZ, not just add 
XO_BUFSIZ to the size (FreeBSD Bug 236937)
  update docs for new "xo" options
  update functions to use xo_ssize_t
  update test cases
  from 1.0.1:
  Add EINTEGRITY to .pot files under test/gettext/ (fix from FreeBSD)
  from 1.0.2:
  handle failure from xo_vnsprintf; don't add -1 to "rc"
  
  PR:   236937, 236935
  Submitted by: phil
  Reported by:  Alfonso S. Siciliano 
  MFC after:2 weeks

Added:
  head/contrib/libxo/libxo/xo_explicit.h
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/libxo/xo_explicit.h
  head/contrib/libxo/tests/xo/saved/xo_02.H.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.err
  head/contrib/libxo/tests/xo/saved/xo_02.H.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.out
  head/contrib/libxo/tests/xo/saved/xo_02.HIPx.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.err
  head/contrib/libxo/tests/xo/saved/xo_02.HIPx.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.out
  head/contrib/libxo/tests/xo/saved/xo_02.HP.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.err
  head/contrib/libxo/tests/xo/saved/xo_02.HP.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.out
  head/contrib/libxo/tests/xo/saved/xo_02.J.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.err
  head/contrib/libxo/tests/xo/saved/xo_02.J.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.out
  head/contrib/libxo/tests/xo/saved/xo_02.JP.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.err
  head/contrib/libxo/tests/xo/saved/xo_02.JP.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.out
  head/contrib/libxo/tests/xo/saved/xo_02.T.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.err
  head/contrib/libxo/tests/xo/saved/xo_02.T.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.out
  head/contrib/libxo/tests/xo/saved/xo_02.X.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.err
  head/contrib/libxo/tests/xo/saved/xo_02.X.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.out
  head/contrib/libxo/tests/xo/saved/xo_02.XP.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.err
  head/contrib/libxo/tests/xo/saved/xo_02.XP.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.out
  head/contrib/libxo/tests/xo/xo_02.sh
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/xo_02.sh
Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/api.rst
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/doc/xo.rst
  head/contrib/libxo/libxo/Makefile.am
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo.h
  head/contrib/libxo/libxo/xo_attr.3
  head/contrib/libxo/libxo/xo_buf.h
  head/contrib/libxo/libxo/xo_emit.3
  head/contrib/libxo/libxo/xo_emit_f.3
  head/contrib/libxo/libxo/xo_finish.3
  head/contrib/libxo/libxo/xo_flush.3
  head/contrib/libxo/libxo/xo_open_container.3
  head/contrib/libxo/libxo/xo_open_list.3

Re: svn commit: r345860 - vendor/Juniper/libxo

2019-09-03 Thread Phil Shafer via svn-src-all


On 3 Apr 2019, at 23:07, Enji Cooper wrote:
I could be wrong, but I’m guessing `GMAKE` needs to be replaced with 
`MAKE`..?


GMAKE is set inside the import script, where MAKE=gmake is for 
configure.


Also, why does a configure script need gmake? It seems like the 
snippets that make libxo should be made more portable with autoconf, 
if that’s the case.


configure uses gmake to build dependencies, but assumes "make" means 
gmake (${MAKE-make}).  When it finds real make instead it will complain:


Something went wrong bootstrapping makefile fragments
for automatic dependency tracking.  Try re-running configure with 
the

'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency 
tracking).

See `config.log' for more details

The autoconf tools are increasingly linux-centric, so the MAKE=gmake is 
needed for BSD platforms.  Longer term, I will probably move away from 
them, as more problems are appearing.  For example, libtool is not 
naming test executables "lt-text_01.test", which makes the output of 
"make test" different under linux (since error messages include argv[0]. 
 So now I need to call xo_program() to explicitly set the name.  
Eventually cost(work-arounds) > cost(requiring-bmake).


Thanks,
 Phil


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345860 - vendor/Juniper/libxo

2019-09-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 22:30:20 2019
New Revision: 345860
URL: https://svnweb.freebsd.org/changeset/base/345860

Log:
  Add "MAKE=gmake" to "configure" invocations in libxo import script

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Wed Apr  3 21:55:39 2019
(r345859)
+++ vendor/Juniper/libxo/import.sh  Wed Apr  3 22:30:20 2019
(r345860)
@@ -280,12 +280,12 @@ Cd $CWD/dist
 run "autoreconf" "autoreconf --install --force"
 
 Cd $CWD/dist/build
-run "configure for testing" "../configure --prefix $CWD/dist/build/root"
+run "configure for testing" "env MAKE=gmake ../configure --prefix 
$CWD/dist/build/root"
 run "build and test" \
 "${GMAKE} clean && ${GMAKE} && ${GMAKE} install && ${GMAKE} test"
 
 # Freebsd lacks stock gettext, so don't build it
-run "configure for real" "../configure --disable-gettext --prefix /usr"
+run "configure for real" "env MAKE=gmake ../configure --disable-gettext 
--prefix /usr"
 run "build for real" \
 "${GMAKE} clean && ${GMAKE}"
 


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r347207 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/xo lib/libxo usr.bin/xohtml

2019-05-06 Thread Phil Shafer

Author: phil
Date: Mon May  6 20:20:21 2019
New Revision: 347207
URL: https://svnweb.freebsd.org/changeset/base/347207

Log:
  Import libxo-1.0.4:
  - Avoid NULL deref in xo_xml_leader_len (replacing local fix in rS345967)
  - update copyright dates
  - update test cases
  - fix uncommitted version change
  
  Submitted by: phil
  MFC after:2 weeks

Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo_explicit.h
  head/contrib/libxo/tests/core/saved/test_02.E.err
  head/contrib/libxo/tests/core/saved/test_02.E.out
  head/contrib/libxo/tests/core/saved/test_02.H.err
  head/contrib/libxo/tests/core/saved/test_02.H.out
  head/contrib/libxo/tests/core/saved/test_02.HIPx.err
  head/contrib/libxo/tests/core/saved/test_02.HIPx.out
  head/contrib/libxo/tests/core/saved/test_02.HP.err
  head/contrib/libxo/tests/core/saved/test_02.HP.out
  head/contrib/libxo/tests/core/saved/test_02.J.err
  head/contrib/libxo/tests/core/saved/test_02.J.out
  head/contrib/libxo/tests/core/saved/test_02.JP.err
  head/contrib/libxo/tests/core/saved/test_02.JP.out
  head/contrib/libxo/tests/core/saved/test_02.T.err
  head/contrib/libxo/tests/core/saved/test_02.T.out
  head/contrib/libxo/tests/core/saved/test_02.X.err
  head/contrib/libxo/tests/core/saved/test_02.X.out
  head/contrib/libxo/tests/core/saved/test_02.XP.err
  head/contrib/libxo/tests/core/saved/test_02.XP.out
  head/contrib/libxo/tests/core/test_01.c
  head/contrib/libxo/tests/core/test_02.c
  head/contrib/libxo/xo/xo.c
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
  head/usr.bin/xohtml/xohtml.sh
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Mon May  6 20:15:18 2019
(r347206)
+++ head/contrib/libxo/configure.ac Mon May  6 20:20:21 2019
(r347207)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.0.2], [p...@juniper.net])
+AC_INIT([libxo], [1.0.4], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlMon May  6 20:15:18 2019
(r347206)
+++ head/contrib/libxo/doc/libxo-manual.htmlMon May  6 20:20:21 2019
(r347207)
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-April 2, 2019
+April 24, 2019
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cMon May  6 20:15:18 2019
(r347206)
+++ head/contrib/libxo/libxo/libxo.cMon May  6 20:20:21 2019
(r347207)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Juniper Networks, Inc.
+ * Copyright (c) 2014-2019, Juniper Networks, Inc.
  * All rights reserved.
  * This SOFTWARE is licensed under the LICENSE provided in the
  * ../Copyright file. By downloading, installing, copying, or otherwise

Modified: head/contrib/libxo/libxo/xo_explicit.h
==
--- head/contrib/libxo/libxo/xo_explicit.h  Mon May  6 20:15:18 2019
(r347206)
+++ head/contrib/libxo/libxo/xo_explicit.h  Mon May  6 20:20:21 2019
(r347207)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Juniper Networks, Inc.
+ * Copyright (c) 2019, Juniper Networks, Inc.
  * All rights reserved.
  * This SOFTWARE is licensed under the LICENSE provided in the
  * ../Copyright file. By downloading, installing, copying, or otherwise

Modified: head/contrib/libxo/tests/core/saved/test_02.E.err
==
--- head/contrib/libxo/tests/core/saved/test_02.E.err   Mon May  6 20:15:18 
2019(r347206)
+++ head/contrib/libxo/tests/core/saved/test_02.E.err   Mon May  6 20:20:21 
2019(r347207)
@@ -0,0 +1 @@
+test_02.test: key field emitted after normal value field: 'name'

Modified: head/contrib/libxo/tests/core/saved/test_02.E.out
==
--- head/contrib/libxo/tests/core/saved/test_02.E.out   Mon May  6 20:15:18 
2019(r347206)
+++ head/contrib/libxo/tests/core/saved/test_02.E.out   Mon May  6 20:20:21 
2019(r347207)
@@ -1,6 +1,10 @@
 op create: [] [] [0]
 op open_container: [top] [] [0x40010]
 op open_container: [data] [] [0x40010]
+op string: [name] [em0] [0x1080]
+op string: [flags] [0x8843] [0x18]
+op string: [name] [em0] [0x1088]
+op string: [flags] [0x8843] [0x18]
 op string: [what] [braces] [0]
 op string: [length] [abcdef] [0]
 o

svn commit: r347205 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved xo

2019-05-06 Thread Phil Shafer

Author: phil
Date: Mon May  6 20:15:00 2019
New Revision: 347205
URL: https://svnweb.freebsd.org/changeset/base/347205

Log:
  Import libxo 1.0.4

Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo_explicit.h
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.H.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.HIPx.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.HP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.J.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.JP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.T.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.X.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.XP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_01.c
  vendor/Juniper/libxo/dist/tests/core/test_02.c
  vendor/Juniper/libxo/dist/xo/xo.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Mon May  6 20:01:13 2019
(r347204)
+++ vendor/Juniper/libxo/dist/configure.ac  Mon May  6 20:15:00 2019
(r347205)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.0.2], [p...@juniper.net])
+AC_INIT([libxo], [1.0.4], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Mon May  6 20:01:13 
2019(r347204)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Mon May  6 20:15:00 
2019(r347205)
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-April 2, 2019
+April 24, 2019
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==
--- vendor/Juniper/libxo/dist/libxo/libxo.c Mon May  6 20:01:13 2019
(r347204)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Mon May  6 20:15:00 2019
(r347205)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Juniper Networks, Inc.
+ * Copyright (c) 2014-2019, Juniper Networks, Inc.
  * All rights reserved.
  * This SOFTWARE is licensed under the LICENSE provided in the
  * ../Copyright file. By downloading, installing, copying, or otherwise
@@ -600,7 +600,7 @@ xo_no_setlocale (void)
 static const char *
 xo_xml_leader_len (xo_handle_t *xop, const char *name, xo_ssize_t nlen)
 {
-if (isalpha(name[0]) || name[0] == '_')
+if (name == NULL || isalpha(name[0]) || name[0] == '_')
 return "";
 
 xo_failure(xop, "invalid XML tag name: '%.*s'", nlen, name);

Modified: vendor/Juniper/libxo/dist/libxo/xo_explicit.h
==
--- vendor/Juniper/libxo/dist/libxo/xo_explicit.h   Mon May  6 20:01:13 
2019(r347204)
+++ vendor/Juniper/libxo/dist/libxo/xo_explicit.h   Mon May  6 20:15:00 
2019(r347205)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Juniper Networks, Inc.
+ * Copyright (c) 2019, Juniper Networks, Inc.
  * All rights reserved.
  * This SOFTWARE is licensed under the LICENSE provided in the
  * ../Copyright file. By downloading, installing, copying, or otherwise

Modified: vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.err
==
--- vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.errMon May  6 
20:01:13 2019(r347204)
+++ vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.errMon May  6 
20:15:00 2019(r347205)
@@ -0,0 +1 @@
+test_02.test: key field emitted after normal value field: 'name'

Modified: vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.out
==
--- vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.outMon May  6 
20:01:13 2019(r347204)
+++ vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.outMon May  6 
20:15:00 2019(r347205)
@@ -1,6 +1,10 @@
 op create: [] [] [

svn commit: r347206 - vendor/Juniper/libxo/1.0.4

2019-05-06 Thread Phil Shafer

Author: phil
Date: Mon May  6 20:15:18 2019
New Revision: 347206
URL: https://svnweb.freebsd.org/changeset/base/347206

Log:
  Tag libxo 1.0.4

Added:
 - copied from r347205, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/1.0.4/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r345967 - head/contrib/libxo/libxo

2019-04-06 Thread Phil Shafer via svn-src-all

On 5 Apr 2019, at 16:23, Enji Cooper wrote:
> Could you please add a test for this as well upstream?

Yup, it's in the same libxo patch in GitHub.

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345967 - head/contrib/libxo/libxo

2019-04-05 Thread Phil Shafer

Author: phil
Date: Fri Apr  5 19:42:54 2019
New Revision: 345967
URL: https://svnweb.freebsd.org/changeset/base/345967

Log:
  Emergency fix for NULL deref in xo_xml_leader_len

Modified:
  head/contrib/libxo/libxo/libxo.c

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cFri Apr  5 19:32:26 2019
(r345966)
+++ head/contrib/libxo/libxo/libxo.cFri Apr  5 19:42:54 2019
(r345967)
@@ -600,7 +600,7 @@ xo_no_setlocale (void)
 static const char *
 xo_xml_leader_len (xo_handle_t *xop, const char *name, xo_ssize_t nlen)
 {
-if (isalpha(name[0]) || name[0] == '_')
+if (name == NULL || isalpha(name[0]) || name[0] == '_')
 return "";
 
 xo_failure(xop, "invalid XML tag name: '%.*s'", nlen, name);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r345860 - vendor/Juniper/libxo

2019-04-03 Thread Phil Shafer via svn-src-all


On 3 Apr 2019, at 23:07, Enji Cooper wrote:
I could be wrong, but I’m guessing `GMAKE` needs to be replaced with 
`MAKE`..?


GMAKE is set inside the import script, where MAKE=gmake is for 
configure.


Also, why does a configure script need gmake? It seems like the 
snippets that make libxo should be made more portable with autoconf, 
if that’s the case.


configure uses gmake to build dependencies, but assumes "make" means 
gmake (${MAKE-make}).  When it finds real make instead it will complain:


Something went wrong bootstrapping makefile fragments
for automatic dependency tracking.  Try re-running configure with 
the

'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency 
tracking).

See `config.log' for more details

The autoconf tools are increasingly linux-centric, so the MAKE=gmake is 
needed for BSD platforms.  Longer term, I will probably move away from 
them, as more problems are appearing.  For example, libtool is not 
naming test executables "lt-text_01.test", which makes the output of 
"make test" different under linux (since error messages include argv[0]. 
 So now I need to call xo_program() to explicitly set the name.  
Eventually cost(work-arounds) > cost(requiring-bmake).


Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345860 - vendor/Juniper/libxo

2019-04-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 22:30:20 2019
New Revision: 345860
URL: https://svnweb.freebsd.org/changeset/base/345860

Log:
  Add "MAKE=gmake" to "configure" invocations in libxo import script

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Wed Apr  3 21:55:39 2019
(r345859)
+++ vendor/Juniper/libxo/import.sh  Wed Apr  3 22:30:20 2019
(r345860)
@@ -280,12 +280,12 @@ Cd $CWD/dist
 run "autoreconf" "autoreconf --install --force"
 
 Cd $CWD/dist/build
-run "configure for testing" "../configure --prefix $CWD/dist/build/root"
+run "configure for testing" "env MAKE=gmake ../configure --prefix 
$CWD/dist/build/root"
 run "build and test" \
 "${GMAKE} clean && ${GMAKE} && ${GMAKE} install && ${GMAKE} test"
 
 # Freebsd lacks stock gettext, so don't build it
-run "configure for real" "../configure --disable-gettext --prefix /usr"
+run "configure for real" "env MAKE=gmake ../configure --disable-gettext 
--prefix /usr"
 run "build for real" \
 "${GMAKE} clean && ${GMAKE}"
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345859 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/tests/gettext/po/pig_latin contrib/libxo/tes...

2019-04-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 21:55:39 2019
New Revision: 345859
URL: https://svnweb.freebsd.org/changeset/base/345859

Log:
  Import libxo-1.0.2
  
  from 1.0.0:
  Add "continuation" flag, to allow multiple "xo" invocations in a single 
line of output (#58)
  Add --top-wrap to make top-level JSON wrappers
  Add --{open,close}-{list,instace} options
  Add xo_xml_leader(), to detect use of some bogus XML tags. It's still bad 
form, but it's a little safer now
  Avoid call to xo_write before xo_flush, since the latter calls the former
  Check return code from xo_flush_h properly (<0) (FreeBSD Bug 236935)
  For JSON output, avoid newline before a container's close brace (#62)
  Merge branch 'text_only' of https://github.com/zvr/libxo into 
zvr-text_only
  Use XO_USE_INT_RETURN_CODES, not USE_INT_RETURN_CODES
  add docs for --continuation
  add docs for --not-first
  call xo_state_set_flags before values and close containers; add 
XOIF_MADE_OUTPUT flag to track state; make proper empty JSON objects in 
xo_finish
  color_map code has to be #ifdef'd out, since the struct definition
  correct xo_flush_func_t (doesn't use xo_ssize_t)
  make depth change for --top-wrap only for JSON
  fix to handle --top-wrap in "xo" by being more consistent with handling 
trailing newlines
  fix to handle text-only version #64 (from zvr)
  fix xo_buf_has_room for round up to the next XO_BUFSIZ, not just add 
XO_BUFSIZ to the size (FreeBSD Bug 236937)
  update docs for new "xo" options
  update functions to use xo_ssize_t
  update test cases
  from 1.0.1:
  Add EINTEGRITY to .pot files under test/gettext/ (fix from FreeBSD)
  from 1.0.2:
  handle failure from xo_vnsprintf; don't add -1 to "rc"
  
  PR:   236937, 236935
  Submitted by: phil
  Reported by:  Alfonso S. Siciliano 
  MFC after:2 weeks

Added:
  head/contrib/libxo/libxo/xo_explicit.h
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/libxo/xo_explicit.h
  head/contrib/libxo/tests/xo/saved/xo_02.H.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.err
  head/contrib/libxo/tests/xo/saved/xo_02.H.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.out
  head/contrib/libxo/tests/xo/saved/xo_02.HIPx.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.err
  head/contrib/libxo/tests/xo/saved/xo_02.HIPx.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.out
  head/contrib/libxo/tests/xo/saved/xo_02.HP.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.err
  head/contrib/libxo/tests/xo/saved/xo_02.HP.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.out
  head/contrib/libxo/tests/xo/saved/xo_02.J.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.err
  head/contrib/libxo/tests/xo/saved/xo_02.J.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.out
  head/contrib/libxo/tests/xo/saved/xo_02.JP.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.err
  head/contrib/libxo/tests/xo/saved/xo_02.JP.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.out
  head/contrib/libxo/tests/xo/saved/xo_02.T.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.err
  head/contrib/libxo/tests/xo/saved/xo_02.T.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.out
  head/contrib/libxo/tests/xo/saved/xo_02.X.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.err
  head/contrib/libxo/tests/xo/saved/xo_02.X.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.out
  head/contrib/libxo/tests/xo/saved/xo_02.XP.err
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.err
  head/contrib/libxo/tests/xo/saved/xo_02.XP.out
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.out
  head/contrib/libxo/tests/xo/xo_02.sh
 - copied unchanged from r345857, 
vendor/Juniper/libxo/dist/tests/xo/xo_02.sh
Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/api.rst
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/doc/xo.rst
  head/contrib/libxo/libxo/Makefile.am
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo.h
  head/contrib/libxo/libxo/xo_attr.3
  head/contrib/libxo/libxo/xo_buf.h
  head/contrib/libxo/libxo/xo_emit.3
  head/contrib/libxo/libxo/xo_emit_f.3
  head/contrib/libxo/libxo/xo_finish.3
  head/contrib/libxo/libxo/xo_flush.3
  head/contrib/libxo/libxo/xo_open_container.3
  head/contrib/libxo/libxo/xo_open_list.3

svn commit: r345857 - vendor/Juniper/libxo/1.0.2

2019-04-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 21:48:09 2019
New Revision: 345857
URL: https://svnweb.freebsd.org/changeset/base/345857

Log:
  Tag libxo 1.0.2

Added:
 - copied from r345856, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/1.0.2/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r345856 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved tests/gettext tests/gettext/po/pig_latin tests/gettext/saved tests/xo tests/xo/saved xo

2019-04-03 Thread Phil Shafer

Author: phil
Date: Wed Apr  3 21:47:19 2019
New Revision: 345856
URL: https://svnweb.freebsd.org/changeset/base/345856

Log:
  Import libxo 1.0.2

Added:
  vendor/Juniper/libxo/dist/libxo/xo_explicit.h   (contents, props changed)
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.H.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HIPx.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.HP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.J.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.JP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.T.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.X.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.err
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_02.XP.out
  vendor/Juniper/libxo/dist/tests/xo/xo_02.sh   (contents, props changed)
Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/api.rst
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/doc/xo.rst
  vendor/Juniper/libxo/dist/libxo/Makefile.am
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo.h
  vendor/Juniper/libxo/dist/libxo/xo_attr.3
  vendor/Juniper/libxo/dist/libxo/xo_buf.h
  vendor/Juniper/libxo/dist/libxo/xo_emit.3
  vendor/Juniper/libxo/dist/libxo/xo_emit_f.3
  vendor/Juniper/libxo/dist/libxo/xo_finish.3
  vendor/Juniper/libxo/dist/libxo/xo_flush.3
  vendor/Juniper/libxo/dist/libxo/xo_open_container.3
  vendor/Juniper/libxo/dist/libxo/xo_open_list.3
  vendor/Juniper/libxo/dist/libxo/xo_open_marker.3
  vendor/Juniper/libxo/dist/libxo/xo_set_writer.3
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_04.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_05.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_05.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_06.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_07.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_08.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_09.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_10.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_11.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_12.c
  vendor/Juniper/libxo/dist/tests/gettext/po/pig_latin/strerror.po
  vendor/Juniper/libxo/dist/tests/gettext/saved/gt_01.J.out
  vendor/Juniper/libxo/dist/tests/gettext/strerror.pot
  vendor/Juniper/libxo/dist/tests/xo/Makefile.am
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.H.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.HIPx.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.HP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.J.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.JP.out
  vendor/Juniper/libxo/dist/tests/xo/saved/xo_01.T.out
  vendor/Juniper/libxo/dist/tests/xo/xo_01.sh
  vendor/Juniper/libxo/dist/xo/xo.1
  vendor/Juniper/libxo/dist/xo/xo.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Wed Apr  3 21:01:53 2019
(r345855)
+++ vendor/Juniper/libxo/dist/configure.ac  Wed Apr  3 21:47:19 2019
(r345856)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.9.0], [p...@juniper.net])
+AC_INIT([libxo], [1.0.2], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 #

Re: svn commit: r337536 - head/sbin/ipfw

2018-08-10 Thread Phil Shafer

>> +++ head/sbin/ipfw/ipfw2.c   Thu Aug  9 12:46:30 2018(r337536)
>> @@ -3271,9 +3271,11 @@ ipfw_delete(char *av[])
>>  exitval = do_cmd(IP_FW_NAT_DEL, &i, sizeof i);
>>  if (exitval) {
>>  exitval = EX_UNAVAILABLE;
>> -warn("rule %u not available", i);
>> +if (co.do_quiet)
>> +continue;
>> +warn("nat %u not available", i);

Was the change in the message intentional?

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r334068 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/doc/_static contrib/libxo/doc/_templates contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved con...

2018-05-22 Thread Phil Shafer

Author: phil
Date: Wed May 23 01:20:31 2018
New Revision: 334068
URL: https://svnweb.freebsd.org/changeset/base/334068

Log:
  Import libxo-0.9.0:
  - Add xo_format_is_numeric() with improved logic to decide if format
strings are numeric, so json output quotes them
  - Convert docs to sphinx/rst
  - update tests
  
  Includes fix for PR 221676:
  
https://github.com/Juniper/libxo/commit/27d3021cc3cc8cfbe9ddee5930cd7a9afea8f68f#diff-5a0d468963477f7daedb8308c219dd80
  
  PR:221676
  MFC after:5 days

Added:
  head/contrib/libxo/doc/_static/
 - copied from r334067, vendor/Juniper/libxo/dist/doc/_static/
  head/contrib/libxo/doc/_templates/
 - copied from r334067, vendor/Juniper/libxo/dist/doc/_templates/
  head/contrib/libxo/doc/api.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/api.rst
  head/contrib/libxo/doc/conf.py
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/conf.py
  head/contrib/libxo/doc/example.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/example.rst
  head/contrib/libxo/doc/faq.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/faq.rst
  head/contrib/libxo/doc/field-formatting.rst
 - copied unchanged from r334067, 
vendor/Juniper/libxo/dist/doc/field-formatting.rst
  head/contrib/libxo/doc/field-modifiers.rst
 - copied unchanged from r334067, 
vendor/Juniper/libxo/dist/doc/field-modifiers.rst
  head/contrib/libxo/doc/field-roles.rst
 - copied unchanged from r334067, 
vendor/Juniper/libxo/dist/doc/field-roles.rst
  head/contrib/libxo/doc/format-strings.rst
 - copied unchanged from r334067, 
vendor/Juniper/libxo/dist/doc/format-strings.rst
  head/contrib/libxo/doc/formatting.rst
 - copied unchanged from r334067, 
vendor/Juniper/libxo/dist/doc/formatting.rst
  head/contrib/libxo/doc/getting.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/getting.rst
  head/contrib/libxo/doc/howto.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/howto.rst
  head/contrib/libxo/doc/index.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/index.rst
  head/contrib/libxo/doc/intro.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/intro.rst
  head/contrib/libxo/doc/options.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/options.rst
  head/contrib/libxo/doc/xo.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/xo.rst
  head/contrib/libxo/doc/xohtml.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/xohtml.rst
  head/contrib/libxo/doc/xolint.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/xolint.rst
  head/contrib/libxo/doc/xopo.rst
 - copied unchanged from r334067, vendor/Juniper/libxo/dist/doc/xopo.rst
Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/Makefile.am
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/tests/core/saved/test_01.E.out
  head/contrib/libxo/tests/core/saved/test_01.H.out
  head/contrib/libxo/tests/core/saved/test_01.HIPx.out
  head/contrib/libxo/tests/core/saved/test_01.HP.out
  head/contrib/libxo/tests/core/saved/test_01.J.out
  head/contrib/libxo/tests/core/saved/test_01.JP.out
  head/contrib/libxo/tests/core/saved/test_01.T.out
  head/contrib/libxo/tests/core/saved/test_01.X.out
  head/contrib/libxo/tests/core/saved/test_01.XP.out
  head/contrib/libxo/tests/core/saved/test_12.J.out
  head/contrib/libxo/tests/core/saved/test_12.JP.out
  head/contrib/libxo/tests/core/test_01.c
  head/contrib/libxo/tests/gettext/saved/gt_01.J.out
  head/contrib/libxo/tests/gettext/saved/gt_01.JP.out
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
  head/usr.bin/xohtml/xohtml.sh
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Wed May 23 01:12:39 2018
(r334067)
+++ head/contrib/libxo/configure.ac Wed May 23 01:20:31 2018
(r334068)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.8.4], [p...@juniper.net])
+AC_INIT([libxo], [0.9.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/Makefile.am
==
--- head/contrib/libxo/doc/Makefile.am  Wed May 23 01:12:39 2018
(r334067)
+++ head/contrib/libxo/doc/Makefile.am  Wed May 23 01:20:31 2018
(r334068)
@@ -68,3 +68,8 @@ else
 doc docs:
@${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org"
 endif
+
+SPHINX = python3.4 -msphinx
+
+html sphinx sphinx-html:
+   ${SPHINX} -M html ${srcdir} .

Copied: head/contrib/libxo/doc/api.rst (from r334067, 
ve

svn commit: r334067 - vendor/Juniper/libxo/0.9.0

2018-05-22 Thread Phil Shafer

Author: phil
Date: Wed May 23 01:12:39 2018
New Revision: 334067
URL: https://svnweb.freebsd.org/changeset/base/334067

Log:
  Tag libxo 0.9.0

Added:
 - copied from r334066, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.9.0/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r334066 - in vendor/Juniper/libxo/dist: . doc doc/_static doc/_templates libxo tests/core tests/core/saved tests/gettext/saved

2018-05-22 Thread Phil Shafer

Author: phil
Date: Wed May 23 01:12:17 2018
New Revision: 334066
URL: https://svnweb.freebsd.org/changeset/base/334066

Log:
  Import libxo 0.9.0

Added:
  vendor/Juniper/libxo/dist/doc/_static/
  vendor/Juniper/libxo/dist/doc/_static/basic.css_t
  vendor/Juniper/libxo/dist/doc/_templates/
  vendor/Juniper/libxo/dist/doc/_templates/localtoc.html   (contents, props 
changed)
  vendor/Juniper/libxo/dist/doc/api.rst
  vendor/Juniper/libxo/dist/doc/conf.py   (contents, props changed)
  vendor/Juniper/libxo/dist/doc/example.rst
  vendor/Juniper/libxo/dist/doc/faq.rst
  vendor/Juniper/libxo/dist/doc/field-formatting.rst
  vendor/Juniper/libxo/dist/doc/field-modifiers.rst
  vendor/Juniper/libxo/dist/doc/field-roles.rst
  vendor/Juniper/libxo/dist/doc/format-strings.rst
  vendor/Juniper/libxo/dist/doc/formatting.rst
  vendor/Juniper/libxo/dist/doc/getting.rst
  vendor/Juniper/libxo/dist/doc/howto.rst
  vendor/Juniper/libxo/dist/doc/index.rst
  vendor/Juniper/libxo/dist/doc/intro.rst
  vendor/Juniper/libxo/dist/doc/options.rst
  vendor/Juniper/libxo/dist/doc/xo.rst
  vendor/Juniper/libxo/dist/doc/xohtml.rst
  vendor/Juniper/libxo/dist/doc/xolint.rst
  vendor/Juniper/libxo/dist/doc/xopo.rst
Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/Makefile.am
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.XP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.out
  vendor/Juniper/libxo/dist/tests/core/test_01.c
  vendor/Juniper/libxo/dist/tests/gettext/saved/gt_01.J.out
  vendor/Juniper/libxo/dist/tests/gettext/saved/gt_01.JP.out

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Tue May 22 22:16:49 2018
(r334065)
+++ vendor/Juniper/libxo/dist/configure.ac  Wed May 23 01:12:17 2018
(r334066)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.8.4], [p...@juniper.net])
+AC_INIT([libxo], [0.9.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/Makefile.am
==
--- vendor/Juniper/libxo/dist/doc/Makefile.am   Tue May 22 22:16:49 2018
(r334065)
+++ vendor/Juniper/libxo/dist/doc/Makefile.am   Wed May 23 01:12:17 2018
(r334066)
@@ -68,3 +68,8 @@ else
 doc docs:
@${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org"
 endif
+
+SPHINX = python3.4 -msphinx
+
+html sphinx sphinx-html:
+   ${SPHINX} -M html ${srcdir} .

Added: vendor/Juniper/libxo/dist/doc/_static/basic.css_t
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/dist/doc/_static/basic.css_t   Wed May 23 01:12:17 
2018(r334066)
@@ -0,0 +1,657 @@
+/*
+ * basic.css
+ * ~
+ *
+ * Sphinx stylesheet -- basic theme.
+ *
+ * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/* -- main layout --- 
*/
+
+div.clearer {
+clear: both;
+}
+
+/* -- relbar  
*/
+
+div.related {
+width: 100%;
+font-size: 90%;
+}
+
+div.related h3 {
+display: none;
+}
+
+div.related ul {
+margin: 0;
+padding: 0 0 0 10px;
+list-style: none;
+}
+
+div.related li {
+display: inline;
+}
+
+div.related li.right {
+float: right;
+margin-right: 5px;
+}
+
+/* -- sidebar --- 
*/
+
+div.sphinxsidebarwrapper {
+padding: 10px 5px 0 10px;
+}
+
+div.sphinxsidebar {
+float: left;
+width: {{ theme_sidebarwidth|toint }}px;
+margin-left: -100%;
+font-size: 90%;
+word-wrap: break-word;
+overflow-wrap : break-word;
+}
+
+div.sphinxsidebar ul {
+list-style: none;
+}
+
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
+margin-left: 20px;
+list-style: square;
+}
+
+div.sphinxsidebar ul ul {
+margin-top: 0;
+margin-bottom: 0;
+}
+
+div.sphinxsidebar form {
+margin-top: 10px;
+}
+
+div.sp

svn commit: r333600 - in head/contrib/elftoolchain: elfcopy readelf

2018-05-13 Thread Phil Shafer

Author: phil
Date: Mon May 14 05:21:18 2018
New Revision: 333600
URL: https://svnweb.freebsd.org/changeset/base/333600

Log:
  Handle thread-local storage (TLS) segments correctly when
  copying (objcopy) and displaying (readelf) them.
  
  PR:   227552
  Submitted by: kaiw (maintainer)
  Reported by:  jachm...@unitix.org
  Reviewed by:  phil
  MFC after:1 day

Modified:
  head/contrib/elftoolchain/elfcopy/elfcopy.h
  head/contrib/elftoolchain/elfcopy/sections.c
  head/contrib/elftoolchain/elfcopy/segments.c
  head/contrib/elftoolchain/readelf/readelf.c

Modified: head/contrib/elftoolchain/elfcopy/elfcopy.h
==
--- head/contrib/elftoolchain/elfcopy/elfcopy.h Mon May 14 04:00:52 2018
(r333599)
+++ head/contrib/elftoolchain/elfcopy/elfcopy.h Mon May 14 05:21:18 2018
(r333600)
@@ -127,6 +127,7 @@ struct section {
uint64_t cap;   /* section capacity */
uint64_t align; /* section alignment */
uint64_t type;  /* section type */
+   uint64_t flags; /* section flags */
uint64_t vma;   /* section virtual addr */
uint64_t lma;   /* section load addr */
uint64_t pad_sz;/* section padding size */

Modified: head/contrib/elftoolchain/elfcopy/sections.c
==
--- head/contrib/elftoolchain/elfcopy/sections.cMon May 14 04:00:52 
2018(r333599)
+++ head/contrib/elftoolchain/elfcopy/sections.cMon May 14 05:21:18 
2018(r333600)
@@ -411,6 +411,7 @@ create_scn(struct elfcopy *ecp)
s->sz   = ish.sh_size;
s->align= ish.sh_addralign;
s->type = ish.sh_type;
+   s->flags= ish.sh_flags;
s->vma  = ish.sh_addr;
 
/*

Modified: head/contrib/elftoolchain/elfcopy/segments.c
==
--- head/contrib/elftoolchain/elfcopy/segments.cMon May 14 04:00:52 
2018(r333599)
+++ head/contrib/elftoolchain/elfcopy/segments.cMon May 14 05:21:18 
2018(r333600)
@@ -79,6 +79,8 @@ add_to_inseg_list(struct elfcopy *ecp, struct section 
continue;
if (s->vma + s->sz > seg->vaddr + seg->msz)
continue;
+   if (seg->type == PT_TLS && ((s->flags & SHF_TLS) == 0))
+   continue;
 
insert_to_inseg_list(seg, s);
if (seg->type == PT_LOAD)

Modified: head/contrib/elftoolchain/readelf/readelf.c
==
--- head/contrib/elftoolchain/readelf/readelf.c Mon May 14 04:00:52 2018
(r333599)
+++ head/contrib/elftoolchain/readelf/readelf.c Mon May 14 05:21:18 2018
(r333600)
@@ -2378,11 +2378,22 @@ dump_phdr(struct readelf *re)
}
printf("   %2.2d ", i);
/* skip NULL section. */
-   for (j = 1; (size_t)j < re->shnum; j++)
-   if (re->sl[j].addr >= phdr.p_vaddr &&
-   re->sl[j].addr + re->sl[j].sz <=
+   for (j = 1; (size_t)j < re->shnum; j++) {
+   if (re->sl[j].off < phdr.p_offset)
+   continue;
+   if (re->sl[j].off + re->sl[j].sz >
+   phdr.p_offset + phdr.p_filesz &&
+   re->sl[j].type != SHT_NOBITS)
+   continue;
+   if (re->sl[j].addr < phdr.p_vaddr ||
+   re->sl[j].addr + re->sl[j].sz >
phdr.p_vaddr + phdr.p_memsz)
-   printf("%s ", re->sl[j].name);
+   continue;
+   if (phdr.p_type == PT_TLS &&
+   (re->sl[j].flags & SHF_TLS) == 0)
+   continue;
+   printf("%s ", re->sl[j].name);
+   }
printf("\n");
}
 #undef PH_HDR
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322172 - in stable/11: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/cbor contrib/libxo/encoder/test contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved...

2017-08-07 Thread Phil Shafer

Author: phil
Date: Mon Aug  7 17:23:44 2017
New Revision: 322172
URL: https://svnweb.freebsd.org/changeset/base/322172

Log:
  Import libxo-0.8.4 from HEAD into stable/11
  
  Submitted by: phil

Added:
  stable/11/contrib/libxo/libxo/xo_options.7
 - copied, changed from r318364, head/contrib/libxo/libxo/xo_options.7
Modified:
  stable/11/contrib/libxo/Makefile.am
  stable/11/contrib/libxo/configure.ac
  stable/11/contrib/libxo/doc/Makefile.am
  stable/11/contrib/libxo/doc/libxo-manual.html
  stable/11/contrib/libxo/doc/libxo.txt
  stable/11/contrib/libxo/encoder/cbor/enc_cbor.c
  stable/11/contrib/libxo/encoder/test/enc_test.c
  stable/11/contrib/libxo/libxo/Makefile.am
  stable/11/contrib/libxo/libxo/libxo.3
  stable/11/contrib/libxo/libxo/libxo.c
  stable/11/contrib/libxo/libxo/xo.h
  stable/11/contrib/libxo/libxo/xo_attr.3
  stable/11/contrib/libxo/libxo/xo_buf.h
  stable/11/contrib/libxo/libxo/xo_create.3
  stable/11/contrib/libxo/libxo/xo_emit.3
  stable/11/contrib/libxo/libxo/xo_emit_err.3
  stable/11/contrib/libxo/libxo/xo_emit_f.3
  stable/11/contrib/libxo/libxo/xo_encoder.c
  stable/11/contrib/libxo/libxo/xo_encoder.h
  stable/11/contrib/libxo/libxo/xo_err.3
  stable/11/contrib/libxo/libxo/xo_error.3
  stable/11/contrib/libxo/libxo/xo_finish.3
  stable/11/contrib/libxo/libxo/xo_flush.3
  stable/11/contrib/libxo/libxo/xo_format.5
  stable/11/contrib/libxo/libxo/xo_message.3
  stable/11/contrib/libxo/libxo/xo_no_setlocale.3
  stable/11/contrib/libxo/libxo/xo_open_container.3
  stable/11/contrib/libxo/libxo/xo_open_list.3
  stable/11/contrib/libxo/libxo/xo_open_marker.3
  stable/11/contrib/libxo/libxo/xo_parse_args.3
  stable/11/contrib/libxo/libxo/xo_set_allocator.3
  stable/11/contrib/libxo/libxo/xo_set_flags.3
  stable/11/contrib/libxo/libxo/xo_set_info.3
  stable/11/contrib/libxo/libxo/xo_set_options.3
  stable/11/contrib/libxo/libxo/xo_set_style.3
  stable/11/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3
  stable/11/contrib/libxo/libxo/xo_set_version.3
  stable/11/contrib/libxo/libxo/xo_set_writer.3
  stable/11/contrib/libxo/libxo/xo_syslog.3
  stable/11/contrib/libxo/libxo/xo_syslog.c
  stable/11/contrib/libxo/tests/core/Makefile.am
  stable/11/contrib/libxo/tests/core/saved/test_01.E.out
  stable/11/contrib/libxo/tests/core/saved/test_01.H.out
  stable/11/contrib/libxo/tests/core/saved/test_01.HIPx.out
  stable/11/contrib/libxo/tests/core/saved/test_01.HP.out
  stable/11/contrib/libxo/tests/core/saved/test_01.J.out
  stable/11/contrib/libxo/tests/core/saved/test_01.JP.out
  stable/11/contrib/libxo/tests/core/saved/test_01.T.out
  stable/11/contrib/libxo/tests/core/saved/test_01.X.out
  stable/11/contrib/libxo/tests/core/saved/test_01.XP.out
  stable/11/contrib/libxo/tests/core/saved/test_02.E.out
  stable/11/contrib/libxo/tests/core/saved/test_02.J.out
  stable/11/contrib/libxo/tests/core/saved/test_02.JP.out
  stable/11/contrib/libxo/tests/core/saved/test_02.X.out
  stable/11/contrib/libxo/tests/core/saved/test_02.XP.out
  stable/11/contrib/libxo/tests/core/saved/test_03.E.out
  stable/11/contrib/libxo/tests/core/saved/test_04.E.out
  stable/11/contrib/libxo/tests/core/saved/test_05.E.out
  stable/11/contrib/libxo/tests/core/saved/test_06.E.out
  stable/11/contrib/libxo/tests/core/saved/test_07.E.out
  stable/11/contrib/libxo/tests/core/saved/test_08.E.out
  stable/11/contrib/libxo/tests/core/saved/test_09.E.out
  stable/11/contrib/libxo/tests/core/saved/test_10.E.out
  stable/11/contrib/libxo/tests/core/saved/test_10.X.out
  stable/11/contrib/libxo/tests/core/saved/test_10.XP.out
  stable/11/contrib/libxo/tests/core/saved/test_11.E.out
  stable/11/contrib/libxo/tests/core/saved/test_11.HIPx.out
  stable/11/contrib/libxo/tests/core/saved/test_11.X.out
  stable/11/contrib/libxo/tests/core/saved/test_11.XP.out
  stable/11/contrib/libxo/tests/core/saved/test_12.E.out
  stable/11/contrib/libxo/tests/core/saved/test_12.H.out
  stable/11/contrib/libxo/tests/core/saved/test_12.HIPx.out
  stable/11/contrib/libxo/tests/core/saved/test_12.HP.out
  stable/11/contrib/libxo/tests/core/saved/test_12.J.out
  stable/11/contrib/libxo/tests/core/saved/test_12.JP.out
  stable/11/contrib/libxo/tests/core/saved/test_12.T.out
  stable/11/contrib/libxo/tests/core/saved/test_12.X.out
  stable/11/contrib/libxo/tests/core/saved/test_12.XP.out
  stable/11/contrib/libxo/tests/core/test_01.c
  stable/11/contrib/libxo/tests/core/test_12.c
  stable/11/contrib/libxo/tests/gettext/Makefile.am
  stable/11/contrib/libxo/tests/gettext/saved/gt_01.J.out
  stable/11/contrib/libxo/tests/gettext/saved/gt_01.JP.out
  stable/11/contrib/libxo/tests/xo/Makefile.am
  stable/11/contrib/libxo/tests/xo/saved/xo_01.H.out
  stable/11/contrib/libxo/tests/xo/saved/xo_01.HIPx.out
  stable/11/contrib/libxo/tests/xo/saved/xo_01.HP.out
  stable/11/contrib/libxo/tests/xo/saved/xo_01.J.out
  stable/11/contrib/libxo/tests/xo/saved/xo_01.JP.out
  stable/11/contrib/libxo/tests/xo/saved/xo_01.T.out
  stable/11/contrib/libxo/tests/xo/saved/xo_01

svn commit: r322019 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/tests/xo contrib/libxo/tests/xo/saved contri...

2017-08-03 Thread Phil Shafer

gt tag ${PACKAGE_VERSION}"
 
@@ -54,6 +61,18 @@ upload-docs: docs
&& git add libxo-manual.html \
&& git commit -m 'new docs' \
libxo-manual.html ${PACKAGE_VERSION} \
+   && git push origin gh-pages ) ; true
+
+upload-xohtml-files:
+   @echo "Uploading xohtml files ... "
+   @-[ -d ${GH_PAGES_DIR} ] \
+   && echo "Updating xohtml files on gh-pages ..." \
+   && mkdir -p ${GH_PAGES_DIR_VER}/xohtml \
+   && cp ${XOHTML_FILES} ${GH_PAGES_DIR_VER}/xohtml \
+   && (cd ${GH_PAGES_DIR} \
+   && git add ${PACKAGE_VERSION}/xohtml \
+   && git commit -m 'new xohtml files' \
+   ${PACKAGE_VERSION}/xohtml \
&& git push origin gh-pages ) ; true
 
 pkgconfigdir=$(libdir)/pkgconfig

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Thu Aug  3 15:43:29 2017
(r322018)
+++ head/contrib/libxo/configure.ac Thu Aug  3 15:47:42 2017
(r322019)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.8.1], [p...@juniper.net])
+AC_INIT([libxo], [0.8.4], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlThu Aug  3 15:43:29 2017
(r322018)
+++ head/contrib/libxo/doc/libxo-manual.htmlThu Aug  3 15:47:42 2017
(r322019)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "June 2017";
+   content: "August 2017";
  
   } 
   @top-center {
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-June 14, 2017
+August 3, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: head/contrib/libxo/libxo/libxo.3
==
--- head/contrib/libxo/libxo/libxo.3Thu Aug  3 15:43:29 2017
(r322018)
+++ head/contrib/libxo/libxo/libxo.3Thu Aug  3 15:47:42 2017
(r322019)
@@ -311,3 +311,13 @@ to use an alternative set of low-level output function
 .Xr xo_set_style 3 ,
 .Xr xo_set_writer 3 ,
 .Xr xo_format 5
+.Sh HISTORY
+The
+.Nm libxo
+library first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+.Nm libxo
+was written by
+.An Phil Shafer Aq Mt p...@freebsd.org .
+

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cThu Aug  3 15:43:29 2017
(r322018)
+++ head/contrib/libxo/libxo/libxo.cThu Aug  3 15:47:42 2017
(r322019)
@@ -137,7 +137,7 @@ static const char xo_default_format[] = "%s";
 
 #define XO_INDENT_BY 2 /* Amount to indent when pretty printing */
 #define XO_DEPTH   128  /* Default stack depth */
-#define XO_MAX_ANCHOR_WIDTH (8*1024) /* Anything wider is just sillyb */
+#define XO_MAX_ANCHOR_WIDTH (8*1024) /* Anything wider is just silly */
 
 #define XO_FAILURE_NAME"failure"
 
@@ -5071,16 +5071,60 @@ xo_find_width (xo_handle_t *xop, xo_field_info_t *xfip
bp[vlen] = '\0';
 
width = strtol(bp, &cp, 0);
-   if (width == LONG_MIN || width == LONG_MAX
-   || bp == cp || *cp != '\0' ) {
+   if (width == LONG_MIN || width == LONG_MAX || bp == cp || *cp != '\0') {
width = 0;
xo_failure(xop, "invalid width for anchor: '%s'", bp);
}
 } else if (flen) {
-   if (flen != 2 || strncmp("%d", fmt, flen) != 0)
-   xo_failure(xop, "invalid width format: '%*.*s'", flen, flen, fmt);
-   if (!XOF_ISSET(xop, XOF_NO_VA_ARG))
-   width = va_arg(xop->xo_vap, int);
+   /*
+* We really expect the format for width to be "{:/%d}" or
+* "{:/%u}", so if that's the case, we just grab our width off
+* the argument list.  But we need to avoid optimized logic if
+* there's a custom formatter.
+*/
+   if (xop->xo_formatter == NULL && flen == 2
+   && strncmp("%d", fmt, flen) == 0) {
+   if (!XOF_ISSET(xop, XOF_NO_VA_ARG))
+   width = va_arg(xop->xo_vap, int);
+   } else if (xop->xo_formatter == NULL && flen == 2
+  && strncmp("%u", fmt, flen) == 0) {
+   if (!XOF_ISSET(xop, XOF_NO_VA_

svn commit: r322018 - vendor/Juniper/libxo/0.8.4

2017-08-03 Thread Phil Shafer

Author: phil
Date: Thu Aug  3 15:43:29 2017
New Revision: 322018
URL: https://svnweb.freebsd.org/changeset/base/322018

Log:
  Tag libxo 0.8.4

Added:
 - copied from r322017, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.8.4/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322017 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved tests/xo tests/xo/saved xo xohtml xolint xopo

2017-08-03 Thread Phil Shafer

PACKAGE_VERSION}/xohtml \
&& git push origin gh-pages ) ; true
 
 pkgconfigdir=$(libdir)/pkgconfig

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Thu Aug  3 15:04:54 2017
(r322016)
+++ vendor/Juniper/libxo/dist/configure.ac  Thu Aug  3 15:43:14 2017
(r322017)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.8.1], [p...@juniper.net])
+AC_INIT([libxo], [0.8.4], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Thu Aug  3 15:04:54 
2017(r322016)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Thu Aug  3 15:43:14 
2017(r322017)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "June 2017";
+   content: "August 2017";
  
   } 
   @top-center {
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-June 14, 2017
+August 3, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: vendor/Juniper/libxo/dist/libxo/libxo.3
==
--- vendor/Juniper/libxo/dist/libxo/libxo.3 Thu Aug  3 15:04:54 2017
(r322016)
+++ vendor/Juniper/libxo/dist/libxo/libxo.3 Thu Aug  3 15:43:14 2017
(r322017)
@@ -311,3 +311,13 @@ to use an alternative set of low-level output function
 .Xr xo_set_style 3 ,
 .Xr xo_set_writer 3 ,
 .Xr xo_format 5
+.Sh HISTORY
+The
+.Nm libxo
+library first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+.Nm libxo
+was written by
+.An Phil Shafer Aq Mt p...@freebsd.org .
+

Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==
--- vendor/Juniper/libxo/dist/libxo/libxo.c Thu Aug  3 15:04:54 2017
(r322016)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Thu Aug  3 15:43:14 2017
(r322017)
@@ -137,7 +137,7 @@ static const char xo_default_format[] = "%s";
 
 #define XO_INDENT_BY 2 /* Amount to indent when pretty printing */
 #define XO_DEPTH   128  /* Default stack depth */
-#define XO_MAX_ANCHOR_WIDTH (8*1024) /* Anything wider is just sillyb */
+#define XO_MAX_ANCHOR_WIDTH (8*1024) /* Anything wider is just silly */
 
 #define XO_FAILURE_NAME"failure"
 
@@ -5071,16 +5071,60 @@ xo_find_width (xo_handle_t *xop, xo_field_info_t *xfip
bp[vlen] = '\0';
 
width = strtol(bp, &cp, 0);
-   if (width == LONG_MIN || width == LONG_MAX
-   || bp == cp || *cp != '\0' ) {
+   if (width == LONG_MIN || width == LONG_MAX || bp == cp || *cp != '\0') {
width = 0;
xo_failure(xop, "invalid width for anchor: '%s'", bp);
}
 } else if (flen) {
-   if (flen != 2 || strncmp("%d", fmt, flen) != 0)
-   xo_failure(xop, "invalid width format: '%*.*s'", flen, flen, fmt);
-   if (!XOF_ISSET(xop, XOF_NO_VA_ARG))
-   width = va_arg(xop->xo_vap, int);
+   /*
+* We really expect the format for width to be "{:/%d}" or
+* "{:/%u}", so if that's the case, we just grab our width off
+* the argument list.  But we need to avoid optimized logic if
+* there's a custom formatter.
+*/
+   if (xop->xo_formatter == NULL && flen == 2
+   && strncmp("%d", fmt, flen) == 0) {
+   if (!XOF_ISSET(xop, XOF_NO_VA_ARG))
+   width = va_arg(xop->xo_vap, int);
+   } else if (xop->xo_formatter == NULL && flen == 2
+  && strncmp("%u", fmt, flen) == 0) {
+   if (!XOF_ISSET(xop, XOF_NO_VA_ARG))
+   width = va_arg(xop->xo_vap, unsigned);
+   } else {
+   /*
+* So we have a format and it's not a simple one like
+* "{:/%d}".  That means we need to format the field,
+* extract the value from the formatted output, and then
+* discard that output.
+*/
+   int anchor_was_set = FALSE;
+   xo_buffer_t *xbp = &xop->xo_data;
+   ssize_t start_offset = xo_buf_offset(xbp);
+   bp = xo_buf_cur(xbp);   /* Save start of the string */
+   cp = NULL;
+
+   if (XOIF_ISSET(xop, XOIF_ANCHOR)) {
+   XOIF_CLEAR(xop, XOIF_ANCHOR);
+   anchor_was_set = TRUE;
+   }
+
+   ssize_t rc = xo_do_format

svn commit: r320521 - head/lib/libxo/tests

2017-06-30 Thread Phil Shafer

Author: phil
Date: Fri Jun 30 23:53:40 2017
New Revision: 320521
URL: https://svnweb.freebsd.org/changeset/base/320521

Log:
  Fix functional_test.sh to use --libxo options instead of the deprecated
  LIBXO_OPTIONS environment variable.
  
  Submitted by: phil

Modified:
  head/lib/libxo/tests/functional_test.sh

Modified: head/lib/libxo/tests/functional_test.sh
==
--- head/lib/libxo/tests/functional_test.sh Fri Jun 30 22:19:18 2017
(r320520)
+++ head/lib/libxo/tests/functional_test.sh Fri Jun 30 23:53:40 2017
(r320521)
@@ -39,14 +39,14 @@ check()
[ -s "${out_file}" ] && out_flag="-o file:${out_file}"
 
if [ "$xo_fmt" = "E" ]; then
-   LIBXO_OPTIONS="warn,encoder=test"
+   libxo_options=" warn,encoder=test"
else
-   LIBXO_OPTIONS=":W${xo_fmt}"
+   libxo_options=":W${xo_fmt}"
fi
 
atf_check -s exit:0 -e file:${err_file} -o file:${out_file} \
env LC_ALL=en_US.UTF-8 \
-   LIBXO_OPTIONS="${LIBXO_OPTIONS}" TZ="EST" "${SRCDIR}/${tc}" \
+   TZ="EST" "${SRCDIR}/${tc}" --libxo${libxo_options}\
 
 }
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320000 - vendor/Juniper/libxo

2017-06-15 Thread Phil Shafer

Author: phil
Date: Fri Jun 16 06:34:26 2017
New Revision: 32
URL: https://svnweb.freebsd.org/changeset/base/32

Log:
  Update libxo's import shell for xohtml
  
  Submitted by: phil

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Fri Jun 16 06:29:21 2017
(r31)
+++ vendor/Juniper/libxo/import.sh  Fri Jun 16 06:34:26 2017
(r32)
@@ -295,6 +295,7 @@ Cd $HEAD
 
 run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat 
$CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h"
 run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat 
$CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man"
+run "copying xohtml.sh" "(echo '#!/bin/sh' ; echo '# \$FreeBSD\$' ; cat 
$CWD/dist/build/xohtml/xohtml.sh ) > $HEAD/usr.bin/xohtml/xohtml.sh"
 
 #BUILDDIRS="lib/libxo usr.bin/xo"
 #for dir in $BUILDDIRS ; do
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319999 - in head: contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/xohtml usr.bin/xohtml usr.bin/xolint usr.bin/xopo

2017-06-15 Thread Phil Shafer

 @@
   links
   user
   group
+  that
+  3
+  this
   /some/file
   640
   1

Modified: head/contrib/libxo/tests/core/saved/test_02.J.out
==
--- head/contrib/libxo/tests/core/saved/test_02.J.out   Fri Jun 16 06:15:26 
2017(r319998)
+++ head/contrib/libxo/tests/core/saved/test_02.J.out   Fri Jun 16 06:29:21 
2017(r31)
@@ -1,2 +1,2 @@
-{"top": {"data": {"what":"braces","length":"abcdef","fd":-1,"error":"Bad file 
descriptor","test":"good","fd":-1,"error":"Bad 
fi","test":"good","lines":20,"words":30,"characters":40, "bytes": 
[0,1,2,3,4],"mbuf-current":10,"mbuf-cache":20,"mbuf-total":30,"distance":50,"location":"Boston","memory":64,"total":640,"memory":64,"total":640,"ten":10,"eleven":11,"unknown":1010,"unknown":1010,"min":15,"cur":20,"max":30,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"val1":21,"val2":58368,"val3":100663296,"val4":44470272,"val5":1342172800,
 "flag": 
["one","two","three"],"works":null,"empty-tag":true,"t1":"1000","t2":"test5000","t3":"ten-longx","t4":"xtest",
 "__error": {"message":"this is an error"}, "__error": {"message":"two more 
errors"}, "__warning": {"message":this is an warning}, "__warning": 
{"message":"two more warnings"},"count":10,"test":4, "error": {"message":"Shut 
'er down, Clancey!  She's a-pumpin' mud!  <>!,\"!<>\n"}}}
+{"top": {"data": {"what":"braces","length":"abcdef","fd":-1,"error":"Bad file 
descriptor","test":"good","fd":-1,"error":"Bad 
fi","test":"good","lines":20,"words":30,"characters":40, "bytes": 
[0,1,2,3,4],"mbuf-current":10,"mbuf-cache":20,"mbuf-total":30,"distance":50,"location":"Boston","memory":64,"total":640,"memory":64,"total":640,"ten":10,"eleven":11,"unknown":1010,"unknown":1010,"min":15,"cur":20,"max":30,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"val1":21,"val2":58368,"val3":100663296,"val4":44470272,"val5":1342172800,
 "flag": 
["one","two","three"],"works":null,"empty-tag":true,"t1":"1000","t2":"test5000","t3":"ten-longx","t4":"xtest",
 "__error": {"message":"this is an error"}, "__error": {"message":"two more 
errors"}, "__warning": {"message":"this is an warning"}, "__warning": 
{"message":"two more warnings"},"count":10,"test":4, "error": {"message":"Shut 
'er down, Clancey!  She's a-pumpin' mud!  <>!,\"!<>\n"}}}
 }

Modified: head/contrib/libxo/tests/core/saved/test_02.JP.out
==
--- head/contrib/libxo/tests/core/saved/test_02.JP.out  Fri Jun 16 06:15:26 
2017(r319998)
+++ head/contrib/libxo/tests/core/saved/test_02.JP.out  Fri Jun 16 06:29:21 
2017(r31)
@@ -67,7 +67,7 @@
 "message": "two more errors"
   },
   "__warning": {
-"message": this is an warning
+"message": "this is an warning"
   },
   "__warning": {
 "message": "two more warnings"

Modified: head/contrib/libxo/tests/core/test_01.c
==
--- head/contrib/libxo/tests/core/test_01.c Fri Jun 16 06:15:26 2017
(r319998)
+++ head/contrib/libxo/tests/core/test_01.c Fri Jun 16 06:29:21 2017
(r31)
@@ -80,6 +80,8 @@ main (int argc, char **argv)
 
 xo_open_container_h(NULL, "top");
 
+xo_emit("df {:used-percent/%5.0f}{U:%%}\n", (double) 12);
+
 xo_emit("{e:kve_start/%#jx}", (uintmax_t) 0xdeadbeef);
 xo_emit("{e:kve_end/%#jx}", (uintmax_t) 0xcabb1e);
 
@@ -189,6 +191,8 @@ main (int argc, char **argv)
"{t:user/%s}  {t:group/%s}  \n",
"mode", "octal", "links",
"user", "group", "extra1", "extra2", "extra3");
+
+xo_emit("{e:pre/%s}{t:links/%-*u}{t:post/%-*s}\n", "that", 8, 3, 8, 
"this");
 
 xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} "
"{t:user/%-*s}  {t:group/%-*s}  \n",

Modified: head/contrib/libxo/xohtml/xohtml.css
==
--- head/contrib/libxo/xohtml/xohtml.cssFri Jun 16 06:15:26 2017
(r319998)
+++ head/contrib/libxo/xohtml/xohtml.cssFri Jun 16 06:29:21 2017
(r31)
@@ -124,7 +124,7 @@ div.muxer-buttons {
 padding: 20px;
 }
 
-div.text, div.decoration, div.data, div.header, div.pad, div.item {
+div.text, div.decoration, div.data, div.header, div.pad, div.item, div.units {
 font-family: monospace;
 display: inline;
 vertical-align: middle;

Modified: head/contrib/libxo/xohtml/xohtml.sh.in
==
--- head/contrib/libxo/xohtml/xohtml.sh.in  Fri Jun 16 06:15:26 2017
(r319998)
+++ head/contrib/libxo/xohtml/xohtml.sh.in  Fri Jun 16 06:29:21 2017
(r31)
@@ -57,7 +57,8 @@ if [ "$CMD" = "cat" -a -t 0 ]; then
 do_help
 fi
 
-echo "\n\n"
+echo ''
+echo ''
 echo ''
 echo ''
 echo ''
@@ -66,10 +67,12 @@ echo ''
 echo ''
 echo ''
-echo "\n\n"
+echo ''
+echo ''
 
 $CMD
 
-echo "\n\n"
+echo ''
+echo ''
 
 exit 0

Added: head/usr.bin/xohtml/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/xohtml/MakefileFri Jun 16 06:29:21 2017
(r31)
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+.include 
+
+LIBXOSRC=  ${SRCTOP}/contrib/libxo
+
+.PATH:
+.PATH: ${LIBXOSRC}/xohtml
+
+SCRIPTS= xohtml.sh
+MAN=   xohtml.1
+
+EXTERNAL_FILES = \
+external/jquery.js \
+external/jquery.qtip.css \
+external/jquery.qtip.js
+
+INTERNAL_FILES = \
+xohtml.js \
+xohtml.css
+
+FILES=  ${INTERNAL_FILES} ${EXTERNAL_FILES}
+FILESDIR=   /usr/share/xohtml
+FILESMODE=  ${NOBINMODE}
+
+beforeinstall: mkfilesdir
+mkfilesdir:
+   test -d ${DESTDIR}${FILESDIR} \
+  || ${INSTALL} -d -o ${FILESOWN} -g ${FILESGRP} -m 755 
${DESTDIR}${FILESDIR}
+
+.include 

Added: head/usr.bin/xohtml/xohtml.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/xohtml/xohtml.sh   Fri Jun 16 06:29:21 2017
(r31)
@@ -0,0 +1,79 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# Copyright (c) 2014, 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.
+# Phil Shafer, July 2014
+#
+
+BASE=/usr/share/libxo
+CMD=cat
+DONE=
+
+do_help () {
+echo "xohtml: wrap libxo-enabled output in HTML"
+echo "Usage: xohtml [options] [command [arguments]]"
+echo "Valid options are:"
+echo "-b  | --base "
+echo "-c  | --command "
+echo "-f  | --file "
+exit 1
+}
+
+while [ -z "$DONE" -a ! -z "$1" ]; do
+case "$1" in
+-b|--base)
+shift;
+BASE="$1";
+   shift;
+;;
+-c|--command)
+shift;
+CMD="$1";
+   shift;
+;;
+-f|--file)
+shift;
+FILE="$1";
+   shift;
+   exec > "$FILE";
+;;
+   -*)
+   do_help
+   ;;
+   *)
+   DONE=1;
+   XX=$1;
+   shift;
+   CMD="$XX --libxo=html $@"
+   ;;
+esac
+done
+
+if [ "$CMD" = "cat" -a -t 0 ]; then
+do_help
+fi
+
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+echo ''
+
+$CMD
+
+echo ''
+echo ''
+
+exit 0

Added: head/usr.bin/xolint/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/xolint/MakefileFri Jun 16 06:29:21 2017
(r31)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include 
+
+LIBXOSRC=  ${SRCTOP}/contrib/libxo
+
+.PATH:
+.PATH: ${LIBXOSRC}/xolint
+
+SCRIPTS= xolint.pl
+MAN=   xolint.1
+
+.include 

Added: head/usr.bin/xopo/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/xopo/Makefile  Fri Jun 16 06:29:21 2017(r31)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319998 - vendor/Juniper/libxo/0.8.2

2017-06-15 Thread Phil Shafer

Author: phil
Date: Fri Jun 16 06:15:26 2017
New Revision: 319998
URL: https://svnweb.freebsd.org/changeset/base/319998

Log:
  Tag libxo 0.8.2

Added:
 - copied from r319997, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.8.2/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319997 - in vendor/Juniper/libxo/dist: doc libxo tests/core tests/core/saved xohtml

2017-06-15 Thread Phil Shafer

Author: phil
Date: Fri Jun 16 06:12:07 2017
New Revision: 319997
URL: https://svnweb.freebsd.org/changeset/base/319997

Log:
  Import libxo 0.8.2

Modified:
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.XP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.JP.out
  vendor/Juniper/libxo/dist/tests/core/test_01.c
  vendor/Juniper/libxo/dist/xohtml/xohtml.css
  vendor/Juniper/libxo/dist/xohtml/xohtml.sh.in

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Fri Jun 16 04:28:10 
2017(r319996)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Fri Jun 16 06:12:07 
2017(r319997)
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-June 8, 2017
+June 14, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==
--- vendor/Juniper/libxo/dist/libxo/libxo.c Fri Jun 16 04:28:10 2017
(r319996)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Fri Jun 16 06:12:07 2017
(r319997)
@@ -95,6 +95,14 @@
 #include 
 #endif /* HAVE_GETTEXT */
 
+/* Rather lame that we can't count on these... */
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
 /*
  * Three styles of specifying thread-local variables are supported.
  * configure.ac has the brains to run each possibility through the
@@ -473,6 +481,7 @@ static void
 xo_buf_append_div (xo_handle_t *xop, const char *class, xo_xff_flags_t flags,
   const char *name, ssize_t nlen,
   const char *value, ssize_t vlen,
+  const char *fmt, ssize_t flen,
   const char *encoding, ssize_t elen);
 
 static void
@@ -1761,7 +1770,8 @@ xo_message_hcv (xo_handle_t *xop, int code, const char
rc += rc2;
}
 
-   xo_buf_append_div(xop, "message", 0, NULL, 0, bp, rc, NULL, 0);
+   xo_buf_append_div(xop, "message", 0, NULL, 0, bp, rc,
+ NULL, 0, NULL, 0);
}
break;
 
@@ -2703,6 +2713,8 @@ xo_format_string_direct (xo_handle_t *xop, xo_buffer_t
if ((flags & XFF_UNESCAPE) && (*cp == '\\' || *cp == '%')) {
cp += 1;
len -= 1;
+   if (len == 0 || *cp == '\0')
+   break;
}
}
 
@@ -3644,6 +3656,10 @@ xo_do_format_field (xo_handle_t *xop, xo_buffer_t *xbp
 return 0;
 }
 
+/*
+ * Remove any numeric precision/width format from the format string by
+ * inserting the "%" after the [0-9]+, returning the substring.
+ */
 static char *
 xo_fix_encoding (xo_handle_t *xop UNUSED, char *encoding)
 {
@@ -3657,8 +3673,7 @@ xo_fix_encoding (xo_handle_t *xop UNUSED, char *encodi
break;
 }
 
-cp -= 1;
-*cp = '%';
+*--cp = '%';   /* Back off and insert the '%' */
 
 return cp;
 }
@@ -3777,10 +3792,35 @@ xo_format_humanize (xo_handle_t *xop, xo_buffer_t *xbp
 }
 }
 
+/*
+ * Convenience function that either append a fixed value (if one is
+ * given) or formats a field using a format string.  If it's
+ * encode_only, then we can't skip formatting the field, since it may
+ * be pulling arguments off the stack.
+ */
+static inline void
+xo_simple_field (xo_handle_t *xop, unsigned encode_only,
+ const char *value, ssize_t vlen,
+ const char *fmt, ssize_t flen, xo_xff_flags_t flags)
+{
+if (encode_only)
+   flags |= XFF_NO_OUTPUT;
+
+if (vlen == 0)
+   xo_do_format_field(xop, NULL, fmt, flen, flags);
+else if (!encode_only)
+   xo_data_append_content(xop, value, vlen, flags);
+}
+
+/*
+ * Html mode: append a  to the output buffer contain a field
+ * along with all the supporting information indicated by the flags.
+ */
 static void
 xo_buf_append_div (xo_handle_t *xop, const char *class, xo_xff_flags_t flags,
   const char *name, ssize_t nlen,
   const char *value, ssize_t vlen,
+  const char *fmt, ssize_t flen,
   const char *encoding, ssize_t elen)
 {
 static char div_start[] = "xo_columns;
 save.xhs_anchor_colu

svn commit: r319892 - head/bin/df

2017-06-12 Thread Phil Shafer

Author: phil
Date: Tue Jun 13 05:38:40 2017
New Revision: 319892
URL: https://svnweb.freebsd.org/changeset/base/319892

Log:
  Use {T:Capacity} for header so html output looks tidy
  
  Submitted by: phil
  Approved by:  sjg

Modified:
  head/bin/df/df.c

Modified: head/bin/df/df.c
==
--- head/bin/df/df.cTue Jun 13 01:25:19 2017(r319891)
+++ head/bin/df/df.cTue Jun 13 05:38:40 2017(r319892)
@@ -490,7 +490,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp)
xo_emit("{T:/%-*s}", mwp->mntfrom, "Filesystem");
if (Tflag)
xo_emit("  {T:/%-*s}", mwp->fstype, "Type");
-   xo_emit(" {T:/%*s} {T:/%*s} {T:/%*s} Capacity",
+   xo_emit(" {T:/%*s} {T:/%*s} {T:/%*s} {T:Capacity}",
mwp->total, header,
mwp->used, "Used", mwp->avail, "Avail");
if (iflag) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319732 - vendor/Juniper/libxo

2017-06-08 Thread Phil Shafer

Author: phil
Date: Fri Jun  9 03:34:38 2017
New Revision: 319732
URL: https://svnweb.freebsd.org/changeset/base/319732

Log:
  Fix import.sh w/ new $BUILDWORLD
  
  Submitted by: phil

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Fri Jun  9 03:32:49 2017
(r319731)
+++ vendor/Juniper/libxo/import.sh  Fri Jun  9 03:34:38 2017
(r319732)
@@ -14,6 +14,8 @@
 
 PROJECT=libxo
 
+BUILDWORLD="make -j8 buildworld -DWITH_META_MODE -DNO_CLEAN -DWITHOUT_TESTS"
+
 #"global" vars
 # Set SVN variables
 #  select the local subversion site
@@ -148,6 +150,7 @@ fi
 info "CWD = $CWD"
 info "VENDOR_DIR = $VENDOR_DIR"
 info "VERS = $VERS"
+info "BUILDWORLD = $BUILDWORLD"
 DATESTAMP=`date "+%Y-%m-%d-%H-%M"`
 
 [ -z "$VERS" ] && Error "missing version argument (-v)"
@@ -158,7 +161,7 @@ Cd $HEAD
 run "updating all" "svn update"
 
 if [ ! -z "$UPDATE" ]; then
-run "building the entire world" "script 
$MAKEOBJDIRPREFIX/out.$DATESTAMP.before make -DNO_CLEAN MK_TESTS=no buildworld"
+run "building the entire world" "script 
$MAKEOBJDIRPREFIX/out.$DATESTAMP.before $BUILDWORLD"
 fi
 
 Cd $CWD
@@ -299,7 +302,7 @@ run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat
 #run "making build dir '$dir'" "make LIBXOSRC=$CWD/dist"
 #done
 
-run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP make 
-DNO_CLEAN MK_TESTS=no buildworld LIBXOSRC=$CWD/dist"
+run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP 
$BUILDWORLD LIBXOSRC=$CWD/dist"
 
 # Okay, so now it all builds!!  Now we can start committing
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319731 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo lib/libxo

2017-06-08 Thread Phil Shafer

Author: phil
Date: Fri Jun  9 03:32:49 2017
New Revision: 319731
URL: https://svnweb.freebsd.org/changeset/base/319731

Log:
  Import libxo-0.8.1 with official fix to today's build break.
  
  Submitted by: phil

Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/libxo/libxo.c
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Fri Jun  9 03:30:40 2017
(r319730)
+++ head/contrib/libxo/configure.ac Fri Jun  9 03:32:49 2017
(r319731)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.8.0], [p...@juniper.net])
+AC_INIT([libxo], [0.8.1], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlFri Jun  9 03:30:40 2017
(r319730)
+++ head/contrib/libxo/doc/libxo-manual.htmlFri Jun  9 03:32:49 2017
(r319731)
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-June 3, 2017
+June 8, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cFri Jun  9 03:30:40 2017
(r319730)
+++ head/contrib/libxo/libxo/libxo.cFri Jun  9 03:32:49 2017
(r319731)
@@ -684,6 +684,7 @@ xo_default_init (void)
 #if !defined(NO_LIBXO_OPTIONS)
 if (!XOF_ISSET(xop, XOF_NO_ENV)) {
char *env = getenv("LIBXO_OPTIONS");
+
if (env)
xo_set_options_simple(xop, env);
 
@@ -1157,7 +1158,7 @@ xo_utf8_emit_len (wchar_t wc)
 }
 
 /*
- * Emit a single wide character into the given buffer
+ * Emit one wide character into the given buffer
  */
 static void
 xo_utf8_emit_char (char *buf, ssize_t len, wchar_t wc)
@@ -1169,7 +1170,7 @@ xo_utf8_emit_char (char *buf, ssize_t len, wchar_t wc)
return;
 }
 
-/* Start with the low bits and insert them, six bits as a time */
+/* Start with the low bits and insert them, six bits at a time */
 for (i = len - 1; i >= 0; i--) {
buf[i] = 0x80 | (wc & 0x3f);
wc >>= 6;   /* Drop the low six bits */
@@ -1177,7 +1178,7 @@ xo_utf8_emit_char (char *buf, ssize_t len, wchar_t wc)
 
 /* Finish off the first byte with the length bits */
 buf[0] &= xo_utf8_data_bits[len]; /* Clear out the length bits */
-buf[0] |= xo_utf8_len_bits[len]; /* Drop in new length bits  */
+buf[0] |= xo_utf8_len_bits[len]; /* Drop in new length bits */
 }
 
 /*
@@ -1517,6 +1518,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
newfmt[plen++] = ':';
newfmt[plen++] = ' ';
 }
+
 memcpy(newfmt + plen, fmt, len);
 newfmt[len + plen] = '\0';
 
@@ -1536,6 +1538,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
 
ssize_t left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
ssize_t rc = vsnprintf(xbp->xb_curp, left, newfmt, vap);
+
if (rc >= left) {
if (!xo_buf_has_room(xbp, rc)) {
va_end(va_local);
@@ -1548,6 +1551,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
rc = vsnprintf(xbp->xb_curp, left, fmt, vap);
}
+
va_end(va_local);
 
rc = xo_escape_xml(xbp, rc, 1);
@@ -1558,6 +1562,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
 
if (code >= 0) {
const char *msg = strerror(code);
+
if (msg) {
xo_buf_append(xbp, ": ", 2);
xo_buf_append(xbp, msg, strlen(msg));
@@ -1571,6 +1576,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
vfprintf(stderr, newfmt, vap);
if (code >= 0) {
const char *msg = strerror(code);
+
if (msg)
fprintf(stderr, ": %s", msg);
}
@@ -1687,6 +1693,7 @@ xo_message_hcv (xo_handle_t *xop, int code, const char
va_copy(va_local, vap);
 
ssize_t left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
+
rc = vsnprintf(xbp->xb_curp, left, fmt, vap);
if (rc >= left) {
if (!xo_buf_has_room(xbp, rc)) {
@@ -1700,6 +1707,7 @@ xo_message_hcv (xo_handle_t *xop, int code, const char
left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
rc = vsnprintf(xbp->xb_curp, left, fmt, vap);
}
+
va_end(va_local);
 
rc = xo_escape_xml(xbp, rc, 0);
@@ -1707,6 +1715,7 @@ xo_message_hcv (xo_handle_t *xop, int code, const char
 
if (

svn commit: r319730 - vendor/Juniper/libxo/0.8.1

2017-06-08 Thread Phil Shafer

Author: phil
Date: Fri Jun  9 03:30:40 2017
New Revision: 319730
URL: https://svnweb.freebsd.org/changeset/base/319730

Log:
  Tag libxo 0.8.1

Added:
 - copied from r319729, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.8.1/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319729 - in vendor/Juniper/libxo/dist: . doc libxo

2017-06-08 Thread Phil Shafer

Author: phil
Date: Fri Jun  9 03:30:07 2017
New Revision: 319729
URL: https://svnweb.freebsd.org/changeset/base/319729

Log:
  Import libxo 0.8.1

Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/libxo/libxo.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Thu Jun  8 23:56:23 2017
(r319728)
+++ vendor/Juniper/libxo/dist/configure.ac  Fri Jun  9 03:30:07 2017
(r319729)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.8.0], [p...@juniper.net])
+AC_INIT([libxo], [0.8.1], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Thu Jun  8 23:56:23 
2017(r319728)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Fri Jun  9 03:30:07 
2017(r319729)
@@ -22011,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-June 3, 2017
+June 8, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==
--- vendor/Juniper/libxo/dist/libxo/libxo.c Thu Jun  8 23:56:23 2017
(r319728)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Fri Jun  9 03:30:07 2017
(r319729)
@@ -239,7 +239,6 @@ typedef uint8_t xo_color_t;
 #define XO_EFF_CLEAR_BITS XO_EFF_RESET /* Reset gets reset, surprisingly */
 
 typedef uint8_t xo_effect_t;
-typedef uint8_t xo_color_t;
 typedef struct xo_colors_s {
 xo_effect_t xoc_effects;   /* Current effect set */
 xo_color_t xoc_col_fg; /* Foreground color */
@@ -685,6 +684,7 @@ xo_default_init (void)
 #if !defined(NO_LIBXO_OPTIONS)
 if (!XOF_ISSET(xop, XOF_NO_ENV)) {
char *env = getenv("LIBXO_OPTIONS");
+
if (env)
xo_set_options_simple(xop, env);
 
@@ -1158,7 +1158,7 @@ xo_utf8_emit_len (wchar_t wc)
 }
 
 /*
- * Emit a single wide character into the given buffer
+ * Emit one wide character into the given buffer
  */
 static void
 xo_utf8_emit_char (char *buf, ssize_t len, wchar_t wc)
@@ -1170,7 +1170,7 @@ xo_utf8_emit_char (char *buf, ssize_t len, wchar_t wc)
return;
 }
 
-/* Start with the low bits and insert them, six bits as a time */
+/* Start with the low bits and insert them, six bits at a time */
 for (i = len - 1; i >= 0; i--) {
buf[i] = 0x80 | (wc & 0x3f);
wc >>= 6;   /* Drop the low six bits */
@@ -1178,7 +1178,7 @@ xo_utf8_emit_char (char *buf, ssize_t len, wchar_t wc)
 
 /* Finish off the first byte with the length bits */
 buf[0] &= xo_utf8_data_bits[len]; /* Clear out the length bits */
-buf[0] |= xo_utf8_len_bits[len]; /* Drop in new length bits  */
+buf[0] |= xo_utf8_len_bits[len]; /* Drop in new length bits */
 }
 
 /*
@@ -1518,6 +1518,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
newfmt[plen++] = ':';
newfmt[plen++] = ' ';
 }
+
 memcpy(newfmt + plen, fmt, len);
 newfmt[len + plen] = '\0';
 
@@ -1537,6 +1538,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
 
ssize_t left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
ssize_t rc = vsnprintf(xbp->xb_curp, left, newfmt, vap);
+
if (rc >= left) {
if (!xo_buf_has_room(xbp, rc)) {
va_end(va_local);
@@ -1549,6 +1551,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
rc = vsnprintf(xbp->xb_curp, left, fmt, vap);
}
+
va_end(va_local);
 
rc = xo_escape_xml(xbp, rc, 1);
@@ -1559,6 +1562,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
 
if (code >= 0) {
const char *msg = strerror(code);
+
if (msg) {
xo_buf_append(xbp, ": ", 2);
xo_buf_append(xbp, msg, strlen(msg));
@@ -1572,6 +1576,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, int check_war
vfprintf(stderr, newfmt, vap);
if (code >= 0) {
const char *msg = strerror(code);
+
if (msg)
fprintf(stderr, ": %s", msg);
}
@@ -1688,6 +1693,7 @@ xo_message_hcv (xo_handle_t *xop, int code, const char
va_copy(va_local, vap);
 
ssize_t left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp);
+
rc = vsnprintf(xbp->xb_curp, left, fmt, vap);
if (rc >= left) {
if (!xo_buf_has_room(xbp, rc)) {
@@ -1701,6 +1707,7 @@ xo_message_hcv (xo_handle_t *xop, int code, const char
left = xbp->xb_size - (xbp->xb_curp - xbp->xb_

Re: svn commit: r319694 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/cbor contrib/libxo/encoder/test contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved con

2017-06-08 Thread Phil Shafer

Cy Schubert writes:
>/home/cy/current/contrib/libxo/libxo/libxo.c:242:17: error: redefinition of 
>typedef 'xo_color_t' is a C11 feature [-Werror,-Wtypedef-redefinition]
>typedef uint8_t xo_color_t;

Apologies.  My compiles under macosx and fb11 didn't hit this.  It's
fixed now.  I'll reimport a libxo version with the fix when my "make
buildworld" completes.

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319709 - head/contrib/libxo/libxo

2017-06-08 Thread Phil Shafer

Author: phil
Date: Thu Jun  8 17:00:40 2017
New Revision: 319709
URL: https://svnweb.freebsd.org/changeset/base/319709

Log:
  remove xo_color_t dup typedef

Modified:
  head/contrib/libxo/libxo/libxo.c

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cThu Jun  8 16:57:06 2017
(r319708)
+++ head/contrib/libxo/libxo/libxo.cThu Jun  8 17:00:40 2017
(r319709)
@@ -239,7 +239,6 @@ typedef uint8_t xo_color_t;
 #define XO_EFF_CLEAR_BITS XO_EFF_RESET /* Reset gets reset, surprisingly */
 
 typedef uint8_t xo_effect_t;
-typedef uint8_t xo_color_t;
 typedef struct xo_colors_s {
 xo_effect_t xoc_effects;   /* Current effect set */
 xo_color_t xoc_col_fg; /* Foreground color */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319694 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/cbor contrib/libxo/encoder/test contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved cont...

2017-06-08 Thread Phil Shafer

Author: phil
Date: Thu Jun  8 13:04:01 2017
New Revision: 319694
URL: https://svnweb.freebsd.org/changeset/base/319694

Log:
  Import libxo-0.8.0:
   - addition of --libxo colors=x color map (so I never see "blue")
   - fix bugs from -fsanitize=address and =undefined
   - utf-8 changes (remove support fore 6 byte utf-8 values, which are 
"historical")
   - add comments
   - fix man pages
   - update test cases
  
  Submitted by: phil
  Reviewed by:  sjg
  Approved by:  sjg (mentor)

Modified:
  head/contrib/libxo/Makefile.am
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/doc/libxo.txt
  head/contrib/libxo/encoder/cbor/enc_cbor.c
  head/contrib/libxo/encoder/test/enc_test.c
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo.h
  head/contrib/libxo/libxo/xo_buf.h
  head/contrib/libxo/libxo/xo_encoder.c
  head/contrib/libxo/libxo/xo_encoder.h
  head/contrib/libxo/libxo/xo_syslog.c
  head/contrib/libxo/tests/core/Makefile.am
  head/contrib/libxo/tests/core/saved/test_01.E.out
  head/contrib/libxo/tests/core/saved/test_02.E.out
  head/contrib/libxo/tests/core/saved/test_03.E.out
  head/contrib/libxo/tests/core/saved/test_04.E.out
  head/contrib/libxo/tests/core/saved/test_05.E.out
  head/contrib/libxo/tests/core/saved/test_06.E.out
  head/contrib/libxo/tests/core/saved/test_07.E.out
  head/contrib/libxo/tests/core/saved/test_08.E.out
  head/contrib/libxo/tests/core/saved/test_09.E.out
  head/contrib/libxo/tests/core/saved/test_10.E.out
  head/contrib/libxo/tests/core/saved/test_11.E.out
  head/contrib/libxo/tests/core/saved/test_11.HIPx.out
  head/contrib/libxo/tests/core/saved/test_12.E.out
  head/contrib/libxo/tests/core/saved/test_12.H.out
  head/contrib/libxo/tests/core/saved/test_12.HIPx.out
  head/contrib/libxo/tests/core/saved/test_12.HP.out
  head/contrib/libxo/tests/core/saved/test_12.J.out
  head/contrib/libxo/tests/core/saved/test_12.JP.out
  head/contrib/libxo/tests/core/saved/test_12.T.out
  head/contrib/libxo/tests/core/saved/test_12.X.out
  head/contrib/libxo/tests/core/saved/test_12.XP.out
  head/contrib/libxo/tests/core/test_12.c
  head/contrib/libxo/tests/gettext/Makefile.am
  head/contrib/libxo/tests/xo/Makefile.am
  head/contrib/libxo/xo/xo.1
  head/contrib/libxo/xohtml/xohtml.1
  head/contrib/libxo/xopo/xopo.1
  head/contrib/libxo/xopo/xopo.c
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/Makefile.am
==
--- head/contrib/libxo/Makefile.am  Thu Jun  8 12:58:47 2017
(r319693)
+++ head/contrib/libxo/Makefile.am  Thu Jun  8 13:04:01 2017
(r319694)
@@ -100,4 +100,25 @@ ANALYZE_DIR = ~/trash/libxo
 ANALYZE_CMD = scan-build-mp-3.6
 
 analyze:
+   ${MAKE} clean
${ANALYZE_CMD} -o ${ANALYZE_DIR} ${MAKE}
+
+SANIFLAGS=-fno-omit-frame-pointer -g -O2
+
+sanitize-address:
+   ${MAKE} clean
+   ${MAKE} CFLAGS="-fsanitize=address ${SANIFLAGS}"
+   ${MAKE} install
+   ${MAKE} test
+
+sanitize-undefined:
+   ${MAKE} clean
+   ${MAKE} CFLAGS="-fsanitize=undefined ${SANIFLAGS}"
+   ${MAKE} install
+   ${MAKE} test
+
+sanitize-memory:
+   ${MAKE} clean
+   ${MAKE} CFLAGS="-fsanitize=memory ${SANIFLAGS}"
+   ${MAKE} install
+   ${MAKE} test

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Thu Jun  8 12:58:47 2017
(r319693)
+++ head/contrib/libxo/configure.ac Thu Jun  8 13:04:01 2017
(r319694)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.7.2], [p...@juniper.net])
+AC_INIT([libxo], [0.8.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlThu Jun  8 12:58:47 2017
(r319693)
+++ head/contrib/libxo/doc/libxo-manual.htmlThu Jun  8 13:04:01 2017
(r319694)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "May 2017";
+   content: "June 2017";
  
   } 
   @top-center {
@@ -21983,15 +21983,17 @@ jQuery(function ($) {
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
 http://greenbytes.de/tech/webdav/rfc2629.xslt, 
Revision 1.389, 2008-08-20 14:21:35, XSLT vendor: libxslt 
http://xmlsoft.org/XSLT/";>
 http://purl.org/dc/elements/1.1/";>
 
@@ -22009,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-May 15, 2017
+June 3, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual
@@ -22018,398 +22020,413 @@ jQuery(function ($) {
 
 
 1���
-Overview
-1.1���
-Getting libxo
+Overview
+
+
+2���
+Getting libxo
 
-1.1.1���
+2.1��

svn commit: r319693 - vendor/Juniper/libxo/0.8.0

2017-06-08 Thread Phil Shafer

Author: phil
Date: Thu Jun  8 12:58:47 2017
New Revision: 319693
URL: https://svnweb.freebsd.org/changeset/base/319693

Log:
  Tag libxo 0.8.0

Added:
 - copied from r319692, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.8.0/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r319692 - in vendor/Juniper/libxo/dist: . doc encoder/cbor encoder/test libxo tests/core tests/core/saved tests/gettext tests/xo xo xohtml xopo

2017-06-08 Thread Phil Shafer

Author: phil
Date: Thu Jun  8 12:58:33 2017
New Revision: 319692
URL: https://svnweb.freebsd.org/changeset/base/319692

Log:
  Import libxo 0.8.0

Modified:
  vendor/Juniper/libxo/dist/Makefile.am
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/doc/libxo.txt
  vendor/Juniper/libxo/dist/encoder/cbor/enc_cbor.c
  vendor/Juniper/libxo/dist/encoder/test/enc_test.c
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo.h
  vendor/Juniper/libxo/dist/libxo/xo_buf.h
  vendor/Juniper/libxo/dist/libxo/xo_encoder.c
  vendor/Juniper/libxo/dist/libxo/xo_encoder.h
  vendor/Juniper/libxo/dist/libxo/xo_syslog.c
  vendor/Juniper/libxo/dist/tests/core/Makefile.am
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_02.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_04.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_05.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_06.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_07.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_08.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_09.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_10.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_11.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_11.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_12.c
  vendor/Juniper/libxo/dist/tests/gettext/Makefile.am
  vendor/Juniper/libxo/dist/tests/xo/Makefile.am
  vendor/Juniper/libxo/dist/xo/xo.1
  vendor/Juniper/libxo/dist/xohtml/xohtml.1
  vendor/Juniper/libxo/dist/xopo/xopo.1
  vendor/Juniper/libxo/dist/xopo/xopo.c

Modified: vendor/Juniper/libxo/dist/Makefile.am
==
--- vendor/Juniper/libxo/dist/Makefile.am   Thu Jun  8 12:39:03 2017
(r319691)
+++ vendor/Juniper/libxo/dist/Makefile.am   Thu Jun  8 12:58:33 2017
(r319692)
@@ -100,4 +100,25 @@ ANALYZE_DIR = ~/trash/libxo
 ANALYZE_CMD = scan-build-mp-3.6
 
 analyze:
+   ${MAKE} clean
${ANALYZE_CMD} -o ${ANALYZE_DIR} ${MAKE}
+
+SANIFLAGS=-fno-omit-frame-pointer -g -O2
+
+sanitize-address:
+   ${MAKE} clean
+   ${MAKE} CFLAGS="-fsanitize=address ${SANIFLAGS}"
+   ${MAKE} install
+   ${MAKE} test
+
+sanitize-undefined:
+   ${MAKE} clean
+   ${MAKE} CFLAGS="-fsanitize=undefined ${SANIFLAGS}"
+   ${MAKE} install
+   ${MAKE} test
+
+sanitize-memory:
+   ${MAKE} clean
+   ${MAKE} CFLAGS="-fsanitize=memory ${SANIFLAGS}"
+   ${MAKE} install
+   ${MAKE} test

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Thu Jun  8 12:39:03 2017
(r319691)
+++ vendor/Juniper/libxo/dist/configure.ac  Thu Jun  8 12:58:33 2017
(r319692)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.7.2], [p...@juniper.net])
+AC_INIT([libxo], [0.8.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Thu Jun  8 12:39:03 
2017(r319691)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Thu Jun  8 12:58:33 
2017(r319692)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "May 2017";
+   content: "June 2017";
  
   } 
   @top-center {
@@ -21983,15 +21983,17 @@ jQuery(function ($) {
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
 http://greenbytes.de/tech/webdav/rfc2629.xslt, 
Revision 1.389, 2008-08-20 14:21:35, XSLT vendor: libxslt 
http://xmlsoft.org/XSLT/";>
 http://purl.org/dc/elements/1.1/";>
 
@@ -22009,7 +22011,7 @@ jQuery(function ($) {
 
 
 
-May 15, 2017
+June 3, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual
@@ -22018,398 +22020,413 @@ jQuery(function ($) {
 
 
 1���
-Overview
-1.1���
-Getting libxo
+Overview
+
+
+2���
+Getting libxo
 
-1.1.1���
+2.1���
 Downloading libxo Source Code
 
 
-1.1.2���
+2.2���
 Building libxo
 
-1.1.2.1���
+2.2.1���
 Setting u

Re: svn commit: r318364 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/tests/gettext/saved contrib/libxo/xo lib/li

2017-05-16 Thread Phil Shafer

"Ngie Cooper (yaneurabeya)" writes:
>> URL: https://svnweb.freebsd.org/changeset/base/318364
>Relnotes: yes
>Also, what does this upgrade entail, in terms of new features/risk?

It's all documentation and minor fixes (213478, 204651).  There is
also a fix for using "int"s to keep buffer offsets (#55 on github).
No user-visible changes.

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r318364 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/tests/gettext/saved contrib/libxo/xo lib/lib...

2017-05-16 Thread Phil Shafer

Author: phil
Date: Tue May 16 18:46:56 2017
New Revision: 318364
URL: https://svnweb.freebsd.org/changeset/base/318364

Log:
  Import libxo-0.7.2; add xo_options.7.
  
  Submitted by: phil
  Reviewed by:  sjg
  Approved by:  sjg (mentor)

Added:
  head/contrib/libxo/libxo/xo_options.7
 - copied unchanged from r318362, 
vendor/Juniper/libxo/dist/libxo/xo_options.7
Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/Makefile.am
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/doc/libxo.txt
  head/contrib/libxo/libxo/Makefile.am
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo.h
  head/contrib/libxo/libxo/xo_buf.h
  head/contrib/libxo/libxo/xo_encoder.c
  head/contrib/libxo/libxo/xo_format.5
  head/contrib/libxo/libxo/xo_syslog.c
  head/contrib/libxo/tests/core/saved/test_01.E.out
  head/contrib/libxo/tests/core/saved/test_01.J.out
  head/contrib/libxo/tests/core/saved/test_01.JP.out
  head/contrib/libxo/tests/core/saved/test_01.X.out
  head/contrib/libxo/tests/core/saved/test_01.XP.out
  head/contrib/libxo/tests/core/saved/test_10.X.out
  head/contrib/libxo/tests/core/saved/test_10.XP.out
  head/contrib/libxo/tests/core/saved/test_11.X.out
  head/contrib/libxo/tests/core/saved/test_11.XP.out
  head/contrib/libxo/tests/core/test_01.c
  head/contrib/libxo/tests/gettext/saved/gt_01.J.out
  head/contrib/libxo/tests/gettext/saved/gt_01.JP.out
  head/contrib/libxo/xo/xo.c
  head/lib/libxo/Makefile
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
  head/usr.bin/xo/Makefile
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Tue May 16 18:42:44 2017
(r318363)
+++ head/contrib/libxo/configure.ac Tue May 16 18:46:56 2017
(r318364)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.6.3], [p...@juniper.net])
+AC_INIT([libxo], [0.7.2], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -20,7 +20,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PROG_CC
-AM_PROG_AR
 AC_PROG_INSTALL
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LN_S
@@ -135,6 +134,21 @@ if test "$GETTEXT_ENABLE" != "no"; then
 
   AC_MSG_RESULT([$HAVE_GETTEXT])
   fi
+
+  if test "$HAVE_GETTEXT" != "yes"; then
+  GETTEXT_PREFIX=/usr/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 ]
+ [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
@@ -278,6 +292,13 @@ AC_ARG_ENABLE([debug],
 AC_MSG_RESULT([$LIBXO_DEBUG])
 AM_CONDITIONAL([LIBXO_DEBUG], [test "$LIBXO_DEBUG" != "no"])
 
+AC_MSG_CHECKING([whether to use int return codes])
+AC_ARG_ENABLE([int-return-codes],
+[  --enable-int-return-codesUse int return codes (instead of ssize_t)],
+[USE_INT_RETURN_CODES=yes; AC_DEFINE([USE_INT_RETURN_CODES], [1], [Use int 
return codes])],
+[USE_INT_RETURN_CODES=no])
+AC_MSG_RESULT([$USE_INT_RETURN_CODES])
+
 AC_MSG_CHECKING([whether to build with text-only rendering])
 AC_ARG_ENABLE([text-only],
 [  --enable-text-onlyTurn on text-only rendering],

Modified: head/contrib/libxo/doc/Makefile.am
==
--- head/contrib/libxo/doc/Makefile.am  Tue May 16 18:42:44 2017
(r318363)
+++ head/contrib/libxo/doc/Makefile.am  Tue May 16 18:46:56 2017
(r318364)
@@ -61,9 +61,9 @@ xolint.txt: ${top_srcdir}/xolint/xolint.
 CLEANFILES = \
 xolint.txt \
 ${INPUT}.xml \
-${INPUT}.txt \
 ${INPUT}.fxml \
-${INPUT}.html
+${OUTPUT}.txt \
+${OUTPUT}.html
 else
 doc docs:
@${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org"

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlTue May 16 18:42:44 2017
(r318363)
+++ head/contrib/libxo/doc/libxo-manual.htmlTue May 16 18:46:56 2017
(r318364)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "May 2016";
+   content: "May 2017";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 
 
 
-May 28, 2016
+May 15, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual
@@ -22271,36 +22271,40 @@ jQuery(function ($) {
 
 
 3.1.4���
-xo_set_style
+xo_set_style
+
+
+3.1.5���
+xo_get_style
 
-3.1.4.1���
+3.1.5.

svn commit: r318362 - vendor/Juniper/libxo/0.7.2

2017-05-16 Thread Phil Shafer

Author: phil
Date: Tue May 16 18:42:07 2017
New Revision: 318362
URL: https://svnweb.freebsd.org/changeset/base/318362

Log:
  Tag libxo 0.7.2

Added:
 - copied from r318361, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.7.2/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r318361 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved tests/gettext tests/gettext/po/pig_latin tests/gettext/saved xo

2017-05-16 Thread Phil Shafer

Author: phil
Date: Tue May 16 18:41:36 2017
New Revision: 318361
URL: https://svnweb.freebsd.org/changeset/base/318361

Log:
  Import libxo 0.7.2

Added:
  vendor/Juniper/libxo/dist/libxo/xo_options.7   (contents, props changed)
Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/Makefile.am
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/doc/libxo.txt
  vendor/Juniper/libxo/dist/libxo/Makefile.am
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo.h
  vendor/Juniper/libxo/dist/libxo/xo_buf.h
  vendor/Juniper/libxo/dist/libxo/xo_encoder.c
  vendor/Juniper/libxo/dist/libxo/xo_format.5
  vendor/Juniper/libxo/dist/libxo/xo_syslog.c
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.XP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_10.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_10.XP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_11.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_11.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_01.c
  vendor/Juniper/libxo/dist/tests/gettext/po/pig_latin/strerror.po
  vendor/Juniper/libxo/dist/tests/gettext/saved/gt_01.J.out
  vendor/Juniper/libxo/dist/tests/gettext/saved/gt_01.JP.out
  vendor/Juniper/libxo/dist/tests/gettext/strerror.pot
  vendor/Juniper/libxo/dist/xo/xo.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Tue May 16 18:39:23 2017
(r318360)
+++ vendor/Juniper/libxo/dist/configure.ac  Tue May 16 18:41:36 2017
(r318361)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.6.3], [p...@juniper.net])
+AC_INIT([libxo], [0.7.2], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -20,7 +20,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PROG_CC
-AM_PROG_AR
 AC_PROG_INSTALL
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LN_S
@@ -135,6 +134,21 @@ if test "$GETTEXT_ENABLE" != "no"; then
 
   AC_MSG_RESULT([$HAVE_GETTEXT])
   fi
+
+  if test "$HAVE_GETTEXT" != "yes"; then
+  GETTEXT_PREFIX=/usr/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 ]
+ [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
@@ -278,6 +292,13 @@ AC_ARG_ENABLE([debug],
 AC_MSG_RESULT([$LIBXO_DEBUG])
 AM_CONDITIONAL([LIBXO_DEBUG], [test "$LIBXO_DEBUG" != "no"])
 
+AC_MSG_CHECKING([whether to use int return codes])
+AC_ARG_ENABLE([int-return-codes],
+[  --enable-int-return-codesUse int return codes (instead of ssize_t)],
+[USE_INT_RETURN_CODES=yes; AC_DEFINE([USE_INT_RETURN_CODES], [1], [Use int 
return codes])],
+[USE_INT_RETURN_CODES=no])
+AC_MSG_RESULT([$USE_INT_RETURN_CODES])
+
 AC_MSG_CHECKING([whether to build with text-only rendering])
 AC_ARG_ENABLE([text-only],
 [  --enable-text-onlyTurn on text-only rendering],

Modified: vendor/Juniper/libxo/dist/doc/Makefile.am
==
--- vendor/Juniper/libxo/dist/doc/Makefile.am   Tue May 16 18:39:23 2017
(r318360)
+++ vendor/Juniper/libxo/dist/doc/Makefile.am   Tue May 16 18:41:36 2017
(r318361)
@@ -61,9 +61,9 @@ xolint.txt: ${top_srcdir}/xolint/xolint.
 CLEANFILES = \
 xolint.txt \
 ${INPUT}.xml \
-${INPUT}.txt \
 ${INPUT}.fxml \
-${INPUT}.html
+${OUTPUT}.txt \
+${OUTPUT}.html
 else
 doc docs:
@${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org"

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Tue May 16 18:39:23 
2017(r318360)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Tue May 16 18:41:36 
2017(r318361)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "May 2016";
+   content: "May 2017";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 
 
 
-May 28, 2016
+May 15, 2017
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual
@@ -22271,36 +22271,40 @@ jQuery(function ($) {
 
 
 3.1.4���
-xo_set_style
+xo_set_style

svn commit: r303341 - head/share/misc

2016-07-26 Thread Phil Shafer

Author: phil
Date: Tue Jul 26 18:27:48 2016
New Revision: 303341
URL: https://svnweb.freebsd.org/changeset/base/303341

Log:
  Fix start date to not be in the future.
  
  Submitted by: phil
  Reviewed by:  sjg (mentor)
  Approved by:  sjg

Modified:
  head/share/misc/committers-src.dot

Modified: head/share/misc/committers-src.dot
==
--- head/share/misc/committers-src.dot  Tue Jul 26 17:23:49 2016
(r303340)
+++ head/share/misc/committers-src.dot  Tue Jul 26 18:27:48 2016
(r303341)
@@ -259,7 +259,7 @@ peadar [label="Peter Edwards\npeadar@Fre
 peter [label="Peter Wemm\npe...@freebsd.org\n1995/07/04"]
 peterj [label="Peter Jeremy\npet...@freebsd.org\n2012/09/14"]
 pfg [label="Pedro Giffuni\n...@freebsd.org\n2011/12/01"]
-phil [label="Phil Shafer\np...@freebsd.ogr\n2016/12/30"]
+phil [label="Phil Shafer\np...@freebsd.ogr\n2015/12/30"]
 philip [label="Philip Paeps\nphi...@freebsd.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\n...@freebsd.org\n1994/02/21"]
 pho [label="Peter Holm\n...@freebsd.org\n2008/11/16"]
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r300924 - vendor/Juniper/libxo/0.6.2

2016-05-29 Thread Phil Shafer

Author: phil
Date: Sun May 29 01:40:48 2016
New Revision: 300924
URL: https://svnweb.freebsd.org/changeset/base/300924

Log:
  Tag libxo 0.6.2

Added:
 - copied from r300923, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.6.2/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r300923 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved

2016-05-29 Thread Phil Shafer

Author: phil
Date: Sun May 29 01:40:19 2016
New Revision: 300923
URL: https://svnweb.freebsd.org/changeset/base/300923

Log:
  Import libxo 0.6.2

Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/doc/libxo.txt
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo_buf.h
  vendor/Juniper/libxo/dist/libxo/xo_encoder.c
  vendor/Juniper/libxo/dist/libxo/xo_format.5
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_03.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_03.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Sun May 29 01:38:12 2016
(r300922)
+++ vendor/Juniper/libxo/dist/configure.ac  Sun May 29 01:40:19 2016
(r300923)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.6.1], [p...@juniper.net])
+AC_INIT([libxo], [0.6.2], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Sun May 29 01:38:12 
2016(r300922)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Sun May 29 01:40:19 
2016(r300923)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "April 2016";
+   content: "May 2016";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 
 
 
-April 15, 2016
+May 28, 2016
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual
@@ -22739,7 +22739,7 @@ jQuery(function ($) {
 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.
+The following sections will 
walk through each of these steps with additional details and options, but the 
above directions should be all that's needed.
 Section Contents: 
 
 Section�1.1.2.1
@@ -23087,7 +23087,7 @@ jQuery(function ($) {
 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:
+Roles and modifiers can also use more verbose 
names, when preceded by a comma:
  
 EXAMPLE:
 xo_emit("{,label:Free}{,decoration::}{,padding:   }"
@@ -23444,7 +23444,7 @@ jQuery(function ($) {
 
 
 
-Roles and modifiers can also use more verbose 
names, when preceeded by a comma. For example, the modifier string "Lwc" (or 
"L,white,colon") means the field has a label role (text that describes the next 
field) and should be followed by a colon ('c') and a space ('w'). The modifier 
string "Vkq" (or ":key,quote") means the field has a value role (the default 
role), that it is a key for the current instance, and that the value should be 
quoted when encoded for JSON.
+Roles and modifiers can also use more verbose 
names, when preceded by a comma. For example, the modifier string "Lwc" (or 
"L,white,colon") means the field has a label role (text that describes the next 
field) and should be followed by a colon ('c') and a space ('w'). The modifier 
string "Vkq" (or ":key,quote") means the field has a value role (the default 
role), that it is a key for the current instance, and that the value should be 
quoted when encoded for JSON.
 Section Contents: 
 
 Section�2.2.2.1
@@ -23688,7 +23688,7 @@ jQuery(function ($) {
 a '#' character, indicating the output value should be prefixed with '0x', 
typically to indicate a base 16 (hex) value.
 a minus sign ('‑'), indicating the output value should be padded on 
the right instead of the left.
 a leading zero ('0') indicating the output value should be padded on the 
left with zeroes instead of spaces (' ').
-one or more digits ('0' - '9') indicating the minimum width of the 
argument. If the width in columns of the output value is less that the minumum 
width, the value will be padded to reach the minimum.
+one or more digits ('0' - '9') indicating the minimum width of the 
argument. If the width in columns of the output value is less than the minimum 
width, the value wi

svn commit: r300930 - vendor/Juniper/libxo

2016-05-28 Thread Phil Shafer

Author: phil
Date: Sun May 29 02:24:51 2016
New Revision: 300930
URL: https://svnweb.freebsd.org/changeset/base/300930

Log:
  Update libxo's .svnignore
  
  Reviewed by:  sjg (mentor)
  Approved by:  sjg

Modified:
  vendor/Juniper/libxo/.svnignore

Modified: vendor/Juniper/libxo/.svnignore
==
--- vendor/Juniper/libxo/.svnignore Sun May 29 02:22:12 2016
(r300929)
+++ vendor/Juniper/libxo/.svnignore Sun May 29 02:24:51 2016
(r300930)
@@ -1,2 +1,6 @@
 libxo-0.4.6
+libxo-0.4.7
+libxo-0.6.0
+libxo-0.6.1
+libxo-0.6.2
 tag.sh
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r300929 - vendor/Juniper/libxo

2016-05-28 Thread Phil Shafer

Author: phil
Date: Sun May 29 02:22:12 2016
New Revision: 300929
URL: https://svnweb.freebsd.org/changeset/base/300929

Log:
  Update import script
  
  Reviewed by:  sjg (mentor)
  Approved by:  sjg

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Sun May 29 02:11:10 2016
(r300928)
+++ vendor/Juniper/libxo/import.sh  Sun May 29 02:22:12 2016
(r300929)
@@ -13,11 +13,6 @@
 #
 
 PROJECT=libxo
-MAKEOBJDIRPREFIX=/tank/home/phil/work/bsd/base/head/obj/
-export MAKEOBJDIRPREFIX
-EDITOR=vi
-VISUAL=vi
-export EDITOR VISUAL
 
 #"global" vars
 # Set SVN variables
@@ -39,9 +34,19 @@ Cd() {
 info "Directory =" `pwd`
 }
 
+siginfo() {
+if [ ! -z "$CMD" ]; then
+info "CMD is $CMD"
+fi
+}
+
+trap 'siginfo' SIGINFO
+trap 'siginfo' SIGCONT
+
 run() {
 desc="$1"
 cmd="$2"
+CMD="$2"
 
 if [ "$DOC" = doc ]; then
 echo " == $desc"
@@ -95,6 +100,7 @@ option_parsing() {
 -p) PROJECT=$2; shift 2;;
-P) PR=$2; shift 2;;
-r) REVIEWER=$2; shift 2;;
+   -u) UPDATE=no; shift;;
 -v) VERS=$2; shift 2;;
 -y) OKAY=yes; shift;;
 
@@ -122,6 +128,17 @@ shift $?
 Cd `dirname $0`
 CWD=`pwd`
 
+TOP=`echo $CWD | sed 's:/vendor/.*::'`
+info "TOP = $TOP"
+
+Cd $TOP
+HEAD=$TOP/head
+info "HEAD = $HEAD"
+
+mkdir -p ../obj
+MAKEOBJDIRPREFIX=`cd ../obj; pwd`
+export MAKEOBJDIRPREFIX
+
 if [ -z "$VENDOR_DIR" ]; then
 VENDOR_DIR=`echo $CWD | sed 's:.*/vendor/::'`
 fi
@@ -131,9 +148,20 @@ fi
 info "CWD = $CWD"
 info "VENDOR_DIR = $VENDOR_DIR"
 info "VERS = $VERS"
+DATESTAMP=`date "+%Y-%m-%d-%H-%M"`
 
 [ -z "$VERS" ] && Error "missing version argument (-v)"
 
+run "show any local changes" "diff -rbu $CWD/dist $HEAD/contrib/libxo"
+
+Cd $HEAD
+run "updating all" "svn update"
+
+if [ ! -z "$UPDATE" ]; then
+run "building the entire world" "script 
$MAKEOBJDIRPREFIX/out.$DATESTAMP.before make -DNO_CLEAN MK_TESTS=no buildworld"
+fi
+
+Cd $CWD
 mkdir -p ~/tars
 
 # We use the source tarball from git since it has no frills
@@ -229,7 +257,7 @@ run "making list of files in existing tr
 "(cd dist && $RSVN list -R) | grep -v '/$' | sort > $TF.old"
 
 run "making list of files in incoming tree" \
-"(cd $BASE && find . -type f ) | cut -c 3- | $SEDNUKE | sort > $TF.new"
+"(echo 'x .svnignore' ; cd $BASE && find . -type f ) | cut -c 3- | 
$SEDNUKE | sort > $TF.new"
 
 run "making list of deleted files" "comm -23 $TF.old $TF.new | tee $TF.rmlist"
 run "making list of new files" "comm -13 $TF.old $TF.new | tee $TF.addlist"
@@ -260,9 +288,7 @@ run "build for real" \
 
 
 # Move over and build the source tree
-Cd $CWD/../../../head
-HEAD=`pwd`
-info "HEAD = $HEAD"
+Cd $HEAD
 
 run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat 
$CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h"
 run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat 
$CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man"
@@ -273,8 +299,7 @@ run "copying add.man" "(echo '.\\\" \$Fr
 #run "making build dir '$dir'" "make LIBXOSRC=$CWD/dist"
 #done
 
-DATESTAMP=`date "+%Y-%m-%d-%H-%M"`
-run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP make 
-DNO_CLEAN buildworld LIBXOSRC=$CWD/dist"
+run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP make 
-DNO_CLEAN MK_TESTS=no buildworld LIBXOSRC=$CWD/dist"
 
 # Okay, so now it all builds!!  Now we can start committing
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r300925 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved lib/libxo

2016-05-28 Thread Phil Shafer

Author: phil
Date: Sun May 29 01:43:28 2016
New Revision: 300925
URL: https://svnweb.freebsd.org/changeset/base/300925

Log:
  Submitted by: phil
  Reviewed by:  sjg (mentor)
  Approved by:  sjg

Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/doc/libxo.txt
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo_buf.h
  head/contrib/libxo/libxo/xo_encoder.c
  head/contrib/libxo/libxo/xo_format.5
  head/contrib/libxo/tests/core/saved/test_03.E.out
  head/contrib/libxo/tests/core/saved/test_03.H.out
  head/contrib/libxo/tests/core/saved/test_03.HIPx.out
  head/contrib/libxo/tests/core/saved/test_03.HP.out
  head/contrib/libxo/tests/core/saved/test_03.J.out
  head/contrib/libxo/tests/core/saved/test_03.JP.out
  head/contrib/libxo/tests/core/saved/test_03.T.out
  head/contrib/libxo/tests/core/saved/test_03.X.out
  head/contrib/libxo/tests/core/saved/test_03.XP.out
  head/contrib/libxo/tests/core/test_03.c
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Sun May 29 01:40:48 2016
(r300924)
+++ head/contrib/libxo/configure.ac Sun May 29 01:43:28 2016
(r300925)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.6.1], [p...@juniper.net])
+AC_INIT([libxo], [0.6.2], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlSun May 29 01:40:48 2016
(r300924)
+++ head/contrib/libxo/doc/libxo-manual.htmlSun May 29 01:43:28 2016
(r300925)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "April 2016";
+   content: "May 2016";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 
 
 
-April 15, 2016
+May 28, 2016
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual
@@ -22739,7 +22739,7 @@ jQuery(function ($) {
 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.
+The following sections will 
walk through each of these steps with additional details and options, but the 
above directions should be all that's needed.
 Section Contents: 
 
 Section�1.1.2.1
@@ -23087,7 +23087,7 @@ jQuery(function ($) {
 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:
+Roles and modifiers can also use more verbose 
names, when preceded by a comma:
  
 EXAMPLE:
 xo_emit("{,label:Free}{,decoration::}{,padding:   }"
@@ -23444,7 +23444,7 @@ jQuery(function ($) {
 
 
 
-Roles and modifiers can also use more verbose 
names, when preceeded by a comma. For example, the modifier string "Lwc" (or 
"L,white,colon") means the field has a label role (text that describes the next 
field) and should be followed by a colon ('c') and a space ('w'). The modifier 
string "Vkq" (or ":key,quote") means the field has a value role (the default 
role), that it is a key for the current instance, and that the value should be 
quoted when encoded for JSON.
+Roles and modifiers can also use more verbose 
names, when preceded by a comma. For example, the modifier string "Lwc" (or 
"L,white,colon") means the field has a label role (text that describes the next 
field) and should be followed by a colon ('c') and a space ('w'). The modifier 
string "Vkq" (or ":key,quote") means the field has a value role (the default 
role), that it is a key for the current instance, and that the value should be 
quoted when encoded for JSON.
 Section Contents: 
 
 Section�2.2.2.1
@@ -23688,7 +23688,7 @@ jQuery(function ($) {
 a '#' character, indicating the output value should be prefixed with '0x', 
typically to indicate a base 16 (hex) value.
 a minus sign ('‑'), indicating the output value should be padded on 
the right instead of the left.
 a leading zero ('0') indicating the output value should be padded on the 
left with zeroes instead of spaces (' ').
-one or more digits ('0' - '9') indicating the minimum width of the 
argument. If the width in columns of the output value is less that the minumum 
width, the value will be padded to reach the minimum.
+one or more digits ('0' - '9') indicating the minimum width of the 
argument. If the width in columns of the output value is less than the minimum 
width, the value wi

svn commit: r300912 - head/contrib/libxo/libxo

2016-05-28 Thread Phil Shafer

Author: phil
Date: Sat May 28 19:39:15 2016
New Revision: 300912
URL: https://svnweb.freebsd.org/changeset/base/300912

Log:
  Undo meaningless local changes to libxo so we're in sync with the github repo.
  
  Submitted by: phil
  Reviewed by:  sjg (mentor)
  Approved by:  sjg

Modified:
  head/contrib/libxo/libxo/xo_format.5
  head/contrib/libxo/libxo/xo_syslog.c

Modified: head/contrib/libxo/libxo/xo_format.5
==
--- head/contrib/libxo/libxo/xo_format.5Sat May 28 19:13:39 2016
(r300911)
+++ head/contrib/libxo/libxo/xo_format.5Sat May 28 19:39:15 2016
(r300912)
@@ -7,7 +7,7 @@
 .\" # LICENSE.
 .\" # Phil Shafer, July 2014
 .\"
-.Dd November 6, 2015
+.Dd December 4, 2014
 .Dt LIBXO 3
 .Os
 .Sh NAME

Modified: head/contrib/libxo/libxo/xo_syslog.c
==
--- head/contrib/libxo/libxo/xo_syslog.cSat May 28 19:13:39 2016
(r300911)
+++ head/contrib/libxo/libxo/xo_syslog.cSat May 28 19:39:15 2016
(r300912)
@@ -91,7 +91,7 @@
 #elif defined(__macosx__)
 #define XO_DEFAULT_EID 63
 #else
-#define XO_DEFAULT_EID 32473   /* Bail; use "example" number */
+#define XO_DEFAULT_EID 32473   /* Fallback to the "example" number */
 #endif
 
 #ifdef _SC_HOST_NAME_MAX
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r298083 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/cbor contrib/libxo/libxo contrib/libxo/packaging contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib...

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 18:46:15 2016
New Revision: 298083
URL: https://svnweb.freebsd.org/changeset/base/298083

Log:
  Import to 0.6.1
0.5.0:
  document "trim" modifier
  add xo_emit_field functions
  Add xo_set_file{,_h} functions
  Fix LIBXO_* variables; add -L and -I as needed
  add --disable-silent-rules and an explicit make; 
s/PACKAGE-NAME/PACKAGE_NAME/; add /download/ to 'url'
  fix silliness where xo_flush_h emitted closing tag (html); make the 
caller (xo_message) do it
  flush after transitions; fix flush call in xo_do_emit
  mkdir the version-specific packaging dir
  use "XO_" instead of LIBXO_
  
0.6.0:
  Add --with-retain-size to set the size (in bits) of the retain hash 
buckets
  Add The Argument Modifier ({a:})
  Add retain and no-retain to --libxo
  autoconf: Add test for monitor.h
  Document quote heuristic
  go deep with nroff backslashes
  Use "ULL" for 32 bit check
  add xo_retain_clear and xo_retain_clear_all
  docs: combine two 'handles' section; move command line argument section
  handle GETTEXT when msgfmt isn't where it's supposed to be (FreeBSD)
  make 'retain' a flag (XOEF_RETAIN) instead of a role; it's simpler, and 
doesn't feel as tacky. "{R:}" was painful to document, which means it's painful 
to use.
  new xo_emit_f functions
  nuke some unused UNUSEDs
  test code: path must be static
  update test cases
  
0.6.1:
  fix version number (missed a commit during new-release)
  
  Reviewed by:  sjg
  Approved by:  sjg (mentor)

Added:
  head/contrib/libxo/libxo/xo_emit_f.3
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/libxo/xo_emit_f.3
  head/contrib/libxo/tests/core/saved/test_12.E.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.err
  head/contrib/libxo/tests/core/saved/test_12.E.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.out
  head/contrib/libxo/tests/core/saved/test_12.H.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.err
  head/contrib/libxo/tests/core/saved/test_12.H.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.out
  head/contrib/libxo/tests/core/saved/test_12.HIPx.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.err
  head/contrib/libxo/tests/core/saved/test_12.HIPx.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.out
  head/contrib/libxo/tests/core/saved/test_12.HP.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.err
  head/contrib/libxo/tests/core/saved/test_12.HP.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.out
  head/contrib/libxo/tests/core/saved/test_12.J.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.err
  head/contrib/libxo/tests/core/saved/test_12.J.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.out
  head/contrib/libxo/tests/core/saved/test_12.JP.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.err
  head/contrib/libxo/tests/core/saved/test_12.JP.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.out
  head/contrib/libxo/tests/core/saved/test_12.T.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.err
  head/contrib/libxo/tests/core/saved/test_12.T.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.out
  head/contrib/libxo/tests/core/saved/test_12.X.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.err
  head/contrib/libxo/tests/core/saved/test_12.X.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.out
  head/contrib/libxo/tests/core/saved/test_12.XP.err
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.err
  head/contrib/libxo/tests/core/saved/test_12.XP.out
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.out
  head/contrib/libxo/tests/core/test_12.c
 - copied unchanged from r298078, 
vendor/Juniper/libxo/dist/tests/core/test_12.c
Modified:
  head/contrib/libxo/Makefile.am
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/doc/libxo.txt
  head/contrib/libxo/encoder/cbor/enc_cbor.c
  head/contrib/libxo/libxo-config.in
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo.h
  head/contrib/libxo/libxo/xo_format.5
  head/contrib/libxo/libxo/xo_parse_args.3
  head/contrib/libxo/packaging/libxo.pc.in
  head/contrib/libxo/pac

svn commit: r298081 - vendor/Juniper/libxo/0.6.1

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 18:42:10 2016
New Revision: 298081
URL: https://svnweb.freebsd.org/changeset/base/298081

Log:
  Tag libxo 0.6.1

Added:
 - copied from r298080, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.6.1/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r298080 - vendor/Juniper/libxo/dist

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 18:41:39 2016
New Revision: 298080
URL: https://svnweb.freebsd.org/changeset/base/298080

Log:
  Import libxo 0.6.1

Modified:
  vendor/Juniper/libxo/dist/configure.ac

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Fri Apr 15 18:32:05 2016
(r298079)
+++ vendor/Juniper/libxo/dist/configure.ac  Fri Apr 15 18:41:39 2016
(r298080)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.5.0], [p...@juniper.net])
+AC_INIT([libxo], [0.6.1], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r298078 - vendor/Juniper/libxo/0.6.0

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 18:03:53 2016
New Revision: 298078
URL: https://svnweb.freebsd.org/changeset/base/298078

Log:
  Tag libxo 0.6.0

Added:
 - copied from r298077, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.6.0/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r298077 - in vendor/Juniper/libxo/dist: . doc encoder/cbor libxo packaging tests/core tests/core/saved tests/gettext

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 18:03:30 2016
New Revision: 298077
URL: https://svnweb.freebsd.org/changeset/base/298077

Log:
  Import libxo 0.6.0

Added:
  vendor/Juniper/libxo/dist/libxo/xo_emit_f.3   (contents, props changed)
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.err
  vendor/Juniper/libxo/dist/tests/core/saved/test_12.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_12.c   (contents, props changed)
Modified:
  vendor/Juniper/libxo/dist/Makefile.am
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/doc/libxo.txt
  vendor/Juniper/libxo/dist/encoder/cbor/enc_cbor.c
  vendor/Juniper/libxo/dist/libxo-config.in
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo.h
  vendor/Juniper/libxo/dist/libxo/xo_format.5
  vendor/Juniper/libxo/dist/libxo/xo_parse_args.3
  vendor/Juniper/libxo/dist/packaging/libxo.pc.in
  vendor/Juniper/libxo/dist/packaging/libxo.rb.base.in
  vendor/Juniper/libxo/dist/tests/core/Makefile.am
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_01.c
  vendor/Juniper/libxo/dist/tests/core/test_02.c
  vendor/Juniper/libxo/dist/tests/gettext/gt_01.c

Modified: vendor/Juniper/libxo/dist/Makefile.am
==
--- vendor/Juniper/libxo/dist/Makefile.am   Fri Apr 15 17:45:12 2016
(r298076)
+++ vendor/Juniper/libxo/dist/Makefile.am   Fri Apr 15 18:03:30 2016
(r298077)
@@ -77,6 +77,7 @@ GH_PAGES_PACKAGE_DIR = ${GH_PAGES_DIR}/$
 packages:
@-[ -d ${GH_PAGES_DIR} ] && set -x \
&& echo "Updating packages on gh-pages ..." \
+&& mkdir -p ${GH_PAGES_DIR}/${GH_PACKAGING_DIR} \
&& SHA1="`openssl sha1 ${PACKAGE_FILE} | awk '{print $$2}'`" \
&& SHA256="`openssl sha256 ${PACKAGE_FILE} | awk '{print 
$$2}'`" \
&& SIZE="`ls -l ${PACKAGE_FILE} | awk '{print $$5}'`" \

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Fri Apr 15 17:45:12 2016
(r298076)
+++ vendor/Juniper/libxo/dist/configure.ac  Fri Apr 15 18:03:30 2016
(r298077)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.4.7], [p...@juniper.net])
+AC_INIT([libxo], [0.5.0], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ctype.h errno.h stdio.
 AC_CHECK_HEADERS([string.h sys/param.h unistd.h ])
 AC_CHECK_HEADERS([sys/sysctl.h])
 AC_CHECK_HEADERS([threads.h])
+AC_CHECK_HEADERS([monitor.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
@@ -148,10 +149,18 @@ 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)
+if test -x ${GETTEXT_PREFIX}/bin/msgfmt ; then
+GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
+elif test -x ${GETTEXT_PREFIX}/local/bin/msgfmt ; then
+GETTEXT_BINDIR=${GETTEXT_PREFIX}/local/bin
+else
+AC_MSG_NOTICE("could not find msgfmt tool")
+# Use a (bad) fall back value
+GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
+fi
+AC_SUBST(GETTEXT_BINDIR)
 
 AM_CONDITIONAL([HAVE_GETTEXT], [test "$HAVE_GETTEXT" =

svn commit: r298067 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved lib/libxo

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 15:50:13 2016
New Revision: 298067
URL: https://svnweb.freebsd.org/changeset/base/298067

Log:
  import libxo-0.4.7
  Fix bug w/ {e:} in html, where no default encoding format was built
  docs: "t" == "trim" (typo) (cf svn commit: r290445 - 
head/contrib/libxo/libxo)
  
  Reviewed by:  sjg
  Approved by:  sjg (mentor)

Deleted:
  head/contrib/libxo/libxo/xo_config.h.in
Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/doc/libxo-manual.html
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/tests/core/saved/test_01.E.out
  head/contrib/libxo/tests/core/saved/test_01.H.out
  head/contrib/libxo/tests/core/saved/test_01.HIPx.out
  head/contrib/libxo/tests/core/saved/test_01.HP.out
  head/contrib/libxo/tests/core/saved/test_01.J.out
  head/contrib/libxo/tests/core/saved/test_01.JP.out
  head/contrib/libxo/tests/core/saved/test_01.T.out
  head/contrib/libxo/tests/core/saved/test_01.X.out
  head/contrib/libxo/tests/core/saved/test_01.XP.out
  head/contrib/libxo/tests/core/test_01.c
  head/lib/libxo/add.man
  head/lib/libxo/xo_config.h
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Fri Apr 15 15:46:41 2016
(r298066)
+++ head/contrib/libxo/configure.ac Fri Apr 15 15:50:13 2016
(r298067)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.4.6], [p...@juniper.net])
+AC_INIT([libxo], [0.4.7], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/doc/libxo-manual.html
==
--- head/contrib/libxo/doc/libxo-manual.htmlFri Apr 15 15:46:41 2016
(r298066)
+++ head/contrib/libxo/doc/libxo-manual.htmlFri Apr 15 15:50:13 2016
(r298067)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "August 2015";
+   content: "December 2015";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 
 
 
-August 24, 2015
+December 30, 2015
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: head/contrib/libxo/libxo/libxo.c
==
--- head/contrib/libxo/libxo/libxo.cFri Apr 15 15:46:41 2016
(r298066)
+++ head/contrib/libxo/libxo/libxo.cFri Apr 15 15:50:13 2016
(r298067)
@@ -3374,6 +3374,15 @@ xo_buf_append_div (xo_handle_t *xop, con
 static char div_end[] = "\">";
 static char div_close[] = "";
 
+/* The encoding format defaults to the normal format */
+if (encoding == NULL) {
+   char *enc  = alloca(vlen + 1);
+   memcpy(enc, value, vlen);
+   enc[vlen] = '\0';
+   encoding = xo_fix_encoding(xop, enc);
+   elen = strlen(encoding);
+}
+
 /*
  * To build our XPath predicate, we need to save the va_list before
  * we format our data, and then restore it before we format the
@@ -3406,15 +3415,6 @@ xo_buf_append_div (xo_handle_t *xop, con
else
xo_buf_append(pbp, "='", 2);
 
-   /* The encoding format defaults to the normal format */
-   if (encoding == NULL) {
-   char *enc  = alloca(vlen + 1);
-   memcpy(enc, value, vlen);
-   enc[vlen] = '\0';
-   encoding = xo_fix_encoding(xop, enc);
-   elen = strlen(encoding);
-   }
-
xo_xff_flags_t pflags = flags | XFF_XML | XFF_ATTR;
pflags &= ~(XFF_NO_OUTPUT | XFF_ENCODE_ONLY);
xo_do_format_field(xop, pbp, encoding, elen, pflags);

Modified: head/contrib/libxo/tests/core/saved/test_01.E.out
==
--- head/contrib/libxo/tests/core/saved/test_01.E.out   Fri Apr 15 15:46:41 
2016(r298066)
+++ head/contrib/libxo/tests/core/saved/test_01.E.out   Fri Apr 15 15:50:13 
2016(r298067)
@@ -114,6 +114,16 @@ op close_list: [item] []
 op close_container: [data4] []
 op content: [cost] [425]
 op content: [cost] [455]
+op string: [mode] [mode]
+op string: [mode_octal] [octal]
+op string: [links] [links]
+op string: [user] [user]
+op string: [group] [group]
+op string: [mode] [/some/file]
+op content: [mode_octal] [640]
+op content: [links] [1]
+op string: [user] [user]
+op string: [group] [group]
 op close_container: [top] []
 op finish: [] []
 op flush: [] []

Modified: head/contrib/libxo/tests/core/saved/test_01.H.out
==
--- head/contrib/libxo/tests/core/saved/test_01.H.out   Fri Apr 15 15:46:41 
2016(r298066)
+++ head/contrib/libxo/tests/core/saved/test_01.H.out   Fri Apr 15 15:50:13 
2016(r298067)
@@ -1 +1 @@
-Connecting to my-box.example.

svn commit: r298063 - in vendor/Juniper/libxo/dist: . doc libxo tests/core tests/core/saved

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 15:42:12 2016
New Revision: 298063
URL: https://svnweb.freebsd.org/changeset/base/298063

Log:
  Import libxo 0.4.7

Deleted:
  vendor/Juniper/libxo/dist/libxo/xo_config.h.in
Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/doc/libxo-manual.html
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo_format.5
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.H.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HIPx.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.HP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.J.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.JP.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.T.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.X.out
  vendor/Juniper/libxo/dist/tests/core/saved/test_01.XP.out
  vendor/Juniper/libxo/dist/tests/core/test_01.c

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Fri Apr 15 15:36:09 2016
(r298062)
+++ vendor/Juniper/libxo/dist/configure.ac  Fri Apr 15 15:42:12 2016
(r298063)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.4.6], [p...@juniper.net])
+AC_INIT([libxo], [0.4.7], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- vendor/Juniper/libxo/dist/doc/libxo-manual.html Fri Apr 15 15:36:09 
2016(r298062)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Fri Apr 15 15:42:12 
2016(r298063)
@@ -515,7 +515,7 @@ li.indline1 {
  
   } 
   @top-right {
-   content: "August 2015";
+   content: "December 2015";
  
   } 
   @top-center {
@@ -22009,7 +22009,7 @@ jQuery(function ($) {
 
 
 
-August 24, 2015
+December 30, 2015
 
 
 libxo: The Easy Way to Generate text, XML, JSON, 
and HTML outputlibxo-manual

Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==
--- vendor/Juniper/libxo/dist/libxo/libxo.c Fri Apr 15 15:36:09 2016
(r298062)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Fri Apr 15 15:42:12 2016
(r298063)
@@ -3374,6 +3374,15 @@ xo_buf_append_div (xo_handle_t *xop, con
 static char div_end[] = "\">";
 static char div_close[] = "";
 
+/* The encoding format defaults to the normal format */
+if (encoding == NULL) {
+   char *enc  = alloca(vlen + 1);
+   memcpy(enc, value, vlen);
+   enc[vlen] = '\0';
+   encoding = xo_fix_encoding(xop, enc);
+   elen = strlen(encoding);
+}
+
 /*
  * To build our XPath predicate, we need to save the va_list before
  * we format our data, and then restore it before we format the
@@ -3406,15 +3415,6 @@ xo_buf_append_div (xo_handle_t *xop, con
else
xo_buf_append(pbp, "='", 2);
 
-   /* The encoding format defaults to the normal format */
-   if (encoding == NULL) {
-   char *enc  = alloca(vlen + 1);
-   memcpy(enc, value, vlen);
-   enc[vlen] = '\0';
-   encoding = xo_fix_encoding(xop, enc);
-   elen = strlen(encoding);
-   }
-
xo_xff_flags_t pflags = flags | XFF_XML | XFF_ATTR;
pflags &= ~(XFF_NO_OUTPUT | XFF_ENCODE_ONLY);
xo_do_format_field(xop, pbp, encoding, elen, pflags);

Modified: vendor/Juniper/libxo/dist/libxo/xo_format.5
==
--- vendor/Juniper/libxo/dist/libxo/xo_format.5 Fri Apr 15 15:36:09 2016
(r298062)
+++ vendor/Juniper/libxo/dist/libxo/xo_format.5 Fri Apr 15 15:42:12 2016
(r298063)
@@ -367,7 +367,7 @@ particular output styles:
 .It l "leaf-list" "Field is a leaf-list, a list of leaf values"
 .It n "no-quotes" "Do not quote the field when using JSON style"
 .It q "quotes" "Quote the field when using JSON style"
-.It q "trim  " "Trim leading and trailing whitespace"
+.It t "trim  " "Trim leading and trailing whitespace"
 .It w "white space   " "A blank ("" "") is appended after the label"
 .El
 .Pp

Modified: vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.out
==
--- vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.outFri Apr 15 
15:36:09 2016(r298062)
+++ vendor/Juniper/libxo/dist/tests/core/saved/test_01.E.outFri Apr 15 
15:42:12 2016(r298063)
@@ -114,6 +114,16 @@ op close_list: [item] []
 op close_container: [data4] []
 op content: [cost] [425]
 op content: [cost] [455]
+op string: [mode] [mode]
+op string: [mode_octal]

svn commit: r298064 - vendor/Juniper/libxo/0.4.7

2016-04-15 Thread Phil Shafer

Author: phil
Date: Fri Apr 15 15:42:35 2016
New Revision: 298064
URL: https://svnweb.freebsd.org/changeset/base/298064

Log:
  Tag libxo 0.4.7

Added:
 - copied from r298063, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.4.7/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r297889 - in vendor/Juniper/libxo/dist: . libxo

2016-04-13 Thread Phil Shafer

Bryan Drewery writes:
>Are files missing from this? It seems quite small for a release and the
>svnignore makes me think there's a missing m4 directory.

The m4/* directory holds generated files (from autoreconf), so it
really shouldn't be in the src repo.  It's in the tar ball so folks
don't need to have autoreconf installed.

In truth, there are a couple of bug fix releases (0.4.6, 0.4.7,
...) that I'm using to proof out my import script.  The new real
release is 0.6, which I'll build and import as soon as I'm convinced
I've got the plumbing done.

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r297889 - in vendor/Juniper/libxo/dist: . libxo

2016-04-12 Thread Phil Shafer

NGie Cooper writes:
>> Log:
>>  import libso 0.4.6
>
>I think you meant libxo...

Doh!  Thanks
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r297895 - vendor/Juniper/libxo

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 23:38:10 2016
New Revision: 297895
URL: https://svnweb.freebsd.org/changeset/base/297895

Log:
  add FreeBSD header to copied files

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Tue Apr 12 23:30:56 2016
(r297894)
+++ vendor/Juniper/libxo/import.sh  Tue Apr 12 23:38:10 2016
(r297895)
@@ -15,6 +15,9 @@
 PROJECT=libxo
 MAKEOBJDIRPREFIX=/tank/home/phil/work/bsd/base/head/obj/
 export MAKEOBJDIRPREFIX
+EDITOR=vi
+VISUAL=vi
+export EDITOR VISUAL
 
 #"global" vars
 # Set SVN variables
@@ -261,8 +264,8 @@ Cd $CWD/../../../head
 HEAD=`pwd`
 info "HEAD = $HEAD"
 
-run "copying xo_config.h" "cp $CWD/dist/build/libxo/xo_config.h 
$HEAD/lib/libxo/"
-run "copying add.man" "cp $CWD/dist/build/libxo/add.man $HEAD/lib/libxo/"
+run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat 
$CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h"
+run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat 
$CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man"
 
 #BUILDDIRS="lib/libxo usr.bin/xo"
 #for dir in $BUILDDIRS ; do
@@ -309,7 +312,7 @@ run "checking merge issues" "$SVN diff -
 Cd $HEAD
 run "show svn stat for 'head'" "$SVN stat"
 run "show svn diff for 'head'" "$SVN diff --no-diff-deleted"
-run "commit changes to 'head'" "$SVN -m 'Merge $PROJECT $VERSION' commit"
+run "commit changes to 'head'" "$SVN commit"
 run "show svn stat for 'head'" "$SVN stat"
 
 exit 0
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r297894 - in head: contrib/libxo contrib/libxo/doc contrib/libxo/libxo contrib/libxo/m4 lib/libxo

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 23:30:56 2016
New Revision: 297894
URL: https://svnweb.freebsd.org/changeset/base/297894

Log:
  Merge libxo 0.4.6
  
  Reviewed by: sjg
  Approved by: sjg (mentor)

Added:
  head/contrib/libxo/.gitignore
 - copied unchanged from r297891, vendor/Juniper/libxo/dist/.gitignore
  head/contrib/libxo/.svnignore
 - copied unchanged from r297891, vendor/Juniper/libxo/dist/.svnignore
  head/contrib/libxo/doc/libxo-manual.html
 - copied unchanged from r297891, 
vendor/Juniper/libxo/dist/doc/libxo-manual.html
  head/lib/libxo/add.man   (contents, props changed)
Replaced:
  head/contrib/libxo/libxo/xo_config.h.in
 - copied unchanged from r297891, 
vendor/Juniper/libxo/dist/libxo/xo_config.h.in
Deleted:
  head/contrib/libxo/install-sh
  head/contrib/libxo/libxo/add.man
  head/contrib/libxo/m4/libtool.m4
  head/contrib/libxo/m4/ltoptions.m4
  head/contrib/libxo/m4/ltsugar.m4
  head/contrib/libxo/m4/ltversion.m4
  head/contrib/libxo/m4/lt~obsolete.m4
Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/libxo/libxo.c
  head/contrib/libxo/libxo/xo_open_container.3
  head/contrib/libxo/libxo/xo_open_list.3
  head/lib/libxo/xo_config.h
Directory Properties:
  head/contrib/libxo/   (props changed)
  head/contrib/libxo/doc/   (props changed)
  head/contrib/libxo/encoder/   (props changed)
  head/contrib/libxo/encoder/cbor/   (props changed)
  head/contrib/libxo/encoder/test/   (props changed)
  head/contrib/libxo/libxo/   (props changed)
  head/contrib/libxo/tests/   (props changed)
  head/contrib/libxo/tests/core/   (props changed)
  head/contrib/libxo/tests/gettext/   (props changed)
  head/contrib/libxo/tests/xo/   (props changed)
  head/contrib/libxo/xo/   (props changed)
  head/contrib/libxo/xohtml/   (props changed)
  head/contrib/libxo/xolint/   (props changed)
  head/contrib/libxo/xopo/   (props changed)

Copied: head/contrib/libxo/.gitignore (from r297891, 
vendor/Juniper/libxo/dist/.gitignore)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/libxo/.gitignore   Tue Apr 12 23:30:56 2016
(r297894, copy of r297891, vendor/Juniper/libxo/dist/.gitignore)
@@ -0,0 +1,46 @@
+# Object files
+*.o
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.app
+
+*~
+*.orig
+
+aclocal.m4
+ar-lib
+autom4te.cache
+build
+compile
+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
+xtest
+xtest.dSYM
+tests/w

Copied: head/contrib/libxo/.svnignore (from r297891, 
vendor/Juniper/libxo/dist/.svnignore)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/libxo/.svnignore   Tue Apr 12 23:30:56 2016
(r297894, copy of r297891, vendor/Juniper/libxo/dist/.svnignore)
@@ -0,0 +1,18 @@
+Makefile.in
+aclocal.m4
+ar-lib
+autom4te.cache
+bin*
+build*
+compile
+configure
+config.guess
+config.sub
+depcomp
+doc/Makefile.in
+info*
+install-sh
+ltmain.sh
+m4
+missing
+patches*

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Tue Apr 12 23:22:32 2016
(r297893)
+++ head/contrib/libxo/configure.ac Tue Apr 12 23:30:56 2016
(r297894)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.4.5], [p...@juniper.net])
+AC_INIT([libxo], [0.4.6], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Copied: head/contrib/libxo/doc/libxo-manual.html (from r297891, 
vendor/Juniper/libxo/dist/doc/libxo-manual.html)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/libxo/doc/libxo-manual.htmlTue Apr 12 23:30:56 2016
(r297894, copy of r297891, vendor/Juniper/libxo/dist/doc/libxo-manual.html)
@@ -0,0 +1,27134 @@
+
+
+http://www.w3.org/2006/03/hcard";>
+
+libxo: The Easy Way to Generate text, XML, JSON, and HTML output
+/*
+ * $Id$
+ *
+ * Copyright (c) 2006-2011, 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.
+ */
+
+#media-inspector {
+display:none
+}
+@media screen {
+#media-inspector { z-index: 1 }
+}
+@media print {
+#media-inspector { z-index: 2 }
+}
+
+pre {
+font-family: Consolas, Menlo, Monaco,Lucida Console, Liberation Mono,
+ DejaVu Sans Mono, Bitstream Vera Sans Mo

svn commit: r297893 - vendor/Juniper/libxo

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 23:22:32 2016
New Revision: 297893
URL: https://svnweb.freebsd.org/changeset/base/297893

Log:
  add "svn up" after tagging

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==
--- vendor/Juniper/libxo/import.sh  Tue Apr 12 23:20:50 2016
(r297892)
+++ vendor/Juniper/libxo/import.sh  Tue Apr 12 23:22:32 2016
(r297893)
@@ -294,6 +294,7 @@ run "show svn diff for 'dist'" "$SVN dif
 
 
 run "tagging repo" "$SVN cp -m 'Tag $PROJECT $VERSION' $url/dist $url/$VERSION"
+run "refresh libxo" "$SVN update"
 
 Cd $HEAD/contrib/$PROJECT
 CONTRIB=`pwd`
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r297892 - vendor/Juniper/libxo

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 23:20:50 2016
New Revision: 297892
URL: https://svnweb.freebsd.org/changeset/base/297892

Log:
  import libxo 0.4.6

Added:
  vendor/Juniper/libxo/.svnignore
Replaced:
  vendor/Juniper/libxo/import.sh
 - copied, changed from r296971, vendor/NetBSD/bmake/import.sh
Modified:
Directory Properties:
  vendor/Juniper/libxo/   (props changed)

Added: vendor/Juniper/libxo/.svnignore
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/.svnignore Tue Apr 12 23:20:50 2016
(r297892)
@@ -0,0 +1,2 @@
+libxo-0.4.6
+tag.sh

Copied and modified: vendor/Juniper/libxo/import.sh (from r296971, 
vendor/NetBSD/bmake/import.sh)
==
--- vendor/NetBSD/bmake/import.sh   Thu Mar 17 00:46:36 2016
(r296971, copy source)
+++ vendor/Juniper/libxo/import.sh  Tue Apr 12 23:20:50 2016
(r297892)
@@ -1,11 +1,28 @@
-:
+#!/bin/sh
 # $FreeBSD$
+#
+# Import script for libxo.  Typically invoked as:
+#
+#cd work/bsd/base
+#sh ./vendor/Juniper/libxo/import.sh -v 0.4.6
+#
+# Add "-n" to avoid svn actions
+# Add "-d" to generate docs
+#
+# Phil Shafer (phil@), April 2016
+#
+
+PROJECT=libxo
+MAKEOBJDIRPREFIX=/tank/home/phil/work/bsd/base/head/obj/
+export MAKEOBJDIRPREFIX
 
-# "global" vars
-ECHO=
+#"global" vars
 # Set SVN variables
 #  select the local subversion site
 SVN=${SVN:-/usr/local/bin/svn}
+# "Real" SVN, even if "-n"
+RSVN=$SVN
+GMAKE=${GMAKE:-gmake}
 
 # For consistency...
 Error() {
@@ -16,6 +33,46 @@ Error() {
 Cd() {
[ $# -eq 1 ] || Error "Cd() takes a single parameter."
cd $1 || Error "cannot \"cd $1\" from $PWD"
+info "Directory =" `pwd`
+}
+
+run() {
+desc="$1"
+cmd="$2"
+
+if [ "$DOC" = doc ]; then
+echo " == $desc"
+echo " - $cmd"
+echo " "
+else
+echo ""
+echo "Phase: $desc"
+echo "  Run: $cmd"
+okay
+# We need to eval to handle "&&" in commands
+eval $cmd
+okay
+fi
+}
+
+info() {
+echo " -- " "$@"
+}
+
+okay() {
+if [ -z "$OKAY" ]; then
+/bin/echo -n "proceed? "
+read okay
+case "$okay" in
+[QqNn]*) echo "exiting"; exit 1;;
+esac
+fi
+}
+
+spew_words () {
+for i in "$@"; do
+echo $i
+done
 }
 
 # Call this function and then follow it by any specific import script additions
@@ -28,19 +85,25 @@ option_parsing() {
*=*) eval "$1"; shift;;
--) shift; break;;
-a) TARBALL=$2; shift 2;;
-   -n) ECHO=echo; shift;;
+-d) DOC=doc; shift;;
+-D) VENDOR_DIR=$2; shift 2;;
+-f) FETCH=yes; shift;;
+   -n) SVN='echo svn'; shift;;
+-p) PROJECT=$2; shift 2;;
-P) PR=$2; shift 2;;
-r) REVIEWER=$2; shift 2;;
-   -u) url=$2; shift 2;;
+-v) VERS=$2; shift 2;;
+-y) OKAY=yes; shift;;
+
-h) echo "Usage:";
  echo "  "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]'
-   echo "  "$0 '-a # (a)rchive'
-   echo "  "$0 '-h   # print usage'
-   echo "  "$0 '-n   # do not import, 
check only.'
-   echo "  "$0 '-P# Use PR'
-   echo "  "$0 '-r   # (r)eviewed by'
-   echo "  "$0 'PR='
-   echo "  "$0 'REVIEWER='
+   echo "  -a   -- name or tarball"
+   echo "  -d -- generate documentation"
+   echo "  -f -- force fetch of tarballs"
+   echo "  -h -- print usage"
+   echo "  -n -- do not import, check only"
+   echo "  -v-- version to import"
+   echo "  -y -- answer 'yes'"
exit 1;;
*) break;;
esac
@@ -53,34 +116,199 @@ option_parsing() {
 option_parsing "$@"
 shift $?
 
-TF=/tmp/.$USER.$$
 Cd `dirname $0`
-test -s ${TARBALL:-/dev/null} || Error need TARBALL
-he

svn commit: r297889 - in vendor/Juniper/libxo/dist: . libxo

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 23:03:01 2016
New Revision: 297889
URL: https://svnweb.freebsd.org/changeset/base/297889

Log:
  import libso 0.4.6

Added:
  vendor/Juniper/libxo/dist/libxo/xo_config.h.in   (contents, props changed)
Modified:
  vendor/Juniper/libxo/dist/.svnignore
Directory Properties:
  vendor/Juniper/libxo/dist/   (props changed)

Modified: vendor/Juniper/libxo/dist/.svnignore
==
--- vendor/Juniper/libxo/dist/.svnignoreTue Apr 12 22:59:20 2016
(r297888)
+++ vendor/Juniper/libxo/dist/.svnignoreTue Apr 12 23:03:01 2016
(r297889)
@@ -13,6 +13,6 @@ doc/Makefile.in
 info*
 install-sh
 ltmain.sh
-m4*
+m4
 missing
 patches*

Added: vendor/Juniper/libxo/dist/libxo/xo_config.h.in
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/dist/libxo/xo_config.h.in  Tue Apr 12 23:03:01 
2016(r297889)
@@ -0,0 +1,246 @@
+/* libxo/xo_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have  and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
+/* Define to 1 if you have the `ctime' function. */
+#undef HAVE_CTIME
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_CTYPE_H
+
+/* Define to 1 if you have the declaration of `__isthreaded', and to 0 if you
+   don't. */
+#undef HAVE_DECL___ISTHREADED
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `dlfunc' function. */
+#undef HAVE_DLFUNC
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_ERRNO_H
+
+/* Define to 1 if you have the `fdopen' function. */
+#undef HAVE_FDOPEN
+
+/* Define to 1 if you have the `flock' function. */
+#undef HAVE_FLOCK
+
+/* Define to 1 if you have the `getpass' function. */
+#undef HAVE_GETPASS
+
+/* Define to 1 if you have the `getprogname' function. */
+#undef HAVE_GETPROGNAME
+
+/* Define to 1 if you have the `getrusage' function. */
+#undef HAVE_GETRUSAGE
+
+/* gettext(3) */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* humanize_number(3) */
+#undef HAVE_HUMANIZE_NUMBER
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_LIBUTIL_H
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_MEMORY_H
+
+/* Support printflike */
+#undef HAVE_PRINTFLIKE
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+   and to 0 otherwise. */
+#undef HAVE_REALLOC
+
+/* Define to 1 if you have the `srand' function. */
+#undef HAVE_SRAND
+
+/* Define to 1 if you have the `sranddev' function. */
+#undef HAVE_SRANDDEV
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STDIO_EXT_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STDIO_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STDTIME_TZFILE_H
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strcspn' function. */
+#undef HAVE_STRCSPN
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strspn' function. */
+#undef HAVE_STRSPN
+
+/* Have struct sockaddr_un.sun_len */
+#undef HAVE_SUN_LEN
+
+/* Define to 1 if you have the `sysctlbyname' function. */
+#undef HAVE_SYSCTLBYNAME
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the  header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the  header file. */
+#undef H

svn commit: r297890 - vendor/Juniper/libxo/0.4.6

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 23:03:37 2016
New Revision: 297890
URL: https://svnweb.freebsd.org/changeset/base/297890

Log:
  Tag libxo 0.4.6

Added:
 - copied from r297889, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.4.6/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r297885 - in vendor/Juniper/libxo/dist: . doc libxo m4

2016-04-12 Thread Phil Shafer

Author: phil
Date: Tue Apr 12 22:54:19 2016
New Revision: 297885
URL: https://svnweb.freebsd.org/changeset/base/297885

Log:
  Import libxo 0.4.6

Added:
  vendor/Juniper/libxo/dist/.gitignore
  vendor/Juniper/libxo/dist/.svnignore
  vendor/Juniper/libxo/dist/doc/libxo-manual.html   (contents, props changed)
Deleted:
  vendor/Juniper/libxo/dist/install-sh
  vendor/Juniper/libxo/dist/libxo/add.man
  vendor/Juniper/libxo/dist/libxo/xo_config.h.in
  vendor/Juniper/libxo/dist/m4/libtool.m4
  vendor/Juniper/libxo/dist/m4/ltoptions.m4
  vendor/Juniper/libxo/dist/m4/ltsugar.m4
  vendor/Juniper/libxo/dist/m4/ltversion.m4
  vendor/Juniper/libxo/dist/m4/lt~obsolete.m4
Modified:
  vendor/Juniper/libxo/dist/configure.ac
  vendor/Juniper/libxo/dist/libxo/libxo.c
  vendor/Juniper/libxo/dist/libxo/xo_open_container.3
  vendor/Juniper/libxo/dist/libxo/xo_open_list.3
Directory Properties:
  vendor/Juniper/libxo/dist/   (props changed)
  vendor/Juniper/libxo/dist/doc/   (props changed)
  vendor/Juniper/libxo/dist/encoder/   (props changed)
  vendor/Juniper/libxo/dist/encoder/cbor/   (props changed)
  vendor/Juniper/libxo/dist/encoder/test/   (props changed)
  vendor/Juniper/libxo/dist/libxo/   (props changed)
  vendor/Juniper/libxo/dist/tests/   (props changed)
  vendor/Juniper/libxo/dist/tests/core/   (props changed)
  vendor/Juniper/libxo/dist/tests/gettext/   (props changed)
  vendor/Juniper/libxo/dist/tests/xo/   (props changed)
  vendor/Juniper/libxo/dist/xo/   (props changed)
  vendor/Juniper/libxo/dist/xohtml/   (props changed)
  vendor/Juniper/libxo/dist/xolint/   (props changed)
  vendor/Juniper/libxo/dist/xopo/   (props changed)

Added: vendor/Juniper/libxo/dist/.gitignore
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/dist/.gitignoreTue Apr 12 22:54:19 2016
(r297885)
@@ -0,0 +1,46 @@
+# Object files
+*.o
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.app
+
+*~
+*.orig
+
+aclocal.m4
+ar-lib
+autom4te.cache
+build
+compile
+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
+xtest
+xtest.dSYM
+tests/w

Added: vendor/Juniper/libxo/dist/.svnignore
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/dist/.svnignoreTue Apr 12 22:54:19 2016
(r297885)
@@ -0,0 +1,18 @@
+Makefile.in
+aclocal.m4
+ar-lib
+autom4te.cache
+bin*
+build*
+compile
+configure
+config.guess
+config.sub
+depcomp
+doc/Makefile.in
+info*
+install-sh
+ltmain.sh
+m4*
+missing
+patches*

Modified: vendor/Juniper/libxo/dist/configure.ac
==
--- vendor/Juniper/libxo/dist/configure.ac  Tue Apr 12 22:31:48 2016
(r297884)
+++ vendor/Juniper/libxo/dist/configure.ac  Tue Apr 12 22:54:19 2016
(r297885)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.4.5], [p...@juniper.net])
+AC_INIT([libxo], [0.4.6], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Added: vendor/Juniper/libxo/dist/doc/libxo-manual.html
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/Juniper/libxo/dist/doc/libxo-manual.html Tue Apr 12 22:54:19 
2016(r297885)
@@ -0,0 +1,27134 @@
+
+
+http://www.w3.org/2006/03/hcard";>
+
+libxo: The Easy Way to Generate text, XML, JSON, and HTML output
+/*
+ * $Id$
+ *
+ * Copyright (c) 2006-2011, 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.
+ */
+
+#media-inspector {
+display:none
+}
+@media screen {
+#media-inspector { z-index: 1 }
+}
+@media print {
+#media-inspector { z-index: 2 }
+}
+
+pre {
+font-family: Consolas, Menlo, Monaco,Lucida Console, Liberation Mono,
+ DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New,
+ monospace, serif;
+margin-bottom: 10px;
+}
+
+@media screen {
+hr.noprint {
+   display: none;
+}
+
+h1, h2, h3, h4, h5 {
+   font-size: 14pt;
+   color: black;
+   margin: 0;
+   padding: 0;
+}
+h1 a, h2 a, h3 a, h4 a, h5 a {
+   font-size: 12pt;
+   color: black;
+}
+
+div#top {
+   display: table;
+}
+
+div#top-left {
+   display: table-cell;
+   width: 400px;
+   border: 1px solid black;
+

svn commit: r296967 - in head: contrib/libxo/libxo lib/libxo

2016-03-19 Thread Phil Shafer

Author: phil
Date: Wed Mar 16 23:50:41 2016
New Revision: 296967
URL: https://svnweb.freebsd.org/changeset/base/296967

Log:
  Move generated file from contrib to build directory.
  
  Reviewed by:  obrien
  Approved by:  sjg

Added:
  head/lib/libxo/xo_config.h
 - copied unchanged from r296966, head/contrib/libxo/libxo/xo_config.h
Deleted:
  head/contrib/libxo/libxo/xo_config.h
Modified:
  head/lib/libxo/Makefile

Modified: head/lib/libxo/Makefile
==
--- head/lib/libxo/Makefile Wed Mar 16 23:42:57 2016(r296966)
+++ head/lib/libxo/Makefile Wed Mar 16 23:50:41 2016(r296967)
@@ -13,7 +13,7 @@ SHLIB_MAJOR=0
 
 SRCS=  libxo.c xo_encoder.c xo_syslog.c
 
-CFLAGS+=-I${LIBXOSRC}/libxo
+CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
 CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
 
 INCS=  xo.h xo_encoder.h

Copied: head/lib/libxo/xo_config.h (from r296966, 
head/contrib/libxo/libxo/xo_config.h)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/lib/libxo/xo_config.h  Wed Mar 16 23:50:41 2016(r296967, copy 
of r296966, head/contrib/libxo/libxo/xo_config.h)
@@ -0,0 +1,247 @@
+/* libxo/xo_config.h.  Generated from xo_config.h.in by configure.  */
+/* libxo/xo_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have  and it should be used (not on Ultrix).
+   */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
+/* Define to 1 if you have the `bzero' function. */
+#define HAVE_BZERO 1
+
+/* Define to 1 if you have the `ctime' function. */
+#define HAVE_CTIME 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define to 1 if you have the declaration of `__isthreaded', and to 0 if you
+   don't. */
+#define HAVE_DECL___ISTHREADED 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `dlfunc' function. */
+#define HAVE_DLFUNC 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the `fdopen' function. */
+#define HAVE_FDOPEN 1
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `getpass' function. */
+#define HAVE_GETPASS 1
+
+/* Define to 1 if you have the `getprogname' function. */
+#define HAVE_GETPROGNAME 1
+
+/* Define to 1 if you have the `getrusage' function. */
+#define HAVE_GETRUSAGE 1
+
+/* gettext(3) */
+/* #undef HAVE_GETTEXT */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* humanize_number(3) */
+#define HAVE_HUMANIZE_NUMBER 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#define HAVE_LIBCRYPTO 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_LIBUTIL_H 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_MEMORY_H 1
+
+/* Support printflike */
+/* #undef HAVE_PRINTFLIKE */
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+   and to 0 otherwise. */
+#define HAVE_REALLOC 1
+
+/* Define to 1 if you have the `srand' function. */
+#define HAVE_SRAND 1
+
+/* Define to 1 if you have the `sranddev' function. */
+#define HAVE_SRANDDEV 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_STDIO_EXT_H */
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_STDTIME_TZFILE_H */
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strcspn' function. */
+#define HAVE_STRCSPN 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_

svn commit: r296971 - vendor/Juniper/libxo/0.4.5

2016-03-18 Thread Phil Shafer

Author: phil
Date: Thu Mar 17 00:46:36 2016
New Revision: 296971
URL: https://svnweb.freebsd.org/changeset/base/296971

Log:
  Tag libxo 0.4.5
  
  Approved by:   sjg

Added:
 - copied from r296970, vendor/Juniper/libxo/dist/
Directory Properties:
  vendor/Juniper/libxo/0.4.5/   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r296179 - head/share/misc

2016-02-28 Thread Phil Shafer

Author: phil
Date: Mon Feb 29 04:50:24 2016
New Revision: 296179
URL: https://svnweb.freebsd.org/changeset/base/296179

Log:
  Add entries for Phil Shafer (phil@)
  
  Differential Revision: https://reviews.freebsd.org/D5246
  Approved by: sjg (mentor)

Modified:
  head/share/misc/committers-src.dot

Modified: head/share/misc/committers-src.dot
==
--- head/share/misc/committers-src.dot  Mon Feb 29 03:54:51 2016
(r296178)
+++ head/share/misc/committers-src.dot  Mon Feb 29 04:50:24 2016
(r296179)
@@ -253,6 +253,7 @@ peadar [label="Peter Edwards\npeadar@Fre
 peter [label="Peter Wemm\npe...@freebsd.org\n1995/07/04"]
 peterj [label="Peter Jeremy\npet...@freebsd.org\n2012/09/14"]
 pfg [label="Pedro Giffuni\n...@freebsd.org\n2011/12/01"]
+phil [label="Phil Shafer\np...@freebsd.ogr\n2016/12/30"]
 philip [label="Philip Paeps\nphi...@freebsd.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\n...@freebsd.org\n1994/02/21"]
 pho [label="Peter Holm\n...@freebsd.org\n2008/11/16"]
@@ -741,8 +742,12 @@ shin -> ume
 
 simon -> benl
 
+sjg -> phil
+
 sos -> marcel
 
+theraven -> phil
+
 thompsa -> weongyo
 thompsa -> eri
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290445 - head/contrib/libxo/libxo

2015-11-06 Thread Phil Shafer

Garrett Cooper writes:
>>  The field modifier for trimming whitespace
>>  is not `q' but `t'.
>
>Could you please submit this change upstream to the libxo github project?

Got it (d907e99..e263360 in 'develop' branch).

Thanks,
 Phil
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

88 matches

Mail list logo