Skip to content

Commit

Permalink
Merge pull request #3391 from citrus-it/pkgupd
Browse files Browse the repository at this point in the history
Core package updates
  • Loading branch information
hadfl authored Nov 13, 2023
2 parents f12b4ea + f52c3ef commit 087bc30
Show file tree
Hide file tree
Showing 32 changed files with 173 additions and 140 deletions.
4 changes: 2 additions & 2 deletions build/bash/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
#
# Copyright 2011-2013 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright (c) 2013 by Delphix. All rights reserved.
# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
#
. ../../lib/build.sh

PROG=bash
VER=5.2.15
VER=5.2.21
PKG=shell/bash
SUMMARY="GNU Bash"
DESC="GNU Bourne-Again shell (bash)"
Expand Down
2 changes: 1 addition & 1 deletion build/bash/patches/memalloc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This prevents the compiler from seeing any updated version of that file.
To resolve that, the fix that GCC would use is applied directly to the
include file so that it doesn't see a need to fix it.

diff -wpruN '--exclude=*.orig' a~/include/memalloc.h a/include/memalloc.h
diff -wpruN --no-dereference '--exclude=*.orig' a~/include/memalloc.h a/include/memalloc.h
--- a~/include/memalloc.h 1970-01-01 00:00:00
+++ a/include/memalloc.h 1970-01-01 00:00:00
@@ -22,7 +22,7 @@
Expand Down
2 changes: 1 addition & 1 deletion build/bind/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PKG=network/dns/bind
SUMMARY="BIND DNS tools"
DESC="Client utilities for DNS lookups"

LIBUVVER=1.46.0
LIBUVVER=1.47.0
XFORM_ARGS+=" -DLIBUV=$LIBUVVER"

# This package ships private shared libraries in $PREFIX/lib/dns that are only
Expand Down
2 changes: 1 addition & 1 deletion build/fio/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
. ../../lib/build.sh

