From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 15 Feb 2022 09:01:53 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nJsmX-00H7ck-Qe for lore@lore.pengutronix.de; Tue, 15 Feb 2022 09:01:53 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nJsmW-0000cI-SG; Tue, 15 Feb 2022 09:01:52 +0100 Received: from mail-vi1eur05on2079.outbound.protection.outlook.com ([40.107.21.79] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nJslq-0000bg-Ut for ptxdist@pengutronix.de; Tue, 15 Feb 2022 09:01:12 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IeBJw/Ez1VzgrWpoc9aVaQDeV338/A5e8wJlkReDHN7oCEowcGOGawdhixrpLSs7lsPP7xjfQgqjuJkQlrPAvHDH2Rdz9hwPeeW+Oh4CSQ4XA5Z8eRymRZ0WklkeCOL/ZvpedpbVRfWlxN+Vl88my3XWNCQdgVUTyT20Ez/a7zg+nkkEAN5dWkscZnXiV4SGDJbtmROaYEnyOz7Ag9xBTn9RkkS9hpykE7Kk9PKAvqhreYZ+W254czgYgcdaDxdIDCohxWuuVaGKfOnlGGv+DYkB8ihuoPcyRGKt9Wl0r6HjsD7FdNd+iKGYuXK0Xw2LRWHD5fhdtz17t7QzuHUXvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Np2yduwitr2M3M2e149Z0OW4Wcew2nGTx5OLXDer7f8=; b=Kx0RSKAPyLIrSek/IPELgHn+X/SWQbZRsUr2jMoh9IW/ao5EXNU5X1ZUtyfCnbGLIlKtc67CmjJUEMUmgk3eX07TEof7En8XIidlFlMPThb6u41qU5ZMiyqk+RnsIS+Ot13ZnFul2nt5c4NsPa93eZfKBDbNGYrdML3a/xwIVdkozJMJZXkgSNCF+OLijDqBVaoMP2pnk/bNA3nm0cuqklsqFWC2MYHV0YXlW9tfqiCaRDXtLcshXT2A8nd3jS0qBzoXbjV1jjwJY/4YvJkjNIvn+KDhLcE032zyqbbBIUpuM4pgTPhFAUfjjBTVsgVgWOA8DW3qjv46HWT/XKxG9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Np2yduwitr2M3M2e149Z0OW4Wcew2nGTx5OLXDer7f8=; b=jyOUOjfCA6Jsj9E7KxAXiRTnLK7jZIj6z+wViGEbBYKSog4q/9SFfGmOqzf7FJR/QJgrbRWq/UWrucXVe7/+fNd6YpbW5WurIJn5Sp2XmrYgoN0AaDFIsdsG+WDPcVmt3UENu1W20Ly4iuKHjUD3qa9AQlgZW7x0Ji9JJZsDijQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS1P251MB0584.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:48d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Tue, 15 Feb 2022 08:01:08 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe%4]) with mapi id 15.20.4975.011; Tue, 15 Feb 2022 08:01:08 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Tue, 15 Feb 2022 08:59:39 +0100 Message-Id: <20220215075939.995585-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: OL1P279CA0017.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::22) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b64e7d66-ce81-4308-4ea8-08d9f05952e7 X-MS-TrafficTypeDiagnostic: AS1P251MB0584:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jR2F5+LF+BahnOXZm4VozxVVDj2JZJtLtCU4Lfq+0+E/+1jwRT6dtp9cIqoXZQtbRSplrAKaYUDWqOnDc7mbaSGebQ7Q26GVB9Mn1GkbqymcULqo//+gXPLW8h2dADwH9bjaX627UvtYvhoO/Jzt2vqcErkJS3KInBnAaGFdCG+ZX/E45LvRE6IlNhj4ZSgpndfDfz18bAp1bgAlPlPklIBw1CkDmXMwXxSNmZrM6ZiqYbFit1FMaXYJOeHPpCNSXBxocf6c5fq1Gow66S85cR1PKsqG6n+eREp0o3oeLshCmD0CsT6WGjEh9fLQHvas87wxPaDZAS2VoCXyCSaYjsxLzjwMax8+bxXBvAjs2ieE9IJSUOPwDaToqL4Wtnzhj+zLQZ97ikjkXzPvVW8J35RH3kC5IG6fMGfUFjI1ng+BFBmSIUgIs4ov2gnu1DwkstOA+ST/LGidebCCekYmZAc6YNp49u630gQ9o0IkYPM/QxYpLzEW/ASWTA1kyoMCYFJ4AT4GKuyW7gKrhxQcXAwCFRHvVyCgr3qPSgAFIUyf+QuioC89QkXzpY7vikKXkrIquYpyYMjYLsoeweklyycBn/GH37/h9GsnilHoK6c4VFC8rw130piyXAztWWXnCb+gupeEKF5z1H76eivGiPHzzvGKYgXjEnuPKBIVF2jv/eiw8UiE3jqSP7R7rtwuOJcynSZMGha7Lo6FdgXx4LGTyj1uG6+U3r/Qfrge5v55ffFQ5vx00BsnLyn4ed66QOi/YnbgsuTrnxEo7ue4J2W17g2ICv/Bn3x2kxwHDh+rzzXiMjueeWJneSfwjUli X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(136003)(396003)(366004)(346002)(39830400003)(376002)(66946007)(6916009)(83380400001)(26005)(8936002)(36756003)(316002)(66476007)(8676002)(2616005)(66556008)(6512007)(52116002)(1076003)(86362001)(5660300002)(186003)(38100700002)(84970400001)(30864003)(4001150100001)(38350700002)(44832011)(6666004)(508600001)(6486002)(6506007)(2906002)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LKk0A8js9BtYnsAO2+cUQk+9kKaGFIS9F6OZNbkkPu+p9QosmlljI/Dh9iHB?= =?us-ascii?Q?uhfg6BtInOTZpbXH8yVDgOa7c2aC8WLgZWhph8bXm4xrjHMcmLkpLDW6vBQ9?= =?us-ascii?Q?uebxLUVWiBTrA55zPJjf4d38s4/jaFxQFN+Rg5TZd54SJuQJi9MDUVYTnWXp?= =?us-ascii?Q?Q/Nbms27yepZvXH+Y9X9kBzGILMgU98bjLzYXyuXG7DtWsQivH7a9tV7I0uX?= =?us-ascii?Q?cXjagQYyPvgrtsRqLi1hb0wPeH2GjG3VEln/QF9uX7PWswZ4FA7NAiTUGp/4?= =?us-ascii?Q?M4hzBiouzt4sRLMnHXhgL3r8RLZ01b7DqaHXUoRr4cL/sl8yGzUVgNbLuW4s?= =?us-ascii?Q?G++FAOUNxgnMhczTvRPzsmVgFgZ+txDq28dpJSI760kS4Z6MrXqu0/b83KmT?= =?us-ascii?Q?e3AoWih0E7b3kOAHxw806udJSIvwubA5lBQCpVKoCrFlWD9WmRZ39vbfJ9Ap?= =?us-ascii?Q?GwFeayGUBGJxEWP2hUwaZQZRc/rNG/+HyqABuxddHnQW5XXQQKTPj7gbadl5?= =?us-ascii?Q?AHD1huZJEtV42qaRzKi/sFRcCf8aBlFMxagpCJBFpfRNPtOqeDBKmk8js7u+?= =?us-ascii?Q?W2Ehr6L6r3y/T5F8kbCFEO6SCaSK2+UEyJusD6BdSkCkA+MRA7TGq6gNZiZD?= =?us-ascii?Q?ZfDMEYpGMWeWV3Bp9f7t+7uRYLCFLNAEpjgsQ708WqGgZ5IHC7G2ibThaiku?= =?us-ascii?Q?QvLDWAjNWYdOWOzRH2uZadc5JC/RR4AhFlkfABTRViviNSA1orSXBzizmnu1?= =?us-ascii?Q?xUnbLwdJzMtRrP3smo0LKanzch/omd59P4wPYDP385lDdEsV07JpHda3dojW?= =?us-ascii?Q?1qVmh+cM+KJp3ATQ0h8RZ2UFjEOhlsXxXS8WEkcILAOBlS1A12zUgNJlmdTr?= =?us-ascii?Q?4lrUw0JnQeSVFrgQqTdjiyJWoUWEgsGaGCvxuP5+b7w5fAKc8YpT8i7lfZUl?= =?us-ascii?Q?mWw3Qw9sFobvAXlQwl3UpSwS61vTLfM0lmio/+wUMHBCinTHICugR7wTffCP?= =?us-ascii?Q?s2hpaubwDUKOjahjDzJMz7bDCVzMJP4DpZ5h+yheZHvZDeijq6w/2VVuJPy7?= =?us-ascii?Q?99IZYYZ+JY8ZG7SSs9icDscrEDMyigI1f6vvX2tO56paCLyNyNOTpzpFlmV/?= =?us-ascii?Q?izoSW6DZG9aeAhkK+AIu9MeCWInp/Osg0ihADCVrmNx4LTQ6O01EtgbQxYbA?= =?us-ascii?Q?u92mKaEaADBZaDx+k4b+BtHhNko627Y3ad3qtYR2gYZKbx5U3Ob0+LnPjcQU?= =?us-ascii?Q?wREQoiwbOu5hBfQgafrrxkdFUGgnjkDF9A7IwSWVZjgnxBj9YIx6Zln6dpu/?= =?us-ascii?Q?YVt4Cw7uXpauY4/s6pUIwMQSaXHjvASyXegZLZBoHYqZ88wpGw9MisEz584I?= =?us-ascii?Q?O23VGhzuVsEb1KfRVQvlxG2MtcP8I0eGEoN0WZ+ywIgBFH2OPAPFTrN6+vaN?= =?us-ascii?Q?pw6jpR68SjW/NIT/zB11QHKRYTbyHURmVogJ2bsFcxvafsZeYL5n6+lS6Ft1?= =?us-ascii?Q?lY2DaEXR8/5KfVRTNO/s2agckrXh9/yW1q4NQf3aT0wsbQyYIjfmWmNdkO47?= =?us-ascii?Q?ylOrymitKKsrs1SWuztMEfR6rv9m9YBpHGGZTXGKiyWKcEp1TDZlT1Xr9EIZ?= =?us-ascii?Q?Vzyea3RxWUNwiGo74CVCwaeIx/wU1ThP+7SGK3MdJd1W8MamhuTGfmjc9355?= =?us-ascii?Q?bgQ0oULTYeTWYuoD7radL8S2ymU=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: b64e7d66-ce81-4308-4ea8-08d9f05952e7 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 08:01:08.4531 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PmQOfxEKio4CYvCimpZqYOW2A0pbKYJbRrK9cw0cScft8adXh2vOtmgbJ0GVErN/J/lZWyCcjdwyPnVG/xTPcMUbcKlroSz/OjKLUb71otU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P251MB0584 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] bash: Version bump. 5.1.8 (patches-12) -> 5.1.16. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Just a minor bugfixing bump. * Drop patches as bash is now clean at 5.1.16 Signed-off-by: Christian Melki --- .../bash-5.1.8/0001-Bash-5.1-patch-12.patch | 262 ------------------ patches/bash-5.1.8/series | 1 - rules/bash.make | 4 +- 3 files changed, 2 insertions(+), 265 deletions(-) delete mode 100644 patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch delete mode 100644 patches/bash-5.1.8/series diff --git a/patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch b/patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch deleted file mode 100644 index ef8b6ae7f..000000000 --- a/patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch +++ /dev/null @@ -1,262 +0,0 @@ -diff -urN bash-5.1.8.orig/builtins/wait.def bash-5.1.8/builtins/wait.def ---- bash-5.1.8.orig/builtins/wait.def 2021-12-21 12:57:08.083139502 +0100 -+++ bash-5.1.8/builtins/wait.def 2021-12-21 12:58:24.304849937 +0100 -@@ -111,7 +111,8 @@ - wait_builtin (list) - WORD_LIST *list; - { -- int status, code, opt, nflag, wflags; -+ int status, code, opt, nflag; -+ volatile int wflags; - char *vname; - SHELL_VAR *pidvar; - struct procstat pstat; -@@ -180,6 +181,8 @@ - last_command_exit_signal = wait_signal_received; - status = 128 + wait_signal_received; - wait_sigint_cleanup (); -+ if (wflags & JWAIT_WAITING) -+ unset_waitlist (); - WAIT_RETURN (status); - } - -diff -urN bash-5.1.8.orig/command.h bash-5.1.8/command.h ---- bash-5.1.8.orig/command.h 2021-12-21 12:57:08.099139862 +0100 -+++ bash-5.1.8/command.h 2021-12-21 12:58:27.760927380 +0100 -@@ -124,6 +124,7 @@ - #define SUBSHELL_PROCSUB 0x20 /* subshell caused by <(command) or >(command) */ - #define SUBSHELL_COPROC 0x40 /* subshell from a coproc pipeline */ - #define SUBSHELL_RESETTRAP 0x80 /* subshell needs to reset trap strings on first call to trap */ -+#define SUBSHELL_IGNTRAP 0x100 /* subshell should reset trapped signals from trap_handler */ - - /* A structure which represents a word. */ - typedef struct word_desc { -diff -urN bash-5.1.8.orig/execute_cmd.c bash-5.1.8/execute_cmd.c ---- bash-5.1.8.orig/execute_cmd.c 2021-12-21 12:57:08.091139683 +0100 -+++ bash-5.1.8/execute_cmd.c 2021-12-21 12:58:27.764927470 +0100 -@@ -1547,6 +1547,9 @@ - clear_pending_traps (); - reset_signal_handlers (); - subshell_environment |= SUBSHELL_RESETTRAP; -+ /* Note that signal handlers have been reset, so we should no longer -+ reset the handler and resend trapped signals to ourselves. */ -+ subshell_environment &= ~SUBSHELL_IGNTRAP; - - /* We are in a subshell, so forget that we are running a trap handler or - that the signal handler has changed (we haven't changed it!) */ -@@ -4320,7 +4323,8 @@ - already_forked = 1; - cmdflags |= CMD_NO_FORK; - -- subshell_environment = SUBSHELL_FORK; /* XXX */ -+ /* We redo some of what make_child() does with SUBSHELL_IGNTRAP */ -+ subshell_environment = SUBSHELL_FORK|SUBSHELL_IGNTRAP; /* XXX */ - if (pipe_in != NO_PIPE || pipe_out != NO_PIPE) - subshell_environment |= SUBSHELL_PIPE; - if (async) -@@ -4574,6 +4578,7 @@ - trap strings if we run trap to change a signal disposition. */ - reset_signal_handlers (); - subshell_environment |= SUBSHELL_RESETTRAP; -+ subshell_environment &= ~SUBSHELL_IGNTRAP; - - if (async) - { -@@ -5514,6 +5519,7 @@ - reset_terminating_signals (); /* XXX */ - /* Cancel traps, in trap.c. */ - restore_original_signals (); -+ subshell_environment &= ~SUBSHELL_IGNTRAP; - - #if defined (JOB_CONTROL) - FREE (p); -diff -urN bash-5.1.8.orig/jobs.c bash-5.1.8/jobs.c ---- bash-5.1.8.orig/jobs.c 2021-12-21 12:57:08.091139683 +0100 -+++ bash-5.1.8/jobs.c 2021-12-21 12:58:27.764927470 +0100 -@@ -2217,6 +2217,8 @@ - signals to the default state for a new process. */ - pid_t mypid; - -+ subshell_environment |= SUBSHELL_IGNTRAP; -+ - /* If this ends up being changed to modify or use `command' in the - child process, go back and change callers who free `command' in - the child process when this returns. */ -diff -urN bash-5.1.8.orig/lib/malloc/malloc.c bash-5.1.8/lib/malloc/malloc.c ---- bash-5.1.8.orig/lib/malloc/malloc.c 2021-12-21 12:57:08.095139773 +0100 -+++ bash-5.1.8/lib/malloc/malloc.c 2021-12-21 12:58:22.200802784 +0100 -@@ -1286,13 +1286,12 @@ - p = (union mhead *) ap - 1; - } - -- /* XXX - should we return 0 if ISFREE? */ -- maxbytes = binsize(p->mh_index); -- -- /* So the usable size is the maximum number of bytes in the bin less the -- malloc overhead */ -- maxbytes -= MOVERHEAD + MSLOP; -- return (maxbytes); -+ /* return 0 if ISFREE */ -+ if (p->mh_alloc == ISFREE) -+ return 0; -+ -+ /* Since we use bounds checking, the usable size is the last requested size. */ -+ return (p->mh_nbytes); - } - - #if !defined (NO_VALLOC) -diff -urN bash-5.1.8.orig/nojobs.c bash-5.1.8/nojobs.c ---- bash-5.1.8.orig/nojobs.c 2021-12-21 12:57:08.091139683 +0100 -+++ bash-5.1.8/nojobs.c 2021-12-21 12:58:27.764927470 +0100 -@@ -575,6 +575,8 @@ - last_asynchronous_pid = getpid (); - #endif - -+ subshell_environment |= SUBSHELL_IGNTRAP; -+ - default_tty_job_signals (); - } - else -diff -urN bash-5.1.8.orig/parse.y bash-5.1.8/parse.y ---- bash-5.1.8.orig/parse.y 2021-12-21 12:57:08.099139862 +0100 -+++ bash-5.1.8/parse.y 2021-12-21 12:58:26.112890455 +0100 -@@ -6493,10 +6493,8 @@ - old_expand_aliases = expand_aliases; - - push_stream (1); --#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev 11/17/2020 */ - if (ea = expanding_alias ()) - parser_save_alias (); --#endif - last_read_token = WORD; /* WORD to allow reserved words here */ - current_command_line_count = 0; - echo_input_at_read = expand_aliases = 0; -@@ -6531,10 +6529,8 @@ - last_read_token = '\n'; - pop_stream (); - --#if 0 /* TAG: bash-5.2 */ - if (ea) - parser_restore_alias (); --#endif - - #if defined (HISTORY) - remember_on_history = old_remember_on_history; -diff -urN bash-5.1.8.orig/patchlevel.h bash-5.1.8/patchlevel.h ---- bash-5.1.8.orig/patchlevel.h 2021-12-21 12:57:08.075139321 +0100 -+++ bash-5.1.8/patchlevel.h 2021-12-21 12:58:27.764927470 +0100 -@@ -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 8 -+#define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ -diff -urN bash-5.1.8.orig/sig.c bash-5.1.8/sig.c ---- bash-5.1.8.orig/sig.c 2021-12-21 12:57:08.071139231 +0100 -+++ bash-5.1.8/sig.c 2021-12-21 12:58:27.764927470 +0100 -@@ -55,7 +55,8 @@ - # include "bashhist.h" - #endif - --extern void initialize_siglist (); -+extern void initialize_siglist PARAMS((void)); -+extern void set_original_signal PARAMS((int, SigHandler *)); - - #if !defined (JOB_CONTROL) - extern void initialize_job_signals PARAMS((void)); -@@ -255,6 +256,13 @@ - sigaction (XSIG (i), &act, &oact); - XHANDLER(i) = oact.sa_handler; - XSAFLAGS(i) = oact.sa_flags; -+ -+#if 0 -+ set_original_signal (XSIG(i), XHANDLER(i)); /* optimization */ -+#else -+ set_original_signal (XSIG(i), act.sa_handler); /* optimization */ -+#endif -+ - /* Don't do anything with signals that are ignored at shell entry - if the shell is not interactive. */ - /* XXX - should we do this for interactive shells, too? */ -diff -urN bash-5.1.8.orig/subst.c bash-5.1.8/subst.c ---- bash-5.1.8.orig/subst.c 2021-12-21 12:57:08.099139862 +0100 -+++ bash-5.1.8/subst.c 2021-12-21 12:58:27.764927470 +0100 -@@ -5951,6 +5951,7 @@ - free_pushed_string_input (); - /* Cancel traps, in trap.c. */ - restore_original_signals (); /* XXX - what about special builtins? bash-4.2 */ -+ subshell_environment &= ~SUBSHELL_IGNTRAP; - QUIT; /* catch any interrupts we got post-fork */ - setup_async_signals (); - #if 0 -@@ -6382,6 +6383,7 @@ - } - QUIT; /* catch any interrupts we got post-fork */ - subshell_environment |= SUBSHELL_RESETTRAP; -+ subshell_environment &= ~SUBSHELL_IGNTRAP; - } - - #if defined (JOB_CONTROL) -diff -urN bash-5.1.8.orig/trap.c bash-5.1.8/trap.c ---- bash-5.1.8.orig/trap.c 2021-12-21 12:57:08.083139502 +0100 -+++ bash-5.1.8/trap.c 2021-12-21 12:58:27.764927470 +0100 -@@ -481,6 +481,32 @@ - SIGRETURN (0); - } - -+ /* This means we're in a subshell, but have not yet reset the handler for -+ trapped signals. We're not supposed to execute the trap in this situation; -+ we should restore the original signal and resend the signal to ourselves -+ to preserve the Posix "signal traps that are not being ignored shall be -+ set to the default action" semantics. */ -+ if ((subshell_environment & SUBSHELL_IGNTRAP) && trap_list[sig] != (char *)IGNORE_SIG) -+ { -+ sigset_t mask; -+ -+ /* Paranoia */ -+ if (original_signals[sig] == IMPOSSIBLE_TRAP_HANDLER) -+ original_signals[sig] = SIG_DFL; -+ -+ restore_signal (sig); -+ -+ /* Make sure we let the signal we just caught through */ -+ sigemptyset (&mask); -+ sigprocmask (SIG_SETMASK, (sigset_t *)NULL, &mask); -+ sigdelset (&mask, sig); -+ sigprocmask (SIG_SETMASK, &mask, (sigset_t *)NULL); -+ -+ kill (getpid (), sig); -+ -+ SIGRETURN (0); -+ } -+ - if ((sig >= NSIG) || - (trap_list[sig] == (char *)DEFAULT_SIG) || - (trap_list[sig] == (char *)IGNORE_SIG)) -diff -urN bash-5.1.8.orig/y.tab.c bash-5.1.8/y.tab.c ---- bash-5.1.8.orig/y.tab.c 2021-12-21 12:57:08.075139321 +0100 -+++ bash-5.1.8/y.tab.c 2021-12-21 12:58:26.116890545 +0100 -@@ -8787,10 +8787,8 @@ - old_expand_aliases = expand_aliases; - - push_stream (1); --#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev 11/17/2020 */ - if (ea = expanding_alias ()) - parser_save_alias (); --#endif - last_read_token = WORD; /* WORD to allow reserved words here */ - current_command_line_count = 0; - echo_input_at_read = expand_aliases = 0; -@@ -8825,10 +8823,8 @@ - last_read_token = '\n'; - pop_stream (); - --#if 0 /* TAG: bash-5.2 */ - if (ea) - parser_restore_alias (); --#endif - - #if defined (HISTORY) - remember_on_history = old_remember_on_history; diff --git a/patches/bash-5.1.8/series b/patches/bash-5.1.8/series deleted file mode 100644 index 0e53e492a..000000000 --- a/patches/bash-5.1.8/series +++ /dev/null @@ -1 +0,0 @@ -0001-Bash-5.1-patch-12.patch diff --git a/rules/bash.make b/rules/bash.make index 881ba55fd..8213aafad 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -13,8 +13,8 @@ PACKAGES-$(PTXCONF_BASH) += bash # # Paths and names # -BASH_VERSION := 5.1.8 -BASH_MD5 := 23eee6195b47318b9fd878e590ccb38c +BASH_VERSION := 5.1.16 +BASH_MD5 := c17b20a09fc38d67fb303aeb6c130b4e BASH := bash-$(BASH_VERSION) BASH_SUFFIX := tar.gz BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX)) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de