From ab87e828c115994e5ad0bdfc47aa81228819d918 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Wed, 8 Aug 2018 21:58:53 +0800
Subject: [PATCH] rebase bash patch to CentOS7.5

Story: 2003389
Task: 24464

Change-Id: Ie84a3ee162de835c4b0f3f94bad403d4a1b23f1d
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
 ...pdate-package-versioning-for-TIS-format.patch | 10 +++++-----
 .../meta_patches/spec-TiS-bash-history.patch     | 16 ++++++++--------
 base/bash/centos/srpm_path                       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/base/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
index cab1a4fa0..45b3ed0ac 100644
--- a/base/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ b/base/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
@@ -1,4 +1,4 @@
-From e1f17182a8d105770a2805c9950b776b4437f7ff Mon Sep 17 00:00:00 2001
+From 30796013a8d2b3b008a843bd3a4bee33e866a151 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 16:05:36 -0400
 Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch
@@ -10,18 +10,18 @@ Conflicts:
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/SPECS/bash.spec b/SPECS/bash.spec
-index 5f14bad..115d540 100644
+index 4f16c8c..d749f92 100644
 --- a/SPECS/bash.spec
 +++ b/SPECS/bash.spec
 @@ -6,7 +6,7 @@
  Version: %{baseversion}%{patchleveltag}
  Name: bash
  Summary: The GNU Bourne Again shell
--Release: 29%{?dist}
-+Release: 29.el7_4%{?_tis_dist}.%{tis_patch_ver}
+-Release: 30%{?dist}
++Release: 30.el7%{?_tis_dist}.%{tis_patch_ver}
  Group: System Environment/Shells
  License: GPLv3+
  Url: http://www.gnu.org/software/bash
 -- 
-1.9.1
+2.7.4
 
diff --git a/base/bash/centos/meta_patches/spec-TiS-bash-history.patch b/base/bash/centos/meta_patches/spec-TiS-bash-history.patch
index a0bfe756e..376942dd1 100644
--- a/base/bash/centos/meta_patches/spec-TiS-bash-history.patch
+++ b/base/bash/centos/meta_patches/spec-TiS-bash-history.patch
@@ -1,4 +1,4 @@
-From e8d5b56c303237d0a0ab00ea5f4fbdea3208caa5 Mon Sep 17 00:00:00 2001
+From cc0534185464b04c1d320518af7d2b73291ea449 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 16:05:36 -0400
 Subject: [PATCH 1/3] WRS: spec-TiS-bash-history.patch
@@ -10,12 +10,12 @@ Conflicts:
  1 file changed, 8 insertions(+)
 
 diff --git a/SPECS/bash.spec b/SPECS/bash.spec
-index 9a6d496..5f14bad 100644
+index 4b2ec49..4f16c8c 100644
 --- a/SPECS/bash.spec
 +++ b/SPECS/bash.spec
-@@ -192,6 +192,10 @@ Patch151: bash-cve-2016-9401.patch
- #1473245
- Patch152: bash-4.3-pipefd-leak.patch
+@@ -195,6 +195,10 @@ Patch152: bash-4.3-pipefd-leak.patch
+ #1487615 - bash fails to execute commands containing multibyte characters
+ Patch153: bash-4.3-wshouldquote.patch
  
 +# Patches from WindRiver
 +Patch500: bash-history-syslog.patch
@@ -24,9 +24,9 @@ index 9a6d496..5f14bad 100644
  BuildRequires: texinfo bison
  BuildRequires: ncurses-devel
  BuildRequires: autoconf, gettext
-@@ -323,6 +327,10 @@ This package contains documentation files for %{name}.
- %patch151 -p1 -b .cve-2016-9401
+@@ -327,6 +331,10 @@ This package contains documentation files for %{name}.
  %patch152 -p1 -b .pipefd-leak
+ %patch153 -p1 -b .wshouldquote
  
 +# WindRiver patches
 +%patch500 -p1 -b .history-syslog
@@ -36,5 +36,5 @@ index 9a6d496..5f14bad 100644
  echo %{release} > _patchlevel
  
 -- 
-1.9.1
+2.7.4
 
diff --git a/base/bash/centos/srpm_path b/base/bash/centos/srpm_path
index ecb715534..f8127d64f 100644
--- a/base/bash/centos/srpm_path
+++ b/base/bash/centos/srpm_path
@@ -1 +1 @@
-mirror:Source/bash-4.2.46-29.el7_4.src.rpm
+mirror:Source/bash-4.2.46-30.el7.src.rpm