41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
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
|
|
|
|
Conflicts:
|
|
SPECS/bash.spec
|
|
---
|
|
SPECS/bash.spec | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/SPECS/bash.spec b/SPECS/bash.spec
|
|
index 4b2ec49..4f16c8c 100644
|
|
--- a/SPECS/bash.spec
|
|
+++ b/SPECS/bash.spec
|
|
@@ -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
|
|
+Patch501: bash-history-exit-child-on-parent-death.patch
|
|
+
|
|
BuildRequires: texinfo bison
|
|
BuildRequires: ncurses-devel
|
|
BuildRequires: autoconf, gettext
|
|
@@ -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
|
|
+%patch501 -p1 -b .history-exit-child-on-parent-death
|
|
+
|
|
echo %{version} > _distribution
|
|
echo %{release} > _patchlevel
|
|
|
|
--
|
|
2.7.4
|
|
|