dfe8464482
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: I8e2e30182fd28f096ad73febfcd614ef6fb56d80
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From e8d5b56c303237d0a0ab00ea5f4fbdea3208caa5 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 9a6d496..5f14bad 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
|
|
|
|
+# 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
|
|
@@ -323,6 +327,10 @@ This package contains documentation files for %{name}.
|
|
%patch151 -p1 -b .cve-2016-9401
|
|
%patch152 -p1 -b .pipefd-leak
|
|
|
|
+# WindRiver patches
|
|
+%patch500 -p1 -b .history-syslog
|
|
+%patch501 -p1 -b .history-exit-child-on-parent-death
|
|
+
|
|
echo %{version} > _distribution
|
|
echo %{release} > _patchlevel
|
|
|
|
--
|
|
1.9.1
|
|
|