Skip to content

Commit cb855a2

Browse files
authored
Merge pull request #4078 from citrus-it/pkgupd
Core package updates
2 parents a84fbc5 + c98b9eb commit cb855a2

File tree

26 files changed

+261
-162
lines changed

26 files changed

+261
-162
lines changed

build/7zip/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414
#
15-
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2026 OmniOS Community Edition (OmniOSce) Association.
1616

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

1919
PROG=7zip
20-
VER=25.01
20+
VER=26.00
2121
PKG=compress/7zip
2222
SUMMARY="The 7-Zip compression and archiving utility"
2323
DESC="7-Zip is a file archiver with a high compression ratio"

build/bind/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PKG=network/dns/bind
2323
SUMMARY="BIND DNS tools"
2424
DESC="Client utilities for DNS lookups"
2525

26-
LIBUVVER=1.51.0
26+
LIBUVVER=1.52.0
2727
XFORM_ARGS+=" -DLIBUV=$LIBUVVER"
2828

2929
# This package ships private shared libraries in $PREFIX/lib/dns that are only

build/binutils/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
# }}}
1414
#
1515
# Copyright 2011-2012 OmniTI Computer Consulting, Inc. All rights reserved.
16-
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2026 OmniOS Community Edition (OmniOSce) Association.
1717

1818
. ../../lib/arch.sh
1919
. ../../lib/build.sh
2020

2121
PROG=binutils
22-
VER=2.45.1
22+
VER=2.46.0
2323
PKG=developer/gnu-binutils
2424
SUMMARY="GNU binary utilities"
2525
DESC="A set of programming tools for creating and managing binary programs, "

build/binutils/patches/bfd.patch

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
In binutils 2.46
2+
https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=7d0f24dfbdafc52d54316d3bfd688cbf8f8ae037;hp=2271dee682787051c0628c869d7cdb220bdd0e67
3+
4+
included, for Solaris:
5+
6+
> * On x86, the PE and PEI target vectors have been removed: they were only
7+
> supported in binutils proper. Their only use would be on EFI files
8+
> e.g. in GRUB, which doesn't justify their inclusion.
9+
10+
We need PEI support for building UEFI objects. See
11+
https://illumos.topicbox.com/groups/developer/T5f37e8c8f0687062-Mcec43129fb017b70a035e5fd/heads-up-build-changes-required-for-uefi
12+
13+
diff -wpruN --no-dereference '--exclude=*.orig' a~/bfd/config.bfd a/bfd/config.bfd
14+
--- a~/bfd/config.bfd 1970-01-01 00:00:00
15+
+++ a/bfd/config.bfd 1970-01-01 00:00:00
16+
@@ -596,8 +596,8 @@ case "${targ}" in
17+
;;
18+
i[3-7]86-*-solaris2*)
19+
targ_defvec=i386_elf32_sol2_vec
20+
- targ_selvecs=i386_elf32_vec
21+
- targ64_selvecs="x86_64_elf64_sol2_vec x86_64_elf64_vec"
22+
+ targ_selvecs="i386_elf32_vec i386_pei_vec"
23+
+ targ64_selvecs="x86_64_elf64_sol2_vec x86_64_elf64_vec x86_64_pe_vec x86_64_pei_vec"
24+
# Include 64-bit support to match GCC.
25+
want64=true
26+
;;
27+
@@ -729,7 +729,7 @@ case "${targ}" in
28+
;;
29+
x86_64-*-solaris2*)
30+
targ_defvec=x86_64_elf64_sol2_vec
31+
- targ_selvecs="i386_elf32_sol2_vec x86_64_elf64_vec i386_elf32_vec"
32+
+ targ_selvecs="i386_elf32_sol2_vec x86_64_elf64_vec i386_elf32_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec"
33+
want64=true
34+
;;
35+
x86_64-*-gnu*)

build/binutils/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
stdio-limit.diff
2+
bfd.patch

build/coreutils/build.sh

Lines changed: 2 additions & 2 deletions
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 2025 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2026 OmniOS Community Edition (OmniOSce) Association.
1717

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

2020
PROG=coreutils
21-
VER=9.9
21+
VER=9.10
2222
PKG=file/gnu-coreutils
2323
SUMMARY="coreutils - GNU core utilities"
2424
DESC="GNU core utilities"

