From b3eec3914e66fd2e24730ee817b9be8b1f5be6c4 Mon Sep 17 00:00:00 2001 From: xiaolunfhb Date: Tue, 19 Apr 2022 13:51:58 +0800 Subject: [PATCH 1/3] merged 2cded4b190ee8c164a3e8939536c5781548fe50e --- 1001-tcsh-6.22.02-avoid-gcc-to-fail.patch | 11 +++++++++++ tcsh.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 1001-tcsh-6.22.02-avoid-gcc-to-fail.patch diff --git a/1001-tcsh-6.22.02-avoid-gcc-to-fail.patch b/1001-tcsh-6.22.02-avoid-gcc-to-fail.patch new file mode 100644 index 0000000..1f3f324 --- /dev/null +++ b/1001-tcsh-6.22.02-avoid-gcc-to-fail.patch @@ -0,0 +1,11 @@ +diff -Nuar tcsh-6.20.00.orig/tc.sig.c tcsh-6.20.00/tc.sig.c +--- tcsh-6.20.00.orig/tc.sig.c 2012-01-25 23:34:41.000000000 +0800 ++++ tcsh-6.20.00/tc.sig.c 2020-09-28 20:46:54.268308795 +0800 +@@ -60,7 +60,6 @@ + int phup_disabled; /* = 0; */ + int pchild_disabled; /* = 0; */ + int pintr_disabled; /* = 0; */ +-int handle_interrupt; /* = 0; */ + + int + handle_pending_signals(void) diff --git a/tcsh.spec b/tcsh.spec index 4731c30..8c38eaf 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # === GLOBAL MACROS =========================================================== # According to Fedora Package Guidelines, it is advised that packages that can @@ -13,7 +14,7 @@ Name: tcsh Summary: An enhanced version of csh, the C shell Version: 6.20.00 -Release: 15%{?dist} +Release: 15%{anolis_release}%{?dist} License: BSD URL: http://www.tcsh.org/ @@ -63,6 +64,10 @@ Patch016: tcsh-6.20.00-dont-corrupt-history-using-modifiers.patch # Downstream patches -- these should be always included when doing rebase: # ------------------ Patch100: tcsh-6.20.00-manpage-memoryuse.patch +# Begin: Anolis customized patches +# Backport from fc32 to fix FTBFS on gcc10 +Patch1001: 1001-tcsh-6.22.02-avoid-gcc-to-fail.patch +# End: Anolis customized patches # This reverts patch001: tcsh-6.20.00-001-delay-arginp-interpreting.patch # bug 1845684 @@ -202,6 +207,9 @@ fi * Wed Sep 08 2021 Jan Macku - 6.20.00-14 - Modifiers no longer breaks history - (#1997981) +* Mon Dec 13 2021 Weitao Zhou - 6.20.00-13.0.1 +- Fix FTBFS on gcc10 + * Mon Nov 16 2020 Jan Macku - 6.20.00-13 - fix regression caused by corrupted history (#1818766) -- Gitee From 59b626a19518a6218db40582323b8271358112ba Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Mon, 28 Sep 2020 20:49:51 +0800 Subject: [PATCH 2/3] Fix FTBFS on gcc10 this change has given better compatible with both gcc8 and gcc10 toolchain, should be maintained util upstream fixes Signed-off-by: weitao zhou --- tcsh.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcsh.spec b/tcsh.spec index 8c38eaf..3398bce 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -200,6 +200,9 @@ fi # ============================================================================= %changelog +* Mon Dec 13 2021 Weitao Zhou - 6.20.00-13.0.1 +- Fix FTBFS on gcc10 + * Mon Oct 18 2021 Siteshwar Vashisht - 6.20.00-15 - Fix regression caused by bacported patch, command var is now set as before Resolves: #1845684 @@ -207,9 +210,6 @@ fi * Wed Sep 08 2021 Jan Macku - 6.20.00-14 - Modifiers no longer breaks history - (#1997981) -* Mon Dec 13 2021 Weitao Zhou - 6.20.00-13.0.1 -- Fix FTBFS on gcc10 - * Mon Nov 16 2020 Jan Macku - 6.20.00-13 - fix regression caused by corrupted history (#1818766) -- Gitee From f07e75a473b370e6838d8e0836a54bbcb2fe07ce Mon Sep 17 00:00:00 2001 From: xiaolunfhb Date: Tue, 19 Apr 2022 14:18:09 +0800 Subject: [PATCH 3/3] fixed %changelog not in descending chronological order --- tcsh.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcsh.spec b/tcsh.spec index 8c38eaf..3398bce 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -200,6 +200,9 @@ fi # ============================================================================= %changelog +* Mon Dec 13 2021 Weitao Zhou - 6.20.00-13.0.1 +- Fix FTBFS on gcc10 + * Mon Oct 18 2021 Siteshwar Vashisht - 6.20.00-15 - Fix regression caused by bacported patch, command var is now set as before Resolves: #1845684 @@ -207,9 +210,6 @@ fi * Wed Sep 08 2021 Jan Macku - 6.20.00-14 - Modifiers no longer breaks history - (#1997981) -* Mon Dec 13 2021 Weitao Zhou - 6.20.00-13.0.1 -- Fix FTBFS on gcc10 - * Mon Nov 16 2020 Jan Macku - 6.20.00-13 - fix regression caused by corrupted history (#1818766) -- Gitee