Projects
Mega:24.09
bash
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
_service:tar_scm:bash.spec
Changed
@@ -1,6 +1,6 @@ Name: bash -Version: 5.2.15 -Release: 9 +Version: 5.2.21 +Release: 1 Summary: It is the Bourne Again Shell License: GPLv3 URL: https://www.gnu.org/software/bash @@ -33,7 +33,6 @@ Patch6006: backport-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch Patch6007: backport-renamed-several-functions-beginning-with-legal_-chan.patch Patch6008: backport-fix-for-cd-when-curent-directory-doesn-t-exist-fix-w.patch -Patch6009: Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch BuildRequires: gcc bison texinfo autoconf ncurses-devel # Required for bash tests @@ -162,6 +161,9 @@ %exclude %{_infodir}/dir %changelog +* Wed Jul 3 2024 dillon chen <dillon.chen@gmail.com> - 5.2.21-1 +- update to 5.2.21 + * Wed May 08 2024 xiaozai <xiaozai@kylinos.cn> -5.2.15-9 - fix for a crash if one of the expressions in an arithmetic for command expands to NULL
View file
_service:tar_scm:Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch
Deleted
@@ -1,26 +0,0 @@ -From 708cc7f694738c6dde2dbb5317749a5a9e6d26e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E8=82=96=E5=9C=A8?= <xiaozai@kylinos.cn> -Date: Wed, 8 May 2024 17:04:43 +0800 -Subject: PATCH fix for a crash if one of the expressions in an arithmetic - for command expands to NULL - ---- - execute_cmd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/execute_cmd.c b/execute_cmd.c -index ce221a2..46b671d 100644 ---- a/execute_cmd.c -+++ b/execute_cmd.c -@@ -3056,7 +3056,7 @@ eval_arith_for_expr (l, okp) - temp = expand_arith_string (expr, Q_DOUBLE_QUOTES|Q_ARITH); - if (l->next) - free (expr); -- new = make_word_list (make_word (temp), (WORD_LIST *)NULL); -+ new = make_word_list (make_word (temp ? temp : ""), (WORD_LIST *)NULL); - free (temp); - - if (new) --- -2.33.0 -
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="scm">git</param> <param name="url">git@gitee.com:src-openeuler/bash.git</param> - <param name="revision">master</param> + <param name="revision">openEuler-24.09</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
View file
_service:tar_scm:bash-5.2.15.tar.gz/builtins/evalfile.c -> _service:tar_scm:bash-5.2.21.tar.gz/builtins/evalfile.c
Changed
@@ -266,7 +266,7 @@ #endif /* set the flags to be passed to parse_and_execute */ - pflags = SEVAL_RESETLINE; + pflags = SEVAL_RESETLINE|SEVAL_NOOPTIMIZE; pflags |= (flags & FEVAL_HISTORY) ? 0 : SEVAL_NOHIST; if (flags & FEVAL_BUILTIN)
View file
_service:tar_scm:bash-5.2.15.tar.gz/execute_cmd.c -> _service:tar_scm:bash-5.2.21.tar.gz/execute_cmd.c
Changed
@@ -3050,7 +3050,7 @@ temp = expand_arith_string (expr, Q_DOUBLE_QUOTES|Q_ARITH); if (l->next) free (expr); - new = make_word_list (make_word (temp), (WORD_LIST *)NULL); + new = make_word_list (make_word (temp ? temp : ""), (WORD_LIST *)NULL); free (temp); if (new)
View file
_service:tar_scm:bash-5.2.15.tar.gz/jobs.c -> _service:tar_scm:bash-5.2.21.tar.gz/jobs.c
Changed
@@ -3077,9 +3077,13 @@ /* Don't modify terminal pgrp if we are running in background or a subshell. Make sure subst.c:command_substitute uses the same conditions to determine whether or not it should undo this and - give the terminal to pipeline_pgrp. */ - + give the terminal to pipeline_pgrp. We don't give the terminal + back to shell_pgrp if an async job in the background exits because + we never gave it to that job in the first place. An async job in + the foreground is one we started in the background and foregrounded + with `fg', and gave it the terminal. */ if ((flags & JWAIT_NOTERM) == 0 && running_in_background == 0 && + (job == NO_JOB || IS_ASYNC (job) == 0 || IS_FOREGROUND (job)) && (subshell_environment & (SUBSHELL_ASYNC|SUBSHELL_PIPE)) == 0) give_terminal_to (shell_pgrp, 0); } @@ -3623,6 +3627,7 @@ { get_tty_state (); save_stty = shell_tty_info; + jobsjob->flags &= ~J_ASYNC; /* no longer async */ /* Give the terminal to this job. */ if (IS_JOBCONTROL (job)) give_terminal_to (jobsjob->pgrp, 0);
View file
_service:tar_scm:bash-5.2.15.tar.gz/parse.y -> _service:tar_scm:bash-5.2.21.tar.gz/parse.y
Changed
@@ -452,6 +452,21 @@ YYABORT; } } + | error YYEOF + { + global_command = (COMMAND *)NULL; + if (last_command_exit_value == 0) + last_command_exit_value = EX_BADUSAGE; /* force error return */ + if (interactive && parse_and_execute_level == 0) + { + handle_eof_input_unit (); + YYACCEPT; + } + else + { + YYABORT; + } + } | yacc_EOF { /* Case of EOF seen by itself. Do ignoreeof or @@ -2897,9 +2912,9 @@ if (current_token < 0) #if defined (YYERRCODE) && !defined (YYUNDEF) - current_token = YYERRCODE; + current_token = EOF_Reached ? YYEOF : YYERRCODE; #else - current_token = YYerror; + current_token = EOF_Reached ? YYEOF : YYUNDEF; #endif return (current_token); @@ -3135,6 +3150,7 @@ case TIME: /* time time pipeline */ case TIMEOPT: /* time -p time pipeline */ case TIMEIGN: /* time -p -- ... */ + case DOLPAREN: return 1; default: return 0; @@ -3694,6 +3710,7 @@ free (ret); parser_error (start_lineno, _("unexpected EOF while looking for matching `%c'"), close); EOF_Reached = 1; /* XXX */ + parser_state |= PST_NOERROR; /* avoid redundant error message */ return (&matched_pair_error); } @@ -4156,6 +4173,7 @@ expand_aliases = ps.expand_aliases; /* yyparse() has already called yyerror() and reset_parser() */ + parser_state |= PST_NOERROR; return (&matched_pair_error); } else if (r != 0)
View file
_service:tar_scm:bash-5.2.15.tar.gz/patchlevel.h -> _service:tar_scm:bash-5.2.21.tar.gz/patchlevel.h
Changed
@@ -25,6 +25,6 @@ regexp `^#define *PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 15 +#define PATCHLEVEL 21 #endif /* _PATCHLEVEL_H_ */
View file
_service:tar_scm:bash-5.2.15.tar.gz/subst.c -> _service:tar_scm:bash-5.2.21.tar.gz/subst.c
Changed
@@ -1693,7 +1693,7 @@ t = extract_command_subst (string, &si, flags); CHECK_STRING_OVERRUN (i, si, slen, c); - tlen = si - i - 1; + tlen = si - i - 2; RESIZE_MALLOCED_BUFFER (result, result_index, tlen + 4, result_size, 64); resultresult_index++ = c; resultresult_index++ = LPAREN; @@ -1713,7 +1713,7 @@ t = extract_process_subst (string, (stringi == '<' ? "<(" : ">)"), &si, flags); CHECK_STRING_OVERRUN (i, si, slen, c); - tlen = si - i - 1; + tlen = si - i - 2; RESIZE_MALLOCED_BUFFER (result, result_index, tlen + 4, result_size, 64); resultresult_index++ = c; resultresult_index++ = LPAREN;
View file
_service:tar_scm:bash-5.2.15.tar.gz/y.tab.c -> _service:tar_scm:bash-5.2.21.tar.gz/y.tab.c
Changed
@@ -992,7 +992,7 @@ #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 121 +#define YYFINAL 122 /* YYLAST -- Last index in YYTABLE. */ #define YYLAST 740 @@ -1001,9 +1001,9 @@ /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 38 /* YYNRULES -- Number of rules. */ -#define YYNRULES 174 +#define YYNRULES 175 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 349 +#define YYNSTATES 350 /* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 305 @@ -1057,24 +1057,24 @@ /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline = { - 0, 395, 395, 406, 414, 423, 438, 455, 465, 467, - 471, 477, 483, 489, 495, 501, 507, 513, 519, 525, - 531, 537, 543, 549, 555, 561, 568, 575, 582, 589, - 596, 603, 609, 615, 621, 627, 633, 639, 645, 651, - 657, 663, 669, 675, 681, 687, 693, 699, 705, 711, - 717, 723, 729, 735, 743, 745, 747, 751, 755, 766, - 768, 772, 774, 776, 792, 794, 798, 800, 802, 804, - 806, 808, 810, 812, 814, 816, 818, 822, 827, 832, - 837, 842, 847, 852, 857, 864, 870, 876, 882, 890, - 895, 900, 905, 910, 915, 920, 925, 932, 937, 942, - 949, 951, 953, 955, 959, 961, 992, 999, 1003, 1009, - 1014, 1031, 1036, 1053, 1060, 1062, 1064, 1069, 1073, 1077, - 1081, 1083, 1085, 1089, 1090, 1094, 1096, 1098, 1100, 1104, - 1106, 1108, 1110, 1112, 1114, 1118, 1120, 1129, 1135, 1141, - 1142, 1149, 1153, 1155, 1157, 1164, 1166, 1173, 1177, 1178, - 1181, 1183, 1185, 1189, 1190, 1199, 1214, 1232, 1249, 1251, - 1253, 1260, 1263, 1267, 1269, 1275, 1281, 1301, 1324, 1326, - 1349, 1353, 1355, 1357, 1359 + 0, 395, 395, 406, 414, 423, 438, 455, 470, 480, + 482, 486, 492, 498, 504, 510, 516, 522, 528, 534, + 540, 546, 552, 558, 564, 570, 576, 583, 590, 597, + 604, 611, 618, 624, 630, 636, 642, 648, 654, 660, + 666, 672, 678, 684, 690, 696, 702, 708, 714, 720, + 726, 732, 738, 744, 750, 758, 760, 762, 766, 770, + 781, 783, 787, 789, 791, 807, 809, 813, 815, 817, + 819, 821, 823, 825, 827, 829, 831, 833, 837, 842, + 847, 852, 857, 862, 867, 872, 879, 885, 891, 897, + 905, 910, 915, 920, 925, 930, 935, 940, 947, 952, + 957, 964, 966, 968, 970, 974, 976, 1007, 1014, 1018, + 1024, 1029, 1046, 1051, 1068, 1075, 1077, 1079, 1084, 1088, + 1092, 1096, 1098, 1100, 1104, 1105, 1109, 1111, 1113, 1115, + 1119, 1121, 1123, 1125, 1127, 1129, 1133, 1135, 1144, 1150, + 1156, 1157, 1164, 1168, 1170, 1172, 1179, 1181, 1188, 1192, + 1193, 1196, 1198, 1200, 1204, 1205, 1214, 1229, 1247, 1264, + 1266, 1268, 1275, 1278, 1282, 1284, 1290, 1296, 1316, 1339, + 1341, 1364, 1368, 1370, 1372, 1374 }; #endif @@ -1119,7 +1119,7 @@ } #endif -#define YYPACT_NINF (-152) +#define YYPACT_NINF (-125) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) @@ -1133,41 +1133,41 @@ STATE-NUM. */ static const yytype_int16 yypact = { - 328, 80, -152, -11, -1, 3, -152, -152, 15, 637, - -5, 433, 149, -28, -152, 187, 684, -152, 18, 28, - 130, 38, 139, 50, 52, 60, 65, 74, -152, -152, - -152, 89, 104, -152, -152, 97, -152, -152, 246, -152, - 670, -152, -152, -152, -152, -152, -152, -152, -152, -152, - -152, -152, -152, 146, 211, -152, 1, 433, -152, -152, - 135, 484, -152, 59, 61, 90, 167, 171, 10, 71, - 246, 670, 144, -152, -152, -152, -152, -152, 165, -152, - 142, 179, 192, 140, 194, 160, 227, 245, 252, 253, - 260, 261, 262, 162, 269, 178, 270, 272, 273, 274, - 277, -152, -152, -152, -152, -152, -152, -152, -152, -152, - -152, -152, -152, -152, -152, 168, 379, -152, -152, 173, - 244, -152, -152, -152, -152, 670, -152, -152, -152, -152, - -152, 535, 535, -152, -152, -152, -152, -152, -152, -152, - 205, -152, 14, -152, 36, -152, -152, -152, -152, 84, - -152, -152, -152, 249, 670, -152, 670, 670, -152, -152, - -152, -152, -152, -152, -152, -152, -152, -152, -152, -152, - -152, -152, -152, -152, -152, -152, -152, -152, -152, -152, - -152, -152, -152, -152, -152, -152, -152, -152, -152, -152, - -152, -152, -152, -152, 484, 484, 203, 203, 586, 586, - 145, -152, -152, -152, -152, -152, -152, 0, -152, 119, - -152, 291, 248, 66, 88, -152, 119, -152, 296, 297, - 35, -152, 670, 670, 35, -152, -152, 1, 1, -152, - -152, -152, 306, 484, 484, 484, 484, 484, 305, 169, - -152, 7, -152, -152, 302, -152, 131, -152, 265, -152, - -152, -152, -152, -152, -152, 304, 131, -152, 266, -152, - -152, -152, 35, -152, 313, 317, -152, -152, -152, 225, - 225, 225, -152, -152, -152, -152, 206, 25, -152, -152, - 307, -42, 319, 276, -152, -152, -152, 95, -152, 322, - 283, 332, 284, -152, -152, 102, -152, -152, -152, -152, - -152, -152, -152, -152, 45, 323, -152, -152, -152, 106, - -152, -152, -152, -152, -152, -152, 109, -152, -152, 264, - -152, -152, -152, 484, -152, -152, 333, 293, -152, -152, - 338, 300, -152, -152, -152, 484, 345, 303, -152, -152, - 346, 309, -152, -152, -152, -152, -152, -152, -152 + 329, 27, -125, 8, 81, 10, -125, -125, 16, 38, + 0, 434, -5, -16, -125, 670, 684, -125, 33, 43, + 62, 63, 71, 69, 94, 105, 108, 116, -125, -125, + -125, 125, 139, -125, -125, 111, -125, -125, 626, -125, + 648, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, 5, -21, -125, -15, 434, -125, -125, + -125, 196, 485, -125, 157, 2, 180, 207, 222, 227, + 638, 626, 648, 224, -125, -125, -125, -125, -125, 219, + -125, 185, 223, 228, 140, 230, 161, 232, 233, 234, + 236, 241, 248, 249, 162, 250, 163, 251, 254, 256, + 257, 258, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, 225, 380, -125, -125, + 229, 231, -125, -125, -125, -125, 648, -125, -125, -125, + -125, -125, 536, 536, -125, -125, -125, -125, -125, -125, + -125, 214, -125, -7, -125, 85, -125, -125, -125, -125, + 89, -125, -125, -125, 235, 648, -125, 648, 648, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, 485, 485, 138, 138, 587, + 587, 17, -125, -125, -125, -125, -125, -125, 88, -125, + 122, -125, 274, 238, 100, 101, -125, 122, -125, 276, + 278, 260, -125, 648, 648, 260, -125, -125, -15, -15, + -125, -125, -125, 287, 485, 485, 485, 485, 485, 290, + 164, -125, 26, -125, -125, 285, -125, 131, -125, 242, + -125, -125, -125, -125, -125, -125, 288, 131, -125, 243, + -125, -125, -125, 260, -125, 297, 302, -125, -125, -125, + 152, 152, 152, -125, -125, -125, -125, 170, 61, -125, + -125, 281, -36, 293, 252, -125, -125, -125, 102, -125, + 298, 255, 300, 262, -125, -125, 103, -125, -125, -125, + -125, -125, -125, -125, -125, -33, 296, -125, -125, -125, + 110, -125, -125, -125, -125, -125, -125, 112, -125, -125, + 189, -125, -125, -125, 485, -125, -125, 310, 267, -125, + -125, 314, 275, -125, -125, -125, 485, 318, 277, -125, + -125, 320, 279, -125, -125, -125, -125, -125, -125, -125 }; /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM. @@ -1175,59 +1175,59 @@ means the default is an error. */ static const yytype_uint8 yydefact = { - 0, 0, 153, 0, 0, 0, 153, 153, 0, 0, - 0, 0, 171, 54, 55, 0, 0, 118, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 153, 4, - 7, 0, 0, 153, 153, 0, 56, 59, 61, 170, - 62, 66, 76, 70, 67, 64, 72, 3, 65, 71, - 73, 74, 75, 0, 155, 162, 163, 0, 5, 6, - 0, 0, 153, 153, 0, 153, 0, 0, 0, 54, - 113, 109, 0, 151, 150, 152, 167, 164, 172, 173, + 0, 0, 154, 0, 0, 0, 154, 154, 0, 0, + 0, 0, 172, 55, 56, 0, 0, 119, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 154, 4, + 8, 0, 0, 154, 154, 0, 57, 60, 62, 171, + 63, 67, 77, 71, 68, 65, 73, 3, 66, 72, + 74, 75, 76, 0, 156, 163, 164, 0, 7, 5, + 6, 0, 0, 154, 154, 0, 154, 0, 0, 0, + 55, 114, 110, 0, 152, 151, 153, 168, 165, 173, + 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 16, 25, 40, 34, 49, 31, 43, 37, 46, - 28, 52, 53, 22, 19, 0, 0, 10, 11, 0, - 0, 1, 54, 60, 57, 63, 148, 149, 2, 153, - 153, 156, 157, 153, 153, 166, 165, 153, 154, 137, - 138, 147, 0, 153, 0, 153, 153, 153, 153, 0, - 153, 153, 153, 153, 104, 102, 111, 110, 119, 174, - 153, 18, 27, 42, 36, 51, 33, 45, 39, 48, - 30, 24, 21, 14, 15, 17, 26, 41, 35, 50, - 32, 44, 38, 47, 29, 23, 20, 12, 13, 107, - 108, 117, 106, 58, 0, 0, 160, 161, 0, 0, - 0, 153, 153, 153, 153, 153, 153, 0, 153, 0, - 153, 0, 0, 0, 0, 153, 0, 153, 0, 0, - 0, 153, 105, 112, 0, 158, 159, 169, 168, 153, - 153, 114, 0, 0, 0, 140, 141, 139, 0, 123, - 153, 0, 153, 153, 0, 8, 0, 153, 0, 87, - 88, 153, 153, 153, 153, 0, 0, 153, 0, 68, - 69, 103, 0, 100, 0, 0, 116, 142, 143, 144, - 145, 146, 99, 129, 131, 133, 124, 0, 97, 135, - 0, 0, 0, 0, 77, 9, 153, 0, 78, 0, - 0, 0, 0, 89, 153, 0, 90, 101, 115, 153, - 130, 132, 134, 98, 0, 0, 153, 79, 80, 0, - 153, 153, 85, 86, 91, 92, 0, 153, 153, 120, - 153, 136, 125, 126, 153, 153, 0, 0, 153, 153, - 0, 0, 153, 122, 127, 128, 0, 0, 83, 84, - 0, 0, 95, 96, 121, 81, 82, 93, 94 + 0, 0, 17, 26, 41, 35, 50, 32, 44, 38, + 47, 29, 53, 54, 23, 20, 0, 0, 11, 12,
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2