build/coreutils/patches/install.c.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -wpruN --no-dereference '--exclude=*.orig' a~/src/install.c a/src/install.c
22
--- a~/src/install.c 1970-01-01 00:00:00
33
+++ a/src/install.c 1970-01-01 00:00:00
4-
@@ -606,8 +606,8 @@ Usage: %s [OPTION]... [-T] SOURCE DEST\n
4+
@@ -599,8 +599,8 @@ Usage: %s [OPTION]... [-T] SOURCE DEST\n
55
\n\
66
This install program copies files (often just compiled) into destination\n\
77
locations you choose. If you want to download and install a ready-to-use\n\

build/coreutils/patches/set-permission.c.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@ GNU Coreutils bug 21062 coreutils-8.24 - cp(1) check failures on tmpfs filesyste
55
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/set-permissions.c a/lib/set-permissions.c
66
--- a~/lib/set-permissions.c 1970-01-01 00:00:00
77
+++ a/lib/set-permissions.c 1970-01-01 00:00:00
8-
@@ -227,6 +227,7 @@ set_acls_from_mode (const char *name, in
8+
@@ -226,6 +226,7 @@ set_acls_from_mode (const char *name, in
99
{
1010
if (errno == ENOSYS)
1111
{
1212
+ errno = 0;
1313
*must_chmod = true;
1414
return 0;
1515
}
16-
@@ -261,6 +262,7 @@ set_acls_from_mode (const char *name, in
16+
@@ -260,6 +261,7 @@ set_acls_from_mode (const char *name, in
1717
{
1818
if (errno == ENOSYS || errno == EOPNOTSUPP)
1919
{
2020
+ errno = 0;
2121
*must_chmod = true;
2222
return 0;
2323
}
24-
@@ -631,6 +633,7 @@ set_acls (struct permission_context *ctx
24+
@@ -623,6 +625,7 @@ set_acls (struct permission_context *ctx
2525
if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
2626
&& acl_nontrivial (ctx->count, ctx->entries) == 0)
2727
ret = 0;
2828
+ errno = 0;
2929
}
3030
else
3131
*acls_set = true;
32-
@@ -648,6 +651,7 @@ set_acls (struct permission_context *ctx
32+
@@ -640,6 +643,7 @@ set_acls (struct permission_context *ctx
3333
if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
3434
&& acl_ace_nontrivial (ctx->ace_count, ctx->ace_entries) == 0)
3535
ret = 0;

build/coreutils/patches/stdbuf.c.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ turned it into a comment explaining why it's not included by default.
1313
diff -wpruN --no-dereference '--exclude=*.orig' a~/src/stdbuf.c a/src/stdbuf.c
1414
--- a~/src/stdbuf.c 1970-01-01 00:00:00
1515
+++ a/src/stdbuf.c 1970-01-01 00:00:00
16-
@@ -219,7 +219,7 @@ set_LD_PRELOAD (void)
16+
@@ -222,7 +222,7 @@ set_LD_PRELOAD (void)
1717
system (and that of stdbuf itself). */
1818
char const *const search_path[] = {
1919
program_path,
2020
- PKGLIBEXECDIR,
2121
+ "", /* System default */
22-
nullptr
22+
NULL
2323
};
2424

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/tests/df/no-mtab-status.sh a/
99
- || skip_ "getmntent is not used on this system"
1010
-
1111
# Simulate "mtab" failure.
12-
# Replace gnulib streq and C23 nullptr as that are not available here.
13-
sed 's/streq/0==str''cmp/; s/nullptr/NU''LL/' > k.c <<EOF || framework_failure_
14-
@@ -35,7 +32,7 @@ sed 's/streq/0==str''cmp/; s/nullptr/NU'
12+
# Replace gnulib streq as that is not available here.
13+
sed 's/streq/0==str''cmp/' > k.c <<EOF || framework_failure_
14+
@@ -35,7 +32,7 @@ sed 's/streq/0==str''cmp/' > k.c <<EOF |
1515
#include <stdlib.h>
1616
#include <errno.h>
1717
#include <fcntl.h>

0 commit comments

Comments
 (0)