Skip to content

Commit 49cdc82

Browse files
hadflhadfl
authored
Merge pull request #3447 from citrus-it/pkg
Core package updates
2 parents 03c8599 + 669e7f9 commit 49cdc82

File tree

14 files changed

+321
-16
lines changed

14 files changed

+321
-16
lines changed

‎build/bash/build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
PROG=bash
3030
VER=5.2.21
31+
PATCHLVL=26
3132
PKG=shell/bash
3233
SUMMARY="GNU Bash"
3334
DESC="GNU Bourne-Again shell (bash)"
@@ -152,7 +153,7 @@ CONFIGURE_OPTS[amd64]+=" --enable-separate-helpfiles"
152153
download_source $PROG $PROG $VER
153154
patch_source
154155
build
155-
make_package
156+
VER="${VER%.*}.$PATCHLVL" make_package
156157
clean_up
157158

158159
# Vim hints

‎build/bash/patches/bash-5.2-patches/bash52-022

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 5.2
5+
Patch-ID: bash52-022
6+
7+
Bug-Reported-by: srobertson@peratonlabs.com
8+
Bug-Reference-ID:
9+
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00049.html
10+
11+
Bug-Description:
12+
13+
It's possible for readline to try to zero out a line that's not null-
14+
terminated, leading to a memory fault.
15+
16+
Patch (apply with `patch -p0'):
17+
18+
*** ../bash-5.2-patched/lib/readline/display.c 2022-04-05 10:47:31.000000000 -0400
19+
--- lib/readline/display.c 2022-12-13 13:11:22.000000000 -0500
20+
***************
21+
*** 2684,2692 ****
22+
23+
if (visible_line)
24+
! {
25+
! temp = visible_line;
26+
! while (*temp)
27+
! *temp++ = '\0';
28+
! }
29+
rl_on_new_line ();
30+
forced_display++;
31+
--- 2735,2740 ----
32+
33+
if (visible_line)
34+
! memset (visible_line, 0, line_size);
35+
!
36+
rl_on_new_line ();
37+
forced_display++;
38+
39+
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
40+
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
41+
***************
42+
*** 26,30 ****
43+
looks for to find the patch level (for the sccs version string). */
44+
45+
! #define PATCHLEVEL 21
46+
47+
#endif /* _PATCHLEVEL_H_ */
48+
--- 26,30 ----
49+
looks for to find the patch level (for the sccs version string). */
50+
51+
! #define PATCHLEVEL 22
52+
53+
#endif /* _PATCHLEVEL_H_ */

‎build/bash/patches/bash-5.2-patches/bash52-023

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 5.2
5+
Patch-ID: bash52-023
6+
7+
Bug-Reported-by: Emanuele Torre <torreemanuele6@gmail.com>
8+
Bug-Reference-ID: <20230206140824.1710288-1-torreemanuele6@gmail.com>
9+
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00045.html
10+
11+
Bug-Description:
12+
13+
Running `local -' multiple times in a shell function would overwrite the
14+
original saved set of options.
15+
16+
Patch (apply with `patch -p0'):
17+
18+
*** ../bash-5.2-patched/builtins/declare.def 2023-01-04 20:40:28.000000000 -0500
19+
--- builtins/declare.def 2023-02-08 15:36:49.000000000 -0500
20+
***************
21+
*** 421,429 ****
22+
if (local_var && variable_context && STREQ (name, "-"))
23+
{
24+
var = make_local_variable ("-", 0);
25+
! FREE (value_cell (var)); /* just in case */
26+
! value = get_current_options ();
27+
! var_setvalue (var, value);
28+
! VSETATTR (var, att_invisible);
29+
NEXT_VARIABLE ();
30+
}
31+
--- 421,437 ----
32+
if (local_var && variable_context && STREQ (name, "-"))
33+
{
34+
+ int o;
35+
+
36+
+ o = localvar_inherit;
37+
+ localvar_inherit = 0;
38+
var = make_local_variable ("-", 0);
39+
! localvar_inherit = o;
40+
!
41+
! if (value_cell (var) == NULL) /* no duplicate instances */
42+
! {
43+
! value = get_current_options ();
44+
! var_setvalue (var, value);
45+
! VSETATTR (var, att_invisible);
46+
! }
47+
NEXT_VARIABLE ();
48+
}
49+
50+
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
51+
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
52+
***************
53+
*** 26,30 ****
54+
looks for to find the patch level (for the sccs version string). */
55+
56+
! #define PATCHLEVEL 22
57+
58+
#endif /* _PATCHLEVEL_H_ */
59+
--- 26,30 ----
60+
looks for to find the patch level (for the sccs version string). */
61+
62+
! #define PATCHLEVEL 23
63+
64+
#endif /* _PATCHLEVEL_H_ */

‎build/bash/patches/bash-5.2-patches/bash52-024

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 5.2
5+
Patch-ID: bash52-024
6+
7+
Bug-Reported-by: Marco <maroloccio@gmail.com>
8+
Bug-Reference-ID: <eaf9af76-c4ed-8b61-c517-22ed980529d3@gmail.com>
9+
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00044.html
10+
11+
Bug-Description:
12+
13+
Fix bug where associative array compound assignment would not expand tildes
14+
in values.
15+
16+
Patch (apply with `patch -p0'):
17+
18+
*** ../bash-20230105/arrayfunc.c Thu Jan 5 14:23:28 2023
19+
--- arrayfunc.c Wed Feb 8 16:27:48 2023
20+
***************
21+
*** 651,655 ****
22+
}
23+
24+
! aval = expand_subscript_string (v, 0);
25+
if (aval == 0)
26+
{
27+
--- 651,655 ----
28+
}
29+
30+
! aval = expand_assignment_string_to_string (v, 0);
31+
if (aval == 0)
32+
{
33+
***************
34+
*** 843,847 ****
35+
if (assoc_p (var))
36+
{
37+
! val = expand_subscript_string (val, 0);
38+
if (val == 0)
39+
{
40+
--- 843,847 ----
41+
if (assoc_p (var))
42+
{
43+
! val = expand_assignment_string_to_string (val, 0);
44+
if (val == 0)
45+
{
46+
***************
47+
*** 1031,1035 ****
48+
nword[i++] = w[ind++];
49+
50+
! t = expand_subscript_string (w+ind, 0);
51+
s = (t && strchr (t, CTLESC)) ? quote_escapes (t) : t;
52+
value = sh_single_quote (s ? s : "");
53+
--- 1031,1035 ----
54+
nword[i++] = w[ind++];
55+
56+
! t = expand_assignment_string_to_string (w+ind, 0);
57+
s = (t && strchr (t, CTLESC)) ? quote_escapes (t) : t;
58+
value = sh_single_quote (s ? s : "");
59+
*** ../bash-20230201/subst.c Mon Jan 30 16:19:46 2023
60+
--- subst.c Mon Feb 6 16:25:22 2023
61+
***************
62+
*** 10803,10807 ****
63+
--- 10803,10811 ----
64+
ret = (char *)NULL;
65+
66+
+ #if 0
67+
td.flags = W_NOPROCSUB|W_NOTILDE|W_NOSPLIT2; /* XXX - W_NOCOMSUB? */
68+
+ #else
69+
+ td.flags = W_NOPROCSUB|W_NOSPLIT2; /* XXX - W_NOCOMSUB? */
70+
+ #endif
71+
td.word = savestring (string); /* in case it's freed on error */
72+
73+
74+
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
75+
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
76+
***************
77+
*** 26,30 ****
78+
looks for to find the patch level (for the sccs version string). */
79+
80+
! #define PATCHLEVEL 23
81+
82+
#endif /* _PATCHLEVEL_H_ */
83+
--- 26,30 ----
84+
looks for to find the patch level (for the sccs version string). */
85+
86+
! #define PATCHLEVEL 24
87+
88+
#endif /* _PATCHLEVEL_H_ */

‎build/bash/patches/bash-5.2-patches/bash52-025

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 5.2
5+
Patch-ID: bash52-025
6+
7+
Bug-Reported-by: Andrew Neff <andrew.neff@visionsystemsinc.com>
8+
Bug-Reference-ID: <SA1P110MB1357F68AFD51BB225019EFF48D2B9@SA1P110MB1357.NAMP110.PROD.OUTLOOK.COM>
9+
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00100.html
10+
11+
Bug-Description:
12+
13+
Make sure a subshell checks for and handles any terminating signals before
14+
exiting (which might have arrived after the command completed) so the parent
15+
and any EXIT trap will see the correct value for $?.
16+
17+
Patch (apply with `patch -p0'):
18+
19+
*** ../bash-5.2.9/execute_cmd.c 2022-11-02 10:36:54.000000000 -0400
20+
--- execute_cmd.c 2022-10-27 16:52:55.000000000 -0400
21+
***************
22+
*** 1726,1729 ****
23+
--- 1726,1732 ----
24+
: EXECUTION_SUCCESS;
25+
26+
+ /* Check for terminating signals before we return to our caller, which we
27+
+ expect to exit immediately anyway. */
28+
+ CHECK_TERMSIG;
29+
30+
/* If we were explicitly placed in a subshell with (), we need
31+
32+
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
33+
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
34+
***************
35+
*** 26,30 ****
36+
looks for to find the patch level (for the sccs version string). */
37+
38+
! #define PATCHLEVEL 24
39+
40+
#endif /* _PATCHLEVEL_H_ */
41+
--- 26,30 ----
42+
looks for to find the patch level (for the sccs version string). */
43+
44+
! #define PATCHLEVEL 25
45+
46+
#endif /* _PATCHLEVEL_H_ */

‎build/bash/patches/bash-5.2-patches/bash52-026

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 5.2
5+
Patch-ID: bash52-026
6+
7+
Bug-Reported-by: Stefan Klinger <readline-gnu.org@stefan-klinger.de>
8+
Bug-Reference-ID:
9+
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-08/msg00018.html
10+
11+
Bug-Description:
12+
13+
The custom color prefix that readline uses to color possible completions
14+
must have a leading `.'.
15+
16+
Patch (apply with `patch -p0'):
17+
18+
*** ../bash-5.2-patched/lib/readline/colors.c 2021-12-08 11:38:25.000000000 -0500
19+
--- lib/readline/colors.c 2023-08-28 16:40:04.000000000 -0400
20+
***************
21+
*** 74,78 ****
22+
static void restore_default_color (void);
23+
24+
! #define RL_COLOR_PREFIX_EXTENSION "readline-colored-completion-prefix"
25+
26+
COLOR_EXT_TYPE *_rl_color_ext_list = 0;
27+
--- 74,78 ----
28+
static void restore_default_color (void);
29+
30+
! #define RL_COLOR_PREFIX_EXTENSION ".readline-colored-completion-prefix"
31+
32+
COLOR_EXT_TYPE *_rl_color_ext_list = 0;
33+
34+
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
35+
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
36+
***************
37+
*** 26,30 ****
38+
looks for to find the patch level (for the sccs version string). */
39+
40+
! #define PATCHLEVEL 25
41+
42+
#endif /* _PATCHLEVEL_H_ */
43+
--- 26,30 ----
44+
looks for to find the patch level (for the sccs version string). */
45+
46+
! #define PATCHLEVEL 26
47+
48+
#endif /* _PATCHLEVEL_H_ */

‎build/bash/patches/fetch-patches

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ ! -f series -o ! -f ../build.sh ]; then
55
exit 1
66
fi
77

8-
VER=`grep '^VER=' ../build.sh | cut -d= -f2`
8+
VER=`grep '^VER=' ../build.sh | cut -d= -f2 | cut -d. -f1-2`
99

1010
rsync -avr --exclude=*.sig rsync://ftp.gnu.org/ftp/bash/bash-$VER-patches/ \
1111
./bash-$VER-patches/

‎build/bash/patches/series

+5
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
memalloc.patch
2+
bash-5.2-patches/bash52-022 -p0
3+
bash-5.2-patches/bash52-023 -p0
4+
bash-5.2-patches/bash52-024 -p0
5+
bash-5.2-patches/bash52-025 -p0
6+
bash-5.2-patches/bash52-026 -p0

‎build/iso-codes/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 2023 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1717

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

2020
PROG=iso-codes
21-
VER=4.15.0
21+
VER=4.16.0
2222
PKG=data/iso-codes
2323
SUMMARY="ISO code lists and translations"
2424
DESC="Lists of various ISO standards "

‎build/libidn/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# }}}
1414
#
1515
# Copyright 2016 OmniTI Computer Consulting, Inc. All rights reserved.
16-
# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1717
#
1818
. ../../lib/build.sh
1919

2020
PROG=libidn
21-
VER=1.41
21+
VER=1.42
2222
PKG=library/libidn
2323
SUMMARY="The Internationalized Domains Library"
2424
DESC="IDN - The Internationalized Domains Library"

‎build/libxml2/build.sh

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

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

2020
PROG=libxml2
21-
VER=2.12.3
21+
VER=2.12.4
2222
PKG=library/libxml2
2323
SUMMARY="XML C parser and toolkit"
2424
DESC="Portable XML parser and toolkit library"

‎build/libxml2/testsuite.log

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Total 3698 tests, no errors
1+
Total 3718 tests, no errors
22
Total 49 tests, no errors
33
Testing HTMLparser : 35 of 41 functions ...
44
Testing HTMLtree : 18 of 18 functions ...

0 commit comments

Comments
 (0)