PROG=fio
VER=3.35
VER=3.36
PKG=system/test/fio
SUMMARY="Flexible IO Tester"
DESC="A tool that is able to simulate a given I/O workload"
Expand Down
2 changes: 1 addition & 1 deletion build/fio/patches/libraries.patch
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -894,7 +894,7 @@ int main(void)
@@ -917,7 +917,7 @@ int main(void)
EOF
if compile_prog "" "-laio" "solarisaio" ; then
solaris_aio=yes
Expand Down
2 changes: 1 addition & 1 deletion build/gawk/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=gawk
VER=5.2.2
VER=5.3.0
PKG=text/gawk
SUMMARY="GNU awk"
DESC="gawk - GNU implementation of awk"
Expand Down
71 changes: 54 additions & 17 deletions build/gawk/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,12 @@ badbuild
callparam
childin
clobber
closebad
close_status
closebad
clsflnam
cmdlinefsbacknl
cmdlinefsbacknl2
./cmdlinefsbacknl2.ok _cmdlinefsbacknl2 differ: char 8, line 2
compare
compare2
concat1
Expand Down Expand Up @@ -122,6 +125,7 @@ getlnfa
getnr2tb
getnr2tm
gsubasgn
gsubnulli18n
gsubtest
gsubtst2
gsubtst3
Expand Down Expand Up @@ -219,6 +223,7 @@ rebuild
redfilnm
regeq
regex3minus
regexpbad
regexpbrack
regexpbrack2
regexprange
Expand Down Expand Up @@ -318,11 +323,11 @@ arraysort
arraysort2
arraytype
asortbool
asortsymtab
backw
badargs
beginfile1
beginfile2
asortsymtab
binmode1
charasbytes
clos1way
Expand All @@ -334,6 +339,10 @@ clos1way6
colonwarn
commas
crlf
csv1
csv2
csv3
csvodd
dbugeval
dbugeval2
dbugeval3
Expand Down Expand Up @@ -381,6 +390,7 @@ genpot
gensub
gensub2
gensub3
gensub4
getlndir
gnuops2
gnuops3
Expand Down Expand Up @@ -417,6 +427,8 @@ lintint
lintlength
lintold
lintplus
lintplus2
lintplus3
lintset
lintwarn
manyfiles
Expand Down Expand Up @@ -472,14 +484,6 @@ printhuge
procinfs
profile0
profile1
profile2
profile3
profile4
profile5
profile6
profile7
profile8
profile9
profile10
profile11
profile12
Expand All @@ -488,6 +492,14 @@ profile14
profile15
profile16
profile17
profile2
profile3
profile4
profile5
profile6
profile7
profile8
profile9
pty1
pty2
rebuf
Expand Down Expand Up @@ -548,6 +560,7 @@ typeof3
typeof4
typeof5
typeof6
unicode1
watchpoint1
gawk is not compiled to support the array debug tests
======== Done with gawk extension tests ========
Expand Down Expand Up @@ -576,6 +589,7 @@ mbprintf3
mbprintf4
mbprintf5
mtchi18n
mtchi18n2
nlstringtest
rebt8b2
rtlenmb
Expand All @@ -602,8 +616,8 @@ ordchr
ordchr2
readall
readdir
readdir_test
readdir_retest
readdir_test
readfile
readfile2
revout
Expand Down Expand Up @@ -645,18 +659,41 @@ double2
inf-nan-torture
intformat
======== Done with machine-specific tests ========
1 TESTS FAILED
make[3]: *** [Makefile:5588: pass-fail] Error 1
2 TESTS FAILED
make[3]: *** [Makefile:5687: pass-fail] Error 1
============== _cmdlinefsbacknl2 =============
--- cmdlinefsbacknl2.ok Mon Oct 9 15:38:09 2023
+++ _cmdlinefsbacknl2 Fri Nov 10 11:00:13 2023
@@ -1,12 +1,19 @@
5c 0a
+
5c 0a
+
5c 0a
+
5c 0a
+
5c 0a
+
5c 0a
+
gawk: cmd. line:2: warning: invalid `\u' escape sequence
gawk: cmd. line:3: warning: invalid `\u' escape sequence
3f 0a 3f 0a
+
gawk: cmd. line:2: warning: invalid `\u' escape sequence
right: literal ? is literal
gawk: cmd. line:2: warning: invalid `\u' escape sequence
============== _localenl =============
--- localenl.ok Thu Dec 14 17:49:00 2017
+++ _localenl Thu May 18 23:36:12 2023
+++ _localenl Fri Nov 10 11:00:26 2023
@@ -1,4 +1,5 @@
LC_ALL=C passed
LC_ALL=POSIX passed
-LC_ALL=en_US.ISO-8859-1 passed
+en_US.ISO-8859-1: unknown locale
+LC_ALL=POSIX passed
LC_ALL=en_US.UTF-8 passed
make[2]: *** [Makefile:2162: check] Error 1
make[1]: *** [Makefile:808: check-recursive] Error 1
make: *** [Makefile:1107: check] Error 2
make[2]: *** [Makefile:2189: check] Error 1
make[1]: *** [Makefile:803: check-recursive] Error 1
make: *** [Makefile:1102: check] Error 2
2 changes: 1 addition & 1 deletion build/gettext/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=gettext
VER=0.22.2
VER=0.22.3
PKG=text/gnu-gettext
SUMMARY="gettext - GNU gettext utility"
DESC="GNU gettext - GNU gettext utility"
Expand Down
2 changes: 1 addition & 1 deletion build/git/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
. ../../lib/build.sh

PROG=git
VER=2.42.0
VER=2.42.1
PKG=developer/versioning/git
SUMMARY="$PROG - distributed version control system"
DESC="Git is a free and open source distributed version control system "
Expand Down
2 changes: 1 addition & 1 deletion build/git/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*** t0006-date.sh ***
# passed all 94 test(s)
*** t0007-git-var.sh ***
# passed all 26 test(s)
# passed all 27 test(s)
*** t0008-ignores.sh ***
# passed all 396 test(s)
*** t0009-prio-queue.sh ***
Expand Down
2 changes: 1 addition & 1 deletion build/glib/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=glib
VER=2.78.0
VER=2.78.1
PKG=library/glib2
SUMMARY="GNOME utility library"
DESC="The GNOME general-purpose utility library"
Expand Down
13 changes: 0 additions & 13 deletions build/glib/patches/ptrace.patch

