From 3975ba05c779b6b3dc13cc853ca818834792adba Mon Sep 17 00:00:00 2001 From: slin14 Date: Fri, 28 Sep 2018 07:18:34 +0800 Subject: [PATCH] de-fuzz bash patches When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I13298239f6a49298b800aa07adeeadab0ef33729 Signed-off-by: slin14 --- ...bash-history-exit-child-on-parent-death.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/bash/files/bash-history-exit-child-on-parent-death.patch b/base/bash/files/bash-history-exit-child-on-parent-death.patch index 1ed2d8b4e..9d82ac28a 100644 --- a/base/bash/files/bash-history-exit-child-on-parent-death.patch +++ b/base/bash/files/bash-history-exit-child-on-parent-death.patch @@ -1,16 +1,15 @@ -From e3e273f70ea4f8b33f89478020a421bdc203666e Mon Sep 17 00:00:00 2001 +From 31e35dced8a76f9bec4ed2be86d0cca234751d09 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Fri, 26 Aug 2016 16:04:48 -0400 Subject: [PATCH 2/2] WRS: Patch501: bash-history-exit-child-on-parent-death.patch --- - shell.c | 16 +- - sig.c | 13 + - sig.h | 2 + + shell.c | 16 +++++++++++++++- + sig.c | 13 +++++++++++++ + sig.h | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-) - diff --git a/shell.c b/shell.c index 7eca4e3..dcba61a 100644 --- a/shell.c @@ -60,10 +59,10 @@ index 7eca4e3..dcba61a 100644 } else diff --git a/sig.c b/sig.c -index d38246d..5ad0c2d 100644 +index 6bd1319..94864fa 100644 --- a/sig.c +++ b/sig.c -@@ -561,6 +561,19 @@ termsig_handler (sig) +@@ -556,6 +556,19 @@ termsig_handler (sig) kill (getpid (), sig); } @@ -102,4 +101,5 @@ index 540aa3e..8f47c56 100644 extern void initialize_terminating_signals __P((void)); extern void reset_terminating_signals __P((void)); -- -1.9.1 \ No newline at end of file +2.7.4 +