From nobody Mon Jan 30 18:38:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P5H4f5yG3z3cC24; Mon, 30 Jan 2023 18:38:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P5H4f57Vkz3Nv3; Mon, 30 Jan 2023 18:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675103906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Du3G//TySCRVh1lg6PzkSOVHKY73bws8Xc4xiL9uQZQ=; b=iyCQQr0gM2WokIPmRdZM+MX6wUyRJofSfS5gJpX+v+xLEyx80N4W9AtC5cvhB9vGbnJKKQ tQZSKqy+nkHO1etfPHW7A+FwgaZ6mzLYQjey8aa7EbZjfFwThxv7eIvXFL0/za10XKzkWi tgNiuaRMVCEuq1JVHomIad9VqDC8A55xe5k1bHkqyj1n6kUGhLBjIPoUjel0toNpFeJ5xD PcOeUNJW4b6BGmaZQz67T8Y4dik7RAZNCQg6kxxsoa0Q1cwIIL4vBLgBYmsc1Cn0laFQC5 Gkj/C/3BAtskQ5G35pB8uxiytXGGaeIsC1Mn2T8MTI8RcSpt+wwrdJZxOZMRVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675103906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Du3G//TySCRVh1lg6PzkSOVHKY73bws8Xc4xiL9uQZQ=; b=VhC2pjC7UiK+1H3+nfAQBSD6IIuyVLeo3xMo3hXjLmBqaTx318PhinNsNBvd3eN/tKdV2D a+4XhsYDPt89YLfRK0OFPlzFWQ0svlOlm9bZUH23bFZDPXdkEmER4gUgBUd2ub2G5OBsqT qRwD3FXTs9yWqutg1ZTCrYS2F91jr2KKZefVL/WrEYGX0hdbLK0bmgsTB2I20TUtiFna9/ 4opygKAF9OHEcUiKVy3hCG9Qn3QbLj4aUojklR0wZ10YIBDiqeAjy7/81u/7/ut73id6HN ea+GbOCYEu/L6W3SddGmo3HD0wPvV4NuJGQNxKLYFNH/Ba3Be4xv+VkG3tyPBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675103906; a=rsa-sha256; cv=none; b=YuI2sbpOMKyy0GqAzU3YL2PAkJk1d2nu/6x4Mvft3gF9sXyKox8W1dgdoFIt4wZZrlV/ow dQrA3JSM9cQvNm+xFEujVE/EnxkXrNVo468A7V0hnRMQKmiqaEDDTbWiqdDzu5dt1MII8x Jvs+ashRLjxdC99Ltxv62OKPefH7oiIbvzhZs/q+cP2Xq8qTtOjolumxTNDDSCLqJuR4zA A5AYNasMbzlCrw9PfC4NQ6LyBBd9wuQqAsgWZ1bbDO6yr2IR+aE6yKEn9N/5lX9YUNNKax tCRO4wCQsTEXh/o4oAFSUnHSMM5ATq9Neyl1XrV1r0A2F+PY8kmZrn/b+Z2qTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P5H4f4BydzJpk; Mon, 30 Jan 2023 18:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30UIcQu9046506; Mon, 30 Jan 2023 18:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UIcQBi046505; Mon, 30 Jan 2023 18:38:26 GMT (envelope-from git) Date: Mon, 30 Jan 2023 18:38:26 GMT Message-Id: <202301301838.30UIcQBi046505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Phil Shafer Subject: git: e1e2080fc1ce - main - Import Juniper libxo-1.6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phil X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1e2080fc1ce59cc2ef3ba4ae6031cd550d75bed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by phil: URL: https://cgit.FreeBSD.org/src/commit/?id=e1e2080fc1ce59cc2ef3ba4ae6031cd550d75bed commit e1e2080fc1ce59cc2ef3ba4ae6031cd550d75bed Author: Phil Shafer AuthorDate: 2023-01-30 18:35:27 +0000 Commit: Phil Shafer CommitDate: 2023-01-30 18:37:33 +0000 Import Juniper libxo-1.6.0 PR: 262332 --- lib/libxo/add.man | 4 ++-- lib/libxo/libxo/xo_config.h | 17 ++++++++++------- usr.bin/xohtml/xohtml.sh | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/libxo/add.man b/lib/libxo/add.man index d4e2bc3c0ea0..ff520fa14be8 100644 --- a/lib/libxo/add.man +++ b/lib/libxo/add.man @@ -3,10 +3,10 @@ .Fx uses .Nm libxo -version 1.4.0. +version 1.6.0. Complete documentation can be found on github: .Bd -literal -offset indent -https://juniper.github.io/libxo/1.4.0/html/index.html +https://juniper.github.io/libxo/1.6.0/html/index.html .Ed .Pp .Nm libxo diff --git a/lib/libxo/libxo/xo_config.h b/lib/libxo/libxo/xo_config.h index 079eef508ad1..3a160d9836e3 100644 --- a/lib/libxo/libxo/xo_config.h +++ b/lib/libxo/libxo/xo_config.h @@ -48,6 +48,9 @@ /* Define to 1 if you have the `flock' function. */ #define HAVE_FLOCK 1 +/* Using real gcc */ +/* #undef HAVE_GCC */ + /* Define to 1 if you have the `getpass' function. */ #define HAVE_GETPASS 1 @@ -102,7 +105,7 @@ #define HAVE_SRAND 1 /* Define to 1 if you have the `sranddev' function. */ -#define HAVE_SRANDDEV 1 +/* #undef HAVE_SRANDDEV */ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -183,16 +186,16 @@ /* #undef LIBXO_TEXT_ONLY */ /* Version number as dotted value */ -#define LIBXO_VERSION "1.4.0" +#define LIBXO_VERSION "1.6.0" /* Version number extra information */ #define LIBXO_VERSION_EXTRA "" /* Version number as a number */ -#define LIBXO_VERSION_NUMBER 1004000 +#define LIBXO_VERSION_NUMBER 1006000 /* Version number as string */ -#define LIBXO_VERSION_STRING "1004000" +#define LIBXO_VERSION_STRING "1006000" /* Enable local wcwidth implementation */ #define LIBXO_WCWIDTH 1 @@ -210,7 +213,7 @@ #define PACKAGE_NAME "libxo" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxo 1.4.0" +#define PACKAGE_STRING "libxo 1.6.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libxo" @@ -219,7 +222,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.0" +#define PACKAGE_VERSION "1.6.0" /* 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 +239,7 @@ /* #undef USE_INT_RETURN_CODES */ /* Version number of package */ -#define VERSION "1.4.0" +#define VERSION "1.6.0" /* Retain hash bucket size */ /* #undef XO_RETAIN_SIZE */ diff --git a/usr.bin/xohtml/xohtml.sh b/usr.bin/xohtml/xohtml.sh index 3eb7901483a7..f96aa3c37288 100755 --- a/usr.bin/xohtml/xohtml.sh +++ b/usr.bin/xohtml/xohtml.sh @@ -12,7 +12,7 @@ # BASE=/usr/share/libxo -VERSION=1.4.0 +VERSION=1.6.0 CMD=cat DONE= WEB=http://juniper.github.io/libxo/${VERSION}/xohtml