This file was deleted.

1 change: 0 additions & 1 deletion build/glib/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ devnull_poll.patch
strftime.patch
printf.patch
test-credentials-clear-error.patch
ptrace.patch
5 changes: 3 additions & 2 deletions build/glib/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ glib:glib+core / string-macro OK 23 s
glib:glib+core / strvbuilder OK 5 subtests passed
glib:glib+core / test-printf OK 20 subtests passed
glib:glib+core / testing OK 42 subtests passed
glib:glib+core / testing-macro OK 42 subtests passed
glib:glib+core / thread OK 6 subtests passed
glib:glib+core / thread-deprecated OK 6 subtests passed
glib:glib+core / thread-pool OK 5 subtests passed
Expand Down Expand Up @@ -348,11 +349,11 @@ 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 / desktop-app-info 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 / gsettings ERROR killed by signal 5 SIGTRAP

Ok: 324
Ok: 325
Expected Fail: 0
Fail: 12
Unexpected Pass: 0
Expand Down
2 changes: 1 addition & 1 deletion build/mercurial/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=mercurial
VER=6.5.2
VER=6.5.3
PKG=developer/versioning/mercurial
SUMMARY="Mercurial source control management"
DESC="Free, distributed source control management tool"
Expand Down
2 changes: 1 addition & 1 deletion build/nghttp2/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=nghttp2
VER=1.56.0
VER=1.58.0
PKG=library/nghttp2
SUMMARY="nghttp2: HTTP/2 C Library"
DESC="An implementation of the Hypertext Transfer Protocol version 2 in C"
Expand Down
4 changes: 2 additions & 2 deletions build/nghttp2/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Making check in src
Making check in testdata
Making all in testdata
============================================================================
Testsuite summary for nghttp2 1.56.0
Testsuite summary for nghttp2 1.58.0
============================================================================
# TOTAL: 0
# PASS: 0
Expand All @@ -22,7 +22,7 @@ Making check in testdata
PASS: main
PASS: failmalloc
============================================================================
Testsuite summary for nghttp2 1.56.0
Testsuite summary for nghttp2 1.58.0
============================================================================
# TOTAL: 2
# PASS: 2
Expand Down
2 changes: 1 addition & 1 deletion build/nss/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=nss
VER=3.93
VER=3.94
PKG=system/library/mozilla-nss
SUMMARY="Network Security Services"
DESC="Network Security Services (NSS) is a set of libraries designed to "
Expand Down
6 changes: 3 additions & 3 deletions build/nss/patches/illumos.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1819022
diff -wpruN --no-dereference '--exclude=*.orig' a~/coreconf/config.gypi a/coreconf/config.gypi
--- a~/coreconf/config.gypi 1970-01-01 00:00:00
+++ a/coreconf/config.gypi 1970-01-01 00:00:00
@@ -170,7 +170,7 @@
@@ -171,7 +171,7 @@
'NSS_NO_INIT_SUPPORT',
],
}],
Expand All @@ -12,7 +12,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/coreconf/config.gypi a/coreco
'libraries': [
'-lpthread',
],
@@ -278,6 +278,9 @@
@@ -279,6 +279,9 @@
'sources': [
'<(INTERMEDIATE_DIR)/out.>(mapfile)',
],
Expand All @@ -22,7 +22,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/coreconf/config.gypi a/coreco
'actions': [{
'action_name': 'generate_mapfile',
'inputs': [
@@ -412,6 +415,11 @@
@@ -413,6 +416,11 @@
'-z', 'noexecstack',
],
}],
Expand Down
2 changes: 1 addition & 1 deletion build/nss/patches/nspr-include.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1819024
diff -wpruN --no-dereference '--exclude=*.orig' a~/coreconf/config.gypi a/coreconf/config.gypi
--- a~/coreconf/config.gypi 1970-01-01 00:00:00
+++ a/coreconf/config.gypi 1970-01-01 00:00:00
@@ -155,7 +155,6 @@
@@ -156,7 +156,6 @@
},
'standalone_static_library': 0,
'include_dirs': [
Expand Down
Loading

0 comments on commit 087bc30

Please sign in to comment.