From owner-svn-src-all@freebsd.org Mon May 6 20:20:28 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 684CA1594B87; Mon, 6 May 2019 20:20:28 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CFCF287F68; Mon, 6 May 2019 20:20:27 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A829BBDF8; Mon, 6 May 2019 20:20:27 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x46KKROO036522; Mon, 6 May 2019 20:20:27 GMT (envelope-from phil@FreeBSD.org) Received: (from phil@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x46KKLGe036492; Mon, 6 May 2019 20:20:21 GMT (envelope-from phil@FreeBSD.org) Message-Id: <201905062020.x46KKLGe036492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: phil set sender to phil@FreeBSD.org using -f From: Phil Shafer Date: Mon, 6 May 2019 20:20:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: 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 X-SVN-Group: head X-SVN-Commit-Author: phil X-SVN-Commit-Paths: 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 X-SVN-Commit-Revision: 347207 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CFCF287F68 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2019 20:20:28 -0000 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], [phil@juniper.net]) +AC_INIT([libxo], [1.0.4], [phil@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.html Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/doc/libxo-manual.html Mon 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 output
libxo-manual

Modified: head/contrib/libxo/libxo/libxo.c ============================================================================== --- head/contrib/libxo/libxo/libxo.c Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/libxo/libxo.c Mon 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] op content: [fd] [-1] [0] Modified: head/contrib/libxo/tests/core/saved/test_02.H.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.H.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.H.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.H.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.H.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.H.out Mon May 6 20:20:21 2019 (r347207) @@ -1,4 +1,4 @@ -
We are
{emit}
{ting}
some
braces
abcdef +
em0
em0
We are
{emit}
{ting}
some
braces
abcdef
abcdef: Bad file descriptor
improper use of profanity; ten yard penalty; first down
length
abcdef
close
-1
returned
Bad file descriptor
good
close
-1
returned
Bad fi
good
improper use of profanity; ten yard penalty; first down Modified: head/contrib/libxo/tests/core/saved/test_02.HIPx.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.HIPx.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.HIPx.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.HIPx.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.HIPx.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.HIPx.out Mon May 6 20:20:21 2019 (r347207) @@ -1,9 +1,11 @@
+
em0
+
em0
We are
{emit}
{ting}
some
-
braces
+
braces
abcdef @@ -19,23 +21,23 @@
length
-
abcdef
+
abcdef
close
-
-1
+
-1
returned
-
Bad file descriptor
+
Bad file descriptor
-
good
+
good
close
-
-1
+
-1
returned
-
Bad fi
+
Bad fi
-
good
+
good
improper use of profanity; ten yard penalty; first down @@ -43,155 +45,155 @@
-
20
+
20
-
30
+
30
-
40
+
40
-
file
+
file
-
0
+
0
bytes
-
1
+
1
byte
-
2
+
2
bytes
-
3
+
3
bytes
-
4
+
4
bytes
-
10
+
10
/
-
20
+
20
/
-
30
+
30
mbufs <&> in use (current/cache/total)
-
50
+
50
from
-
Boston
+
Boston
-
64
+
64
left out of
-
640
+
640
-
64
+
64
left out of
-
640
+
640
beforeworkingafter:
-
string
+
string
:
-
10
-
11
+
10
+
11
-
1010
+
1010
packets here/there/everywhere
-
1010
+
1010
packets here/there/everywhere
(
-
15
+
15
/
-
20
+
20
/
-
125
+
125
)
(
-
15
+
15
/
-
20
+
20
/
-
125
+
125
)
(
-
15
+
15
/
-
20
+
20
/
-
125
+
125
)
(
-
15
+
15
/
-
20
+
20
/
-
125
+
125
)
Humanize:
-
21
+
21
,
-
57 K
+
57 K
,
-
96M
+
96M
,
-
44M
+
44M
,
-
1.2G
+
1.2G
-
one
+
one
-
two
+
two
-
three
+
three
-
(null)
+
(null)
1:
-
1000
+
1000
2:
-
test5000
+
test5000
3:
-
ten-longx
+
ten-longx
4:
-
xtest
+
xtest
this is an error
@@ -208,10 +210,10 @@
V1/V2 packets
:
-
10
+
10
-
0004
+
0004
tries
Modified: head/contrib/libxo/tests/core/saved/test_02.HP.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.HP.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.HP.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.HP.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.HP.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.HP.out Mon May 6 20:20:21 2019 (r347207) @@ -1,4 +1,6 @@
+
em0
+
em0
We are
{emit}
{ting}
Modified: head/contrib/libxo/tests/core/saved/test_02.J.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.J.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.J.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.J.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.J.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.J.out Mon May 6 20:20:21 2019 (r347207) @@ -1 +1 @@ -{"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":125,"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": {"name":"em0","flags":"0x8843","name":"em0","flags":"0x8843","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":125,"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! S he's a-pumpin' mud! <>!,\"!<>\n"}}}} Modified: head/contrib/libxo/tests/core/saved/test_02.JP.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.JP.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.JP.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.JP.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.JP.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.JP.out Mon May 6 20:20:21 2019 (r347207) @@ -1,6 +1,10 @@ { "top": { "data": { + "name": "em0", + "flags": "0x8843", + "name": "em0", + "flags": "0x8843", "what": "braces", "length": "abcdef", "fd": -1, Modified: head/contrib/libxo/tests/core/saved/test_02.T.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.T.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.T.err Mon May 6 20:20:21 2019 (r347207) @@ -1 +1,2 @@ +test_02.test: key field emitted after normal value field: 'name' Shut 'er down, Clancey! She's a-pumpin' mud! <>!,"!<> Modified: head/contrib/libxo/tests/core/saved/test_02.T.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.T.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.T.out Mon May 6 20:20:21 2019 (r347207) @@ -1,4 +1,4 @@ -We are {emit}{ting} some braces +em0 em0 We are {emit}{ting} some braces abcdef abcdef: Bad file descriptor improper use of profanity; ten yard penalty; first down Modified: head/contrib/libxo/tests/core/saved/test_02.X.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.X.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.X.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.X.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.X.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.X.out Mon May 6 20:20:21 2019 (r347207) @@ -1,4 +1,4 @@ -bracesabcdef +em00x8843em00x8843bracesabcdef abcdef: Bad file descriptor improper use of profanity; ten yard penalty; first down abcdef-1Bad file descriptorgood-1Bad figoodimproper use of profanity; ten yard penalty; first down Modified: head/contrib/libxo/tests/core/saved/test_02.XP.err ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.XP.err Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.XP.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.XP.out ============================================================================== --- head/contrib/libxo/tests/core/saved/test_02.XP.out Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/saved/test_02.XP.out Mon May 6 20:20:21 2019 (r347207) @@ -1,5 +1,9 @@ + em0 + 0x8843 + em0 + 0x8843 braces abcdef Modified: head/contrib/libxo/tests/core/test_01.c ============================================================================== --- head/contrib/libxo/tests/core/test_01.c Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/test_01.c Mon May 6 20:20:21 2019 (r347207) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 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/tests/core/test_02.c ============================================================================== --- head/contrib/libxo/tests/core/test_02.c Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/tests/core/test_02.c Mon May 6 20:20:21 2019 (r347207) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 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 @@ -47,6 +47,12 @@ main (int argc, char **argv) xo_open_container_h(NULL, "top"); xo_open_container("data"); + + xo_emit("{kt:name/%-*.*s}{eq:flags/0x%x}", + 5, 5, "em0", 34883); + + xo_emit("{d:/%-*.*s}{etk:name}{eq:flags/0x%x}", + 5, 5, "em0", "em0", 34883); xo_emit("We are {{emit}}{{ting}} some {:what}\n", "braces"); Modified: head/contrib/libxo/xo/xo.c ============================================================================== --- head/contrib/libxo/xo/xo.c Mon May 6 20:15:18 2019 (r347206) +++ head/contrib/libxo/xo/xo.c Mon 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/lib/libxo/add.man ============================================================================== --- head/lib/libxo/add.man Mon May 6 20:15:18 2019 (r347206) +++ head/lib/libxo/add.man Mon May 6 20:20:21 2019 (r347207) @@ -3,10 +3,10 @@ .Fx uses .Nm libxo -version 0.9.0. +version 1.0.4. Complete documentation can be found on github: .Bd -literal -offset indent -http://juniper.github.io/libxo/0.9.0/libxo\-manual.html +http://juniper.github.io/libxo/1.0.4/libxo\-manual.html .Ed .Pp .Nm libxo Modified: head/lib/libxo/xo_config.h ============================================================================== --- head/lib/libxo/xo_config.h Mon May 6 20:15:18 2019 (r347206) +++ head/lib/libxo/xo_config.h Mon May 6 20:20:21 2019 (r347207) @@ -183,16 +183,16 @@ /* #undef LIBXO_TEXT_ONLY */ /* Version number as dotted value */ -#define LIBXO_VERSION "1.0.2" +#define LIBXO_VERSION "1.0.4" /* Version number extra information */ #define LIBXO_VERSION_EXTRA "" /* Version number as a number */ -#define LIBXO_VERSION_NUMBER 1000002 +#define LIBXO_VERSION_NUMBER 1000004 /* Version number as string */ -#define LIBXO_VERSION_STRING "1000002" +#define LIBXO_VERSION_STRING "1000004" /* 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.0.2" +#define PACKAGE_STRING "libxo 1.0.4" /* 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.0.2" +#define PACKAGE_VERSION "1.0.4" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -236,7 +236,7 @@ /* #undef USE_INT_RETURN_CODES */ /* Version number of package */ -#define VERSION "1.0.2" +#define VERSION "1.0.4" /* Retain hash bucket size */ /* #undef XO_RETAIN_SIZE */ Modified: head/usr.bin/xohtml/xohtml.sh ============================================================================== --- head/usr.bin/xohtml/xohtml.sh Mon May 6 20:15:18 2019 (r347206) +++ head/usr.bin/xohtml/xohtml.sh Mon May 6 20:20:21 2019 (r347207) @@ -12,7 +12,7 @@ # BASE=/usr/share/libxo -VERSION=1.0.2 +VERSION=1.0.4 CMD=cat DONE= WEB=http://juniper.github.io/libxo/${VERSION}/xohtml