Skip to content

Commit 48a37d1

Browse files
hadflhadfl
authored
Merge pull request #3820 from citrus-it/pkgupd
Core package updates
2 parents cf14c51 + 1d71a9d commit 48a37d1

18 files changed

+71
-94
lines changed

‎build/coreutils/build.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# }}}
1414

1515
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
16-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1717

1818
. ../../lib/build.sh
1919

2020
PROG=coreutils
21-
VER=9.5
21+
VER=9.6
2222
PKG=file/gnu-coreutils
2323
SUMMARY="coreutils - GNU core utilities"
2424
DESC="GNU core utilities"
@@ -69,7 +69,8 @@ function post_install {
6969
init
7070
download_source $PROG $PROG $VER
7171
patch_source
72-
run_autoreconf -fi
72+
run_aclocal --force -I m4
73+
run_autoconf
7374
prep_build
7475
build
7576
run_testsuite check

‎build/coreutils/patches/gcc14.patch

-19
This file was deleted.

‎build/coreutils/patches/pkglibdir.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -wpruN --no-dereference '--exclude=*.orig' a~/m4/configmake.m4 a/m4/configmake.m4
22
--- a~/m4/configmake.m4 1970-01-01 00:00:00
33
+++ a/m4/configmake.m4 1970-01-01 00:00:00
4-
@@ -29,7 +29,7 @@ AC_DEFUN([gl_CONFIGMAKE_PREP],
4+
@@ -31,7 +31,7 @@ AC_DEFUN([gl_CONFIGMAKE_PREP],
55
AC_SUBST([pkgdatadir], ['${datadir}/${PACKAGE}'])
66
AC_SUBST([pkgincludedir], ['${includedir}/${PACKAGE}'])
77
AC_SUBST([pkglibdir], ['${libdir}/${PACKAGE}'])

‎build/coreutils/patches/pthread.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -wpruN --no-dereference '--exclude=*.orig' a~/m4/threadlib.m4 a/m4/threadlib.m4
22
--- a~/m4/threadlib.m4 1970-01-01 00:00:00
33
+++ a/m4/threadlib.m4 1970-01-01 00:00:00
4-
@@ -242,6 +242,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
4+
@@ -244,6 +244,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
55
[gl_pthread_in_glibc=yes],
66
[])
77
;;

‎build/coreutils/patches/series

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ who.c.patch
77
tests_df_no-mtab-status.sh.patch
88
set-permission.c.patch
99
stdbuf.c.patch
10-
gcc14.patch

‎build/coreutils/patches/tests_df_no-mtab-status.sh.patch

+14-34
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,22 @@
11
diff -wpruN --no-dereference '--exclude=*.orig' a~/tests/df/no-mtab-status.sh a/tests/df/no-mtab-status.sh
22
--- a~/tests/df/no-mtab-status.sh 1970-01-01 00:00:00
33
+++ a/tests/df/no-mtab-status.sh 1970-01-01 00:00:00
4-
@@ -35,9 +35,13 @@ cat > k.c <<EOF || framework_failure_
4+
@@ -24,9 +24,6 @@ require_gcc_shared_
5+
# Protect against inaccessible remote mounts etc.
6+
timeout 10 df || skip_ "df fails"
7+
8+
-grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \
9+
- || skip_ "getmntent is not used on this system"
10+
-
11+
# Simulate "mtab" failure.
12+
cat > k.c <<EOF || framework_failure_
513
#define _GNU_SOURCE
6-
#include <stdio.h>
14+
@@ -34,7 +31,7 @@ cat > k.c <<EOF || framework_failure_
15+
#include <stdlib.h>
716
#include <errno.h>
17+
#include <fcntl.h>
818
-#include <mntent.h>
19+
+#include <sys/mnttab.h>
920
#include <string.h>
21+
#include <stdarg.h>
1022
#include <dlfcn.h>
11-
+#ifdef __illumos__
12-
+#include <sys/mnttab.h>
13-
+#else
14-
+#include <mntent.h>
15-
+#endif
16-
17-
#define STREQ(a, b) (strcmp (a, b) == 0)
18-
19-
@@ -69,7 +73,11 @@ FILE* fopen(const char *path, const char
20-
return fopen_func(path, mode);
21-
}
22-
23-
+#ifdef __illumos__
24-
+int getmntent (FILE *fp, struct mnttab *mp)
25-
+#else
26-
struct mntent *getmntent (FILE *fp)
27-
+#end
28-
{
29-
/* Prove that LD_PRELOAD works. */
30-
static int done = 0;
31-
@@ -80,7 +88,11 @@ struct mntent *getmntent (FILE *fp)
32-
}
33-
/* Now simulate the failure. */
34-
errno = ENOENT;
35-
+#ifdef __illumos__
36-
+ return -1;
37-
+#else
38-
return NULL;
39-
+#endif
40-
}
41-
EOF
42-

‎build/coreutils/testsuite.log

+25-9
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ PASS: tests/ptx/ptx-overrun.sh
100100
PASS: tests/misc/xstrtol.pl
101101
PASS: tests/tail/overlay-headers.sh
102102
PASS: tests/tail/pid.sh
103+
PASS: tests/tail/pid-pipe.sh
103104
PASS: tests/od/od.pl
104105
PASS: tests/od/od-endian.sh
105106
PASS: tests/od/od-float.sh
@@ -186,6 +187,7 @@ PASS: tests/misc/printenv.sh
186187
PASS: tests/printf/printf.sh
187188
PASS: tests/printf/printf-cov.pl
188189
PASS: tests/printf/printf-hex.sh
190+
PASS: tests/printf/printf-indexed.sh
189191
PASS: tests/printf/printf-mb.sh
190192
PASS: tests/printf/printf-surprise.sh
191193
PASS: tests/printf/printf-quote.sh
@@ -470,7 +472,6 @@ PASS: tests/ls/m-option.sh
470472
PASS: tests/ls/w-option.sh
471473
PASS: tests/ls/multihardlink.sh
472474
PASS: tests/ls/no-arg.sh
473-
SKIP: tests/ls/no-cap.sh
474475
PASS: tests/ls/selinux-segfault.sh
475476
PASS: tests/ls/quote-align.sh
476477
PASS: tests/ls/size-align.sh
@@ -479,6 +480,7 @@ PASS: tests/ls/recursive.sh
479480
SKIP: tests/ls/removed-directory.sh
480481
PASS: tests/ls/root-rel-symlink-color.sh
481482
PASS: tests/ls/rt-1.sh
483+
SKIP: tests/ls/selinux.sh
482484
SKIP: tests/ls/slink-acl.sh
483485
SKIP: tests/ls/stat-dtype.sh
484486
PASS: tests/ls/stat-failed.sh
@@ -596,6 +598,7 @@ SKIP: tests/du/bind-mount-dir-cycle-v2.sh
596598
SKIP: tests/id/setgid.sh
597599
SKIP: tests/install/install-C-root.sh
598600
SKIP: tests/ls/capability.sh
601+
SKIP: tests/ls/no-cap.sh
599602
SKIP: tests/ls/nameless-uid.sh
600603
SKIP: tests/chcon/chcon.sh
601604
SKIP: tests/chroot/chroot-credentials.sh
@@ -651,13 +654,22 @@ SKIP: tests/factor/t33.sh
651654
SKIP: tests/factor/t34.sh
652655
SKIP: tests/factor/t35.sh
653656
SKIP: tests/factor/t36.sh
654-
# TOTAL: 653
655-
# PASS: 500
656-
# SKIP: 152
657+
SKIP: tests/factor/t37.sh
658+
# TOTAL: 657
659+
# PASS: 502
660+
# SKIP: 154
657661
# XFAIL: 0
658662
# FAIL: 1
659663
# XPASS: 0
660664
# ERROR: 0
665+
NAME="OmniOS"
666+
PRETTY_NAME="OmniOS Community Edition v11 r151053"
667+
CPE_NAME="cpe:/o:omniosce:omnios:11:151053:0"
668+
ID=omnios
669+
VERSION=r151053
670+
VERSION_ID=r151053
671+
BUILD_ID=151053.0.2025.01.12
672+
HOME_URL="https://omnios.org/"
661673
SKIP: tests/tail/inotify-race
662674
SKIP tests/tail/inotify-race.sh (exit status: 77)
663675
SKIP: tests/tail/inotify-race2
@@ -825,10 +837,10 @@ SKIP: tests/install/install-Z-selinux
825837
SKIP tests/install/install-Z-selinux.sh (exit status: 77)
826838
SKIP: tests/ls/acl
827839
SKIP tests/ls/acl.sh (exit status: 77)
828-
SKIP: tests/ls/no-cap
829-
SKIP tests/ls/no-cap.sh (exit status: 77)
830840
SKIP: tests/ls/removed-directory
831841
SKIP tests/ls/removed-directory.sh (exit status: 77)
842+
SKIP: tests/ls/selinux
843+
SKIP tests/ls/selinux.sh (exit status: 77)
832844
SKIP: tests/ls/slink-acl
833845
SKIP tests/ls/slink-acl.sh (exit status: 77)
834846
SKIP: tests/ls/stat-dtype
@@ -889,6 +901,8 @@ SKIP: tests/install/install-C-root
889901
SKIP tests/install/install-C-root.sh (exit status: 77)
890902
SKIP: tests/ls/capability
891903
SKIP tests/ls/capability.sh (exit status: 77)
904+
SKIP: tests/ls/no-cap
905+
SKIP tests/ls/no-cap.sh (exit status: 77)
892906
SKIP: tests/ls/nameless-uid
893907
SKIP tests/ls/nameless-uid.sh (exit status: 77)
894908
SKIP: tests/chcon/chcon
@@ -999,9 +1013,11 @@ SKIP: tests/factor/t35
9991013
SKIP tests/factor/t35.sh (exit status: 77)
10001014
SKIP: tests/factor/t36
10011015
SKIP tests/factor/t36.sh (exit status: 77)
1002-
# TOTAL: 653
1003-
# PASS: 500
1004-
# SKIP: 152
1016+
SKIP: tests/factor/t37
1017+
SKIP tests/factor/t37.sh (exit status: 77)
1018+
# TOTAL: 657
1019+
# PASS: 502
1020+
# SKIP: 154
10051021
# XFAIL: 0
10061022
# FAIL: 1
10071023
# XPASS: 0

‎build/lzip/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414
#
15-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1616
#
1717
. ../../lib/build.sh
1818

1919
PROG=lzip
20-
VER=1.24.1
20+
VER=1.25
2121
PKG=compress/lzip
2222
SUMMARY="Lzip"
2323
DESC="Lossless data compressor"

‎build/lzip/testsuite.log

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
testing lzip-1.24.1...
1+
testing lzip-1.25...
22
testing decompression...
33
testing compression...
44
testing bad input...

‎build/lzlib/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414

15-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1616

1717
. ../../lib/build.sh
1818

1919
PROG=lzlib
2020
PKG=library/lzlib
21-
VER=1.14
21+
VER=1.15
2222
SUMMARY="Data compression library"
2323
DESC="$SUMMARY providing in-memory LZMA (de-)compression functions"
2424

‎build/lzlib/patches/ld-soname.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile.in a/Makefile.in
22
--- a~/Makefile.in 1970-01-01 00:00:00
33
+++ a/Makefile.in 1970-01-01 00:00:00
4-
@@ -26,7 +26,7 @@ lib$(libname).a : lzlib.o
4+
@@ -29,7 +29,7 @@ lib$(libname).a : lzlib.o
55
$(AR) $(ARFLAGS) $@ $<
66

7-
lib$(libname).so.$(pkgversion) : lzlib_sh.o
8-
- $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $<
9-
+ $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,-h,lib$(libname).so.$(soversion) -o $@ $<
7+
lib$(libname).so.$(soversion) : lzlib_sh.o
8+
- $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,--soname=$@ -o $@ $< || \
9+
+ $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,-h,$@ -o $@ $< || \
10+
$(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -o $@ $<
1011

11-
$(progname) : $(objs) lib$(libname).a
12-
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).a
12+
bin : $(progname_static) $(progname_shared)

‎build/lzlib/testsuite.log

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
testing lzlib-1.14...
1+
testing lzlib-1.15...
22
testing decompression...
33
testing compression...
44
testing bad input...

‎build/mercurial/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# }}}
1414
#
1515
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
16-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1717

1818
. ../../lib/build.sh
1919

2020
PROG=mercurial
21-
VER=6.9
21+
VER=6.9.1
2222
PKG=developer/versioning/mercurial
2323
SUMMARY="Mercurial source control management"
2424
DESC="Free, distributed source control management tool"

‎build/pv/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
. ../../lib/build.sh
2828

2929
PROG=pv
30-
VER=1.9.25
30+
VER=1.9.27
3131
PKG=shell/pipe-viewer
3232
SUMMARY="Pipe Viewer"
3333
DESC="pv - a terminal-based tool for monitoring the progress of data through a pipeline."

‎build/sqlite3/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
. ../../lib/build.sh
1919

2020
PROG=sqlite-autoconf
21-
VER=3470200
21+
VER=3480000
2222
PKG=database/sqlite-3
2323
SUMMARY="SQL database engine library"
2424
DESC="SQLite is a self-contained, high-reliability, embedded, full-featured, "

‎build/xz/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414

15-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1616

1717
. ../../lib/build.sh
1818

1919
PROG=xz
20-
VER=5.6.3
20+
VER=5.6.4
2121
PKG=compress/xz
2222
SUMMARY="XZ Utils - general-purpose data compression software"
2323
DESC="Free general-purpose data compression software with a "

‎build/xz/testsuite.log

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ PASS: test_compress_generated_text
2727
PASS: test_microlzma
2828
PASS: test_scripts.sh
2929
============================================================================
30-
Testsuite summary for XZ Utils 5.6.3
30+
Testsuite summary for XZ Utils 5.6.4
3131
============================================================================
3232
# TOTAL: 19
3333
# PASS: 19

‎doc/packages.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
| compress/bzip2 | 1.0.8 | https://sourceware.org/pub/bzip2/
77
| compress/gzip | 1.13 | http://git.savannah.gnu.org/cgit/gzip.git/refs/tags
88
| compress/lz4 | 1.10.0 | https://github.com/lz4/lz4/releases
9-
| compress/lzip | 1.24.1 | https://download.savannah.gnu.org/releases/lzip/
9+
| compress/lzip | 1.25 | https://download.savannah.gnu.org/releases/lzip/
1010
| compress/unzip | 6.0 | https://sourceforge.net/projects/infozip/files/UnZip%206.x%20%28latest%29/ https://www.cvedetails.com/vulnerability-list/vendor_id-816/product_id-1395/Info-zip-Unzip.html
11-
| compress/xz | 5.6.3 | https://tukaani.org/xz/
11+
| compress/xz | 5.6.4 | https://tukaani.org/xz/
1212
| compress/zip | 3.0 | https://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/ http://www.info-zip.org/Zip.html
1313
| compress/zstd | 1.5.6 | https://github.com/facebook/zstd/releases
1414
| data/iso-codes | 4.17.0 | https://salsa.debian.org/api/v4/projects/iso-codes-team%2Fiso-codes/repository/tags https://salsa.debian.org/iso-codes-team/iso-codes/tags
15-
| database/sqlite-3 | 3470200 | https://www.sqlite.org/download.html
15+
| database/sqlite-3 | 3480000 | https://www.sqlite.org/download.html
1616
| developer/build/autoconf | 2.72 | https://ftp.gnu.org/gnu/autoconf/
1717
| developer/build/automake | 1.17 | https://ftp.gnu.org/gnu/automake/
1818
| developer/build/gnu-make | 4.4.1 | https://ftp.gnu.org/gnu/make/
@@ -27,11 +27,11 @@
2727
| developer/parser/bison | 3.8.2 | https://ftp.gnu.org/gnu/bison/
2828
| developer/pkg-config | 0.29.2 | https://pkg-config.freedesktop.org/releases
2929
| developer/versioning/git | 2.48.1 | https://www.kernel.org/pub/software/scm/git https://git-scm.com/
30-
| developer/versioning/mercurial | 6.9 | https://www.mercurial-scm.org/release/?M=D https://www.mercurial-scm.org/wiki/WhatsNew
30+
| developer/versioning/mercurial | 6.9.1 | https://www.mercurial-scm.org/release/?M=D https://www.mercurial-scm.org/wiki/WhatsNew
3131
| developer/versioning/sccs | 5.09 | https://sourceforge.net/projects/sccs/files/
3232
| driver/tuntap | 1.3.3 | https://github.com/kaizawa/tuntap/tags
3333
| editor/vim | 9.1 | https://www.vim.org/download.php https://github.com/vim/vim
34-
| file/gnu-coreutils | 9.5 | https://ftp.gnu.org/gnu/coreutils/
34+
| file/gnu-coreutils | 9.6 | https://ftp.gnu.org/gnu/coreutils/
3535
| file/gnu-findutils | 4.10.0 | https://ftp.gnu.org/pub/gnu/findutils/
3636
| library/c++/sigcpp | 3.6.0 | https://download.gnome.org/sources/libsigc++/cache.json https://github.com/libsigcplusplus/libsigcplusplus/blob/master/NEWS
3737
| library/expat | 2.6.4 | https://github.com/libexpat/libexpat/releases
@@ -49,7 +49,7 @@
4949
| library/libuv | 1.49.2 | https://github.com/libuv/libuv/releases | Currently used solely by bind
5050
| library/libxml2 | 2.13.5 | https://github.com/GNOME/libxml2/tags http://xmlsoft.org/news.html
5151
| library/libxslt | 1.1.42 | https://gitlab.gnome.org/api/v4/projects/GNOME%2Flibxslt/releases https://gitlab.gnome.org/GNOME/libxslt/-/releases
52-
| library/lzlib | 1.14 | https://download.savannah.gnu.org/releases/lzip/lzlib/
52+
| library/lzlib | 1.15 | https://download.savannah.gnu.org/releases/lzip/lzlib/
5353
| library/nettle | 3.10.1 | https://ftp.gnu.org/gnu/nettle/ https://www.lysator.liu.se/~nisse/nettle/ | Used solely by chrony
5454
| library/ncurses | 6.5 | https://ftp.gnu.org/gnu/ncurses/
5555
| library/nghttp2 | 1.64.0 | https://github.com/nghttp2/nghttp2/releases
@@ -89,7 +89,7 @@
8989
| shell/bash | 5.2.37 | https://ftp.gnu.org/gnu/bash/
9090
| shell/bash5-patchlvl | 037 | https://ftp.gnu.org/gnu/bash/bash-5.2-patches
9191
| shell/bash5-completions | 2.14.0 | https://github.com/scop/bash-completion/releases
92-
| shell/pipe-viewer | 1.9.25 | http://www.ivarch.com/programs/pv.shtml
92+
| shell/pipe-viewer | 1.9.27 | http://www.ivarch.com/programs/pv.shtml
9393
| shell/tcsh | 6.24.14 | https://github.com/tcsh-org/tcsh/tags
9494
| shell/zsh | 5.9 | https://sourceforge.net/projects/zsh/files/zsh
9595
| system/cpuid | 1.8.2 | https://github.com/tycho/cpuid/tags

0 commit comments

Comments
 (0)