From 033ce2cf3a274687eab3d7a97d9d4d01a385798e Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 29 Sep 2023 08:32:37 +0000 Subject: [PATCH 1/5] rapidjson - update from 1.10 to 1.11 --- build/python311/rapidjson/build.sh | 2 +- build/python311/rapidjson/patches/hexdigits.patch | 4 ++-- doc/packages.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/python311/rapidjson/build.sh b/build/python311/rapidjson/build.sh index d7c1edcebd..87bb8dfc65 100755 --- a/build/python311/rapidjson/build.sh +++ b/build/python311/rapidjson/build.sh @@ -18,7 +18,7 @@ PKG=library/python-3/rapidjson-311 PROG=rapidjson -VER=1.10 +VER=1.11 SUMMARY="rapidjson - Python interface to RapidJSON" DESC="RapidJSON is an extremely fast C++ JSON parser and serialization library" DESC+="; this module wraps it into a Python 3 extension" diff --git a/build/python311/rapidjson/patches/hexdigits.patch b/build/python311/rapidjson/patches/hexdigits.patch index 5c84ad1e15..3dd691a4b8 100644 --- a/build/python311/rapidjson/patches/hexdigits.patch +++ b/build/python311/rapidjson/patches/hexdigits.patch @@ -2,10 +2,10 @@ For compatibility with simplejson, output lower case hex digits for dump[s]() with ensure_ascii=True -diff -wpruN '--exclude=*.orig' a~/rapidjson/include/rapidjson/writer.h a/rapidjson/include/rapidjson/writer.h +diff -wpruN --no-dereference '--exclude=*.orig' a~/rapidjson/include/rapidjson/writer.h a/rapidjson/include/rapidjson/writer.h --- a~/rapidjson/include/rapidjson/writer.h 1970-01-01 00:00:00 +++ a/rapidjson/include/rapidjson/writer.h 1970-01-01 00:00:00 -@@ -375,7 +375,7 @@ protected: +@@ -381,7 +381,7 @@ protected: } bool WriteString(const Ch* str, SizeType length) { diff --git a/doc/packages.md b/doc/packages.md index 6d2682cc2e..64327bb5d8 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -144,7 +144,7 @@ | library/python-3/pyopenssl-311 | 23.2.0 | https://pypi.org/project/pyOpenSSL | library/python-3/pyrsistent-311 | 0.19.3 | https://pypi.org/project/pyrsistent | library/python-3/pyyaml-311 | 6.0.1 | https://pypi.org/project/PyYAML -| library/python-3/rapidjson-311 | 1.10 | https://pypi.org/project/python-rapidjson +| library/python-3/rapidjson-311 | 1.11 | https://pypi.org/project/python-rapidjson | library/python-3/semantic-version-311 | 2.10.0 | https://pypi.org/project/semantic-version | library/python-3/setuptools-311 | 68.1.2 | https://pypi.org/project/setuptools | library/python-3/setuptools-rust-311 | 1.7.0 | https://pypi.org/project/setuptools-rust From b0345d5c988241a17fc1b4229b93c621581d0396 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 29 Sep 2023 08:35:16 +0000 Subject: [PATCH 2/5] pv - update from 1.7.24 to 1.8.0 --- build/pv/build.sh | 2 +- build/pv/local.mog | 6 ++++-- doc/packages.md | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/pv/build.sh b/build/pv/build.sh index d11eb49965..f8601917b1 100755 --- a/build/pv/build.sh +++ b/build/pv/build.sh @@ -27,7 +27,7 @@ . ../../lib/build.sh PROG=pv -VER=1.7.24 +VER=1.8.0 PKG=shell/pipe-viewer SUMMARY="Pipe Viewer" DESC="pv - a terminal-based tool for monitoring the progress of data through a pipeline." diff --git a/build/pv/local.mog b/build/pv/local.mog index 4aed6b2532..be8f883f1b 100644 --- a/build/pv/local.mog +++ b/build/pv/local.mog @@ -7,7 +7,9 @@ # source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. -# Copyright 2021 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. -license doc/COPYING license="Artistic2" +license docs/COPYING license="GPLv3" + + drop> diff --git a/doc/packages.md b/doc/packages.md index 64327bb5d8..26c5c970ba 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -89,7 +89,7 @@ | shell/bash | 5.2.15 | https://ftp.gnu.org/gnu/bash/ | shell/bash5-patchlvl | 015 | https://ftp.gnu.org/gnu/bash/bash-5.2-patches | shell/bash5-completions | 2.11 | https://github.com/scop/bash-completion/releases -| shell/pipe-viewer | 1.7.24 | http://www.ivarch.com/programs/pv.shtml +| shell/pipe-viewer | 1.8.0 | http://www.ivarch.com/programs/pv.shtml | shell/tcsh | 6.24.10 | https://github.com/tcsh-org/tcsh/tags | shell/zsh | 5.9 | https://sourceforge.net/projects/zsh/files/zsh | system/cpuid | 1.8.2 | https://github.com/tycho/cpuid/tags From 3e236229a4ee3889b2d440fd8f7cf1df46839334 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 29 Sep 2023 08:35:21 +0000 Subject: [PATCH 3/5] bind - update from 9.18.18 to 9.18.19 --- build/bind/build.sh | 2 +- doc/packages.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/bind/build.sh b/build/bind/build.sh index 3d638ee567..88e81a3625 100755 --- a/build/bind/build.sh +++ b/build/bind/build.sh @@ -18,7 +18,7 @@ . ../../lib/build.sh PROG=bind -VER=9.18.18 +VER=9.18.19 PKG=network/dns/bind SUMMARY="BIND DNS tools" DESC="Client utilities for DNS lookups" diff --git a/doc/packages.md b/doc/packages.md index 26c5c970ba..7e69ef9385 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -68,7 +68,7 @@ | library/zlib | 1.3 | https://www.zlib.net/ | meta/data/microcode/amd | 20230809 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode | meta/data/microcode/intel | 20230808 | https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases -| network/dns/bind | 9.18.18 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/ +| network/dns/bind | 9.18.19 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/ | network/openssh | 9.4p1 | https://www.mirrorservice.org/pub/OpenBSD/OpenSSH/portable/ | network/rsync | 3.2.7 | https://rsync.samba.org/ | network/service/isc-dhcp | 4.4.3-P1 | https://ftp.isc.org/isc/dhcp/ https://www.isc.org/downloads/ From a7d4b2deef8084ec934258b83386f823f02e390b Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 29 Sep 2023 08:35:28 +0000 Subject: [PATCH 4/5] gettext - update from 0.22 to 0.22.2 --- build/gettext/build.sh | 2 +- build/gettext/testsuite.log | 8 ++++++-- doc/packages.md | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/gettext/build.sh b/build/gettext/build.sh index 5c4c8dce87..ff9ea86fab 100755 --- a/build/gettext/build.sh +++ b/build/gettext/build.sh @@ -18,7 +18,7 @@ . ../../lib/build.sh PROG=gettext -VER=0.22 +VER=0.22.2 PKG=text/gnu-gettext SUMMARY="gettext - GNU gettext utility" DESC="GNU gettext - GNU gettext utility" diff --git a/build/gettext/testsuite.log b/build/gettext/testsuite.log index 9b4c348a04..1f9fa1a3de 100644 --- a/build/gettext/testsuite.log +++ b/build/gettext/testsuite.log @@ -253,6 +253,9 @@ PASS: xgettext-15 SKIP: xgettext-16 PASS: xgettext-17 PASS: xgettext-18 +PASS: xgettext-combine-1 +PASS: xgettext-combine-2 +PASS: xgettext-combine-3 PASS: xgettext-appdata-1 PASS: xgettext-awk-1 PASS: xgettext-awk-2 @@ -387,6 +390,7 @@ PASS: xgettext-perl-stackovfl-1 PASS: xgettext-perl-stackovfl-2 PASS: xgettext-perl-stackovfl-3 PASS: xgettext-perl-stackovfl-4 +PASS: xgettext-perl-stackovfl-5 PASS: xgettext-php-1 PASS: xgettext-php-2 PASS: xgettext-php-3 @@ -564,8 +568,8 @@ PASS: autopoint-1 PASS: autopoint-2 PASS: autopoint-3 PASS: cldr-plurals-1 -# TOTAL: 548 -# PASS: 520 +# TOTAL: 552 +# PASS: 524 # SKIP: 27 # XFAIL: 0 # FAIL: 1 diff --git a/doc/packages.md b/doc/packages.md index 7e69ef9385..8957d6a7ce 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -110,7 +110,7 @@ | terminal/tmux | 3.3 | https://github.com/tmux/tmux/releases http://tmux.github.io/ | text/gawk | 5.2.2 | https://ftp.gnu.org/gnu/gawk/ | text/gnu-diffutils | 3.10 | http://git.savannah.gnu.org/cgit/diffutils.git/refs/tags -| text/gnu-gettext | 0.22 | https://ftp.gnu.org/pub/gnu/gettext/ +| text/gnu-gettext | 0.22.2 | https://ftp.gnu.org/pub/gnu/gettext/ | text/gnu-grep | 3.11 | https://ftp.gnu.org/gnu/grep/ | text/gnu-patch | 2.7.6 | http://git.savannah.gnu.org/cgit/patch.git/refs/tags | text/gnu-sed | 4.9 | https://ftp.gnu.org/gnu/sed/ https://savannah.gnu.org/news/?group=sed From 2d87e40411f44401986c454424533cbe93691199 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 29 Sep 2023 08:36:42 +0000 Subject: [PATCH 5/5] Update AMD microcode version after a comment commit was added upstream --- doc/packages.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/packages.md b/doc/packages.md index 8957d6a7ce..2fd9fa4828 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -65,8 +65,8 @@ | library/security/openssl-3 | 3.1.3 | https://www.openssl.org/source/ | library/unixodbc | 2.3.12 | http://www.unixodbc.org/download.html | library/xxhash | 0.8.2 | https://github.com/Cyan4973/xxHash/releases | Currently used solely by rsync -| library/zlib | 1.3 | https://www.zlib.net/ -| meta/data/microcode/amd | 20230809 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode +| library/zlib | 1.3 | https://www.zlib.net/ +| meta/data/microcode/amd | 20230918 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode | meta/data/microcode/intel | 20230808 | https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases | network/dns/bind | 9.18.19 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/ | network/openssh | 9.4p1 | https://www.mirrorservice.org/pub/OpenBSD/OpenSSH/portable/