From ea630e059b8093b85b9f04d387a3688fcfc26237 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:32:50 +0000 Subject: [PATCH 1/5] glib - update from 2.78.3 to 2.78.4 --- build/glib/build.sh | 4 ++-- build/glib/testsuite.log | 6 +++--- doc/packages.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/glib/build.sh b/build/glib/build.sh index db8afef268..0ad1f54793 100755 --- a/build/glib/build.sh +++ b/build/glib/build.sh @@ -13,12 +13,12 @@ # }}} # Copyright 2011-2012 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=glib -VER=2.78.3 +VER=2.78.4 PKG=library/glib2 SUMMARY="GNOME utility library" DESC="The GNOME general-purpose utility library" diff --git a/build/glib/testsuite.log b/build/glib/testsuite.log index 4bd04a4ecc..af77103010 100644 --- a/build/glib/testsuite.log +++ b/build/glib/testsuite.log @@ -113,7 +113,7 @@ glib:gio+cpp / cxx-17 OK glib:gio+cpp / cxx-20 OK glib:gio+cpp / cxx-2b OK glib:gio+cpp / cxx-98 OK -glib:gio+no-valgrind+gdbus-codegen+slow / codegen.py OK 34 subtests passed +glib:gio+no-valgrind+gdbus-codegen+slow / codegen.py OK 37 subtests passed glib:gio+no-valgrind+pkg-config / gio-2.0-pkg-config OK glib:gio+no-valgrind+pkg-config / gio-unix-2.0-pkg-config OK glib:gio+portal-support / portal-support-env-var OK 1 subtests passed @@ -192,7 +192,7 @@ glib:glib+core / rec-mutex OK 29 s glib:glib+core / refcount OK 4 subtests passed glib:glib+core / refcount-macro OK 4 subtests passed glib:glib+core / refstring OK 5 subtests passed -glib:glib+core / regex OK 847 subtests passed +glib:glib+core / regex OK 848 subtests passed glib:glib+core / relation OK 1 subtests passed glib:glib+core / rwlock OK 8 subtests passed glib:glib+core / scannerapi OK 4 subtests passed @@ -349,8 +349,8 @@ glib:gio / converter-stream ERROR k glib:gio / g-file-info ERROR killed by signal 6 SIGABRT glib:gio / appmonitor ERROR killed by signal 6 SIGABRT glib:gio / file ERROR killed by signal 5 SIGTRAP -glib:gio / appinfo ERROR killed by signal 5 SIGTRAP glib:gio / desktop-app-info ERROR killed by signal 5 SIGTRAP +glib:gio / appinfo ERROR killed by signal 5 SIGTRAP glib:gio / gsettings ERROR killed by signal 5 SIGTRAP Ok: 325 diff --git a/doc/packages.md b/doc/packages.md index 6b97385ab6..663e072f53 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -119,7 +119,7 @@ | web/curl | 8.5.0 | https://curl.haxx.se/download.html | web/wget | 1.21.4 | https://ftp.gnu.org/gnu/wget/ | web/wget2 | 2.1.0 | https://ftp.gnu.org/gnu/wget/ -| library/glib2 | 2.78.3 | https://download.gnome.org/sources/glib/cache.json https://download.gnome.org/sources/glib/ | Odd minor versions are dev/unstable +| library/glib2 | 2.78.4 | https://download.gnome.org/sources/glib/cache.json https://download.gnome.org/sources/glib/ | Odd minor versions are dev/unstable | developer/gnu-binutils | 2.41 | https://ftp.gnu.org/gnu/binutils | media/xorriso | 1.5.6.pl02 | https://www.gnu.org/software/xorriso/ | system/virtualization/open-vm-tools | 12.3.0 | https://github.com/vmware/open-vm-tools/releases https://docs.vmware.com/en/VMware-Tools/ From 776939a7b93fafee062344dcf68c3f886c372cbc Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:32:54 +0000 Subject: [PATCH 2/5] lzlib - update from 1.13 to 1.14 --- build/lzlib/build.sh | 4 ++-- build/lzlib/patches/ld-soname.patch | 2 +- build/lzlib/testsuite.log | 2 +- doc/packages.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/lzlib/build.sh b/build/lzlib/build.sh index fb4227b5d3..80859f624f 100755 --- a/build/lzlib/build.sh +++ b/build/lzlib/build.sh @@ -12,13 +12,13 @@ # http://www.illumos.org/license/CDDL. # }}} -# Copyright 2022 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=lzlib PKG=library/lzlib -VER=1.13 +VER=1.14 SUMMARY="Data compression library" DESC="$SUMMARY providing in-memory LZMA (de-)compression functions" diff --git a/build/lzlib/patches/ld-soname.patch b/build/lzlib/patches/ld-soname.patch index 6bab3c804a..aaf20026b7 100644 --- a/build/lzlib/patches/ld-soname.patch +++ b/build/lzlib/patches/ld-soname.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/Makefile.in a/Makefile.in +diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile.in a/Makefile.in --- a~/Makefile.in 1970-01-01 00:00:00 +++ a/Makefile.in 1970-01-01 00:00:00 @@ -26,7 +26,7 @@ lib$(libname).a : lzlib.o diff --git a/build/lzlib/testsuite.log b/build/lzlib/testsuite.log index d69be45f14..d246555412 100644 --- a/build/lzlib/testsuite.log +++ b/build/lzlib/testsuite.log @@ -1,4 +1,4 @@ -testing lzlib-1.13... +testing lzlib-1.14... testing decompression... testing compression... testing bad input... diff --git a/doc/packages.md b/doc/packages.md index 663e072f53..0cc55a05dc 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -49,7 +49,7 @@ | library/libuv | 1.47.0 | https://github.com/libuv/libuv/releases | Currently used solely by bind | library/libxml2 | 2.12.4 | https://github.com/GNOME/libxml2/tags http://xmlsoft.org/news.html | library/libxslt | 1.1.30 | http://xmlsoft.org/libxslt/news.html -| library/lzlib | 1.13 | https://download.savannah.gnu.org/releases/lzip/lzlib/ +| library/lzlib | 1.14 | https://download.savannah.gnu.org/releases/lzip/lzlib/ | library/nettle | 3.9.1 | https://ftp.gnu.org/gnu/nettle/ https://www.lysator.liu.se/~nisse/nettle/ | Used solely by chrony | library/ncurses | 6.4 | https://ftp.gnu.org/gnu/ncurses/ | library/nghttp2 | 1.58.0 | https://github.com/nghttp2/nghttp2/releases From ca1b035e15981947766a683265d769575aab98fc Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:32:59 +0000 Subject: [PATCH 3/5] nghttp2 - update from 1.58.0 to 1.59.0 --- build/nghttp2/build.sh | 4 ++-- build/nghttp2/testsuite.log | 4 ++-- doc/packages.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/nghttp2/build.sh b/build/nghttp2/build.sh index b142ce7d03..be8145b60e 100755 --- a/build/nghttp2/build.sh +++ b/build/nghttp2/build.sh @@ -13,12 +13,12 @@ # }}} # # Copyright 2011-2017 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=nghttp2 -VER=1.58.0 +VER=1.59.0 PKG=library/nghttp2 SUMMARY="nghttp2: HTTP/2 C Library" DESC="An implementation of the Hypertext Transfer Protocol version 2 in C" diff --git a/build/nghttp2/testsuite.log b/build/nghttp2/testsuite.log index 6b7b514ee4..c3f7a02a07 100644 --- a/build/nghttp2/testsuite.log +++ b/build/nghttp2/testsuite.log @@ -5,7 +5,7 @@ Making check in src Making check in testdata Making all in testdata ============================================================================ -Testsuite summary for nghttp2 1.58.0 +Testsuite summary for nghttp2 1.59.0 ============================================================================ # TOTAL: 0 # PASS: 0 @@ -22,7 +22,7 @@ Making check in testdata PASS: main PASS: failmalloc ============================================================================ -Testsuite summary for nghttp2 1.58.0 +Testsuite summary for nghttp2 1.59.0 ============================================================================ # TOTAL: 2 # PASS: 2 diff --git a/doc/packages.md b/doc/packages.md index 0cc55a05dc..c7b5f29484 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -52,7 +52,7 @@ | library/lzlib | 1.14 | https://download.savannah.gnu.org/releases/lzip/lzlib/ | library/nettle | 3.9.1 | https://ftp.gnu.org/gnu/nettle/ https://www.lysator.liu.se/~nisse/nettle/ | Used solely by chrony | library/ncurses | 6.4 | https://ftp.gnu.org/gnu/ncurses/ -| library/nghttp2 | 1.58.0 | https://github.com/nghttp2/nghttp2/releases +| library/nghttp2 | 1.59.0 | https://github.com/nghttp2/nghttp2/releases | library/nss | 3.96.1 | https://ftp.mozilla.org/pub/security/nss/releases/ https://firefox-source-docs.mozilla.org/security/nss/releases/ | library/nspr | 4.35 | http://archive.mozilla.org/pub/nspr/releases/ | https://ftp.mozilla.org/pub/security/nss/releases/ | library/pcre2 | 10.42 | https://github.com/PhilipHazel/pcre2/releases From 8a2e224dcc4d3312dc403d9b0daf7d8b69923871 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:33:02 +0000 Subject: [PATCH 4/5] nss - update from 3.96.1 to 3.97 --- build/nss/build.sh | 4 ++-- build/nss/patches/aarch64.patch | 2 +- build/nss/patches/pkcs11v3.patch | 2 +- build/nss/patches/shadowing.patch | 2 +- doc/packages.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/nss/build.sh b/build/nss/build.sh index 3af548fb99..42912bb69c 100755 --- a/build/nss/build.sh +++ b/build/nss/build.sh @@ -12,12 +12,12 @@ # http://www.illumos.org/license/CDDL. # }}} # -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=nss -VER=3.96.1 +VER=3.97 PKG=system/library/mozilla-nss SUMMARY="Network Security Services" DESC="Network Security Services (NSS) is a set of libraries designed to " diff --git a/build/nss/patches/aarch64.patch b/build/nss/patches/aarch64.patch index 5b23de1d46..54c91bba10 100644 --- a/build/nss/patches/aarch64.patch +++ b/build/nss/patches/aarch64.patch @@ -54,7 +54,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/pk11wrap/pk11hpke.c a/lib diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/pk11wrap/pk11pub.h a/lib/pk11wrap/pk11pub.h --- a~/lib/pk11wrap/pk11pub.h 1970-01-01 00:00:00 +++ a/lib/pk11wrap/pk11pub.h 1970-01-01 00:00:00 -@@ -847,12 +847,14 @@ SECStatus PK11_AEADRawOp(PK11Context *co +@@ -888,12 +888,14 @@ SECStatus PK11_AEADRawOp(PK11Context *co unsigned char *out, int *outlen, int maxout, const unsigned char *in, int inlen); /* NSS builds the mechanism specific params */ diff --git a/build/nss/patches/pkcs11v3.patch b/build/nss/patches/pkcs11v3.patch index 4746ce2deb..85ff406ccd 100644 --- a/build/nss/patches/pkcs11v3.patch +++ b/build/nss/patches/pkcs11v3.patch @@ -13,7 +13,7 @@ CK_GENERATOR_FUNCTION is just CK_ULONG, so replace it in the header file. diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/pk11wrap/pk11pub.h a/lib/pk11wrap/pk11pub.h --- a~/lib/pk11wrap/pk11pub.h 1970-01-01 00:00:00 +++ a/lib/pk11wrap/pk11pub.h 1970-01-01 00:00:00 -@@ -847,7 +847,7 @@ SECStatus PK11_AEADRawOp(PK11Context *co +@@ -888,7 +888,7 @@ SECStatus PK11_AEADRawOp(PK11Context *co unsigned char *out, int *outlen, int maxout, const unsigned char *in, int inlen); /* NSS builds the mechanism specific params */ diff --git a/build/nss/patches/shadowing.patch b/build/nss/patches/shadowing.patch index e00556e24e..ebd640951f 100644 --- a/build/nss/patches/shadowing.patch +++ b/build/nss/patches/shadowing.patch @@ -1,7 +1,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/softoken/pkcs11.c a/lib/softoken/pkcs11.c --- a~/lib/softoken/pkcs11.c 1970-01-01 00:00:00 +++ a/lib/softoken/pkcs11.c 1970-01-01 00:00:00 -@@ -3506,8 +3506,8 @@ loser: +@@ -3542,8 +3542,8 @@ loser: char buf[200]; int major = 0, minor = 0; diff --git a/doc/packages.md b/doc/packages.md index c7b5f29484..272c232bf8 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -53,7 +53,7 @@ | library/nettle | 3.9.1 | https://ftp.gnu.org/gnu/nettle/ https://www.lysator.liu.se/~nisse/nettle/ | Used solely by chrony | library/ncurses | 6.4 | https://ftp.gnu.org/gnu/ncurses/ | library/nghttp2 | 1.59.0 | https://github.com/nghttp2/nghttp2/releases -| library/nss | 3.96.1 | https://ftp.mozilla.org/pub/security/nss/releases/ https://firefox-source-docs.mozilla.org/security/nss/releases/ +| library/nss | 3.97 | https://ftp.mozilla.org/pub/security/nss/releases/ https://firefox-source-docs.mozilla.org/security/nss/releases/ | library/nspr | 4.35 | http://archive.mozilla.org/pub/nspr/releases/ | https://ftp.mozilla.org/pub/security/nss/releases/ | library/pcre2 | 10.42 | https://github.com/PhilipHazel/pcre2/releases | library/perl-5/xml-parser | 2.47 | https://metacpan.org/pod/XML::Parser From 362532356c3c132b62d78159a13073e0ccb59bc3 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:33:08 +0000 Subject: [PATCH 5/5] zlib - update from 1.3 to 1.3.1 --- build/zlib/build.sh | 8 ++++++-- build/zlib/testsuite.log | 6 +++--- doc/packages.md | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build/zlib/build.sh b/build/zlib/build.sh index fc0de56eb1..82beaef996 100755 --- a/build/zlib/build.sh +++ b/build/zlib/build.sh @@ -13,12 +13,12 @@ # }}} # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=zlib -VER=1.3 +VER=1.3.1 PKG=library/zlib SUMMARY="$PROG compression library" DESC="A patent-free compression library" @@ -36,6 +36,10 @@ CONFIGURE_OPTS[amd64]="--libdir=$PREFIX/lib/amd64" CONFIGURE_OPTS[aarch64]="--libdir=$PREFIX/lib" LDFLAGS[i386]+=" -lssp_ns" +TESTSUITE_SED=" + s/version [0-9\.]* = 0x[0-9a-z]*/VERSION/g +" + pre_configure() { export cc=$CC diff --git a/build/zlib/testsuite.log b/build/zlib/testsuite.log index 319fd44113..92a47389e3 100644 --- a/build/zlib/testsuite.log +++ b/build/zlib/testsuite.log @@ -1,5 +1,5 @@ hello world -zlib version 1.3 = 0x1300, compile flags = 0xa9 +zlib VERSION, compile flags = 0xa9 uncompress(): hello, hello! gzread(): hello, hello! gzgets() after gzseek: hello! @@ -9,7 +9,7 @@ after inflateSync(): hello, hello! inflate with dictionary: hello, hello! *** zlib test OK *** hello world -zlib version 1.3 = 0x1300, compile flags = 0xa9 +zlib VERSION, compile flags = 0xa9 uncompress(): hello, hello! gzread(): hello, hello! gzgets() after gzseek: hello! @@ -19,7 +19,7 @@ after inflateSync(): hello, hello! inflate with dictionary: hello, hello! *** zlib shared test OK *** hello world -zlib version 1.3 = 0x1300, compile flags = 0xa9 +zlib VERSION, compile flags = 0xa9 uncompress(): hello, hello! gzread(): hello, hello! gzgets() after gzseek: hello! diff --git a/doc/packages.md b/doc/packages.md index 272c232bf8..1465f080c9 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -65,7 +65,7 @@ | library/security/openssl-3 | 3.1.4 | 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/ +| library/zlib | 1.3.1 | https://www.zlib.net/ | meta/data/microcode/amd | 20231205 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode | meta/data/microcode/intel | 20231114 | https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases | network/dns/bind | 9.18.21 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/