From e2ac4463910353742b2d2d65aafc9f61e8fc3a75 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 21 2020 21:25:12 +0000
Subject: import bash-4.4.19-10.el8


---

diff --git a/SOURCES/bash-5.0-shellpid-subshell.patch b/SOURCES/bash-5.0-shellpid-subshell.patch
new file mode 100644
index 0000000..6dad7c1
--- /dev/null
+++ b/SOURCES/bash-5.0-shellpid-subshell.patch
@@ -0,0 +1,12 @@
+diff --git a/parse.y b/parse.y
+--- a/parse.y
++++ b/parse.y
+@@ -4193,7 +4193,7 @@ eof_error:
+ 
+ 	  FREE (nestret);
+ 	}
+-      if MBTEST(ch == '$')
++      if MBTEST(ch == '$' && (tflags & LEX_WASDOL) == 0)
+ 	tflags |= LEX_WASDOL;
+       else
+ 	tflags &= ~LEX_WASDOL;
diff --git a/SPECS/bash.spec b/SPECS/bash.spec
index a6d1370..52d1dca 100644
--- a/SPECS/bash.spec
+++ b/SPECS/bash.spec
@@ -7,7 +7,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 8%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Url: https://www.gnu.org/software/bash
 Source0: https://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
@@ -99,6 +99,10 @@ Patch132: bash-4.4-coverity.patch
 # This should be dropped while rebasing to bash-5.0
 Patch133: bash-5.0-syslog-history.patch
 
+# 1727952 -  Parsing commands break when using $$ in command substitution $(..)
+# https://lists.gnu.org/archive/html/bug-bash/2017-01/msg00065.html
+Patch134: bash-5.0-shellpid-subshell.patch
+
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
 BuildRequires: autoconf, gettext
@@ -143,7 +147,7 @@ autoconf
 # Recycles pids is neccessary. When bash's last fork's pid was X
 # and new fork's pid is also X, bash has to wait for this same pid.
 # Without Recycles pids bash will not wait.
-make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" %{?_smp_mflags}
+make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS` -DSYSLOG_HISTORY" %{?_smp_mflags}
 
 %install
 if [ -e autoconf ]; then
@@ -322,6 +326,14 @@ end
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Aug 22 2019 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.19-10
+- Fix runtime option to enable history logging to syslog
+  Related: #1687835
+
+* Wed Jul 10 2019 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.19-9
+- Fix `$$` expansion in subshell
+  Resolves: #1727952
+
 * Mon May 27 2019 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.19-8
 - Add a runtime option to enable history logging to syslog
   Resolves: #1687835