From 77bcbffe063518c854abac0fc88662edb2b54ed4 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 29 2014 12:47:02 +0000 Subject: import bash-4.2.45-5.el7.src.rpm --- diff --git a/SOURCES/bash-4.1-trap.patch b/SOURCES/bash-4.1-trap.patch new file mode 100644 index 0000000..ae3a6b3 --- /dev/null +++ b/SOURCES/bash-4.1-trap.patch @@ -0,0 +1,46 @@ +Only in bash-4.1: _patchlevel +diff -rup bash-4.1.orig/trap.c bash-4.1/trap.c +--- bash-4.1.orig/trap.c 2013-05-14 13:58:06.224000564 +0900 ++++ bash-4.1/trap.c 2013-06-26 16:59:42.968001502 +0900 +@@ -269,6 +269,9 @@ run_pending_traps () + if (catch_flag == 0) /* simple optimization */ + return; + ++ if (running_trap > 0) ++ return; /* no recursive trap invocations */ ++ + catch_flag = 0; + + /* Preserve $? when running trap. */ +@@ -294,6 +297,8 @@ run_pending_traps () + # endif + #endif /* HAVE_POSIX_SIGNALS */ + ++ running_trap = sig + 1; ++ + if (sig == SIGINT) + { + run_interrupt_trap (); +@@ -338,7 +343,14 @@ run_pending_traps () + save_subst_varlist = subst_assign_varlist; + subst_assign_varlist = 0; + ++#if defined (JOB_CONTROL) ++ save_pipeline (1); /* XXX only provides one save level */ ++#endif + parse_and_execute (savestring (trap_list[sig]), "trap", SEVAL_NONINT|SEVAL_NOHIST|SEVAL_RESETLINE); ++#if defined (JOB_CONTROL) ++ restore_pipeline (1); ++#endif ++ + restore_token_state (token_state); + free (token_state); + +@@ -346,6 +358,7 @@ run_pending_traps () + } + + pending_traps[sig] = 0; ++ running_trap = 0; + + #if defined (HAVE_POSIX_SIGNALS) + sigprocmask (SIG_SETMASK, &oset, (sigset_t *)NULL); diff --git a/SPECS/bash.spec b/SPECS/bash.spec index fcdddc8..afaa1f1 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: 2%{?dist} +Release: 5%{?dist} Group: System Environment/Shells License: GPLv3+ Url: http://www.gnu.org/software/bash @@ -114,6 +114,7 @@ Patch125: bash-4.2-size_type.patch # 903833, Fix missing close(), fixes fd leaks Patch126: bash-4.2-missing_closes.patch +Patch127: bash-4.1-trap.patch BuildRequires: texinfo bison BuildRequires: ncurses-devel @@ -216,6 +217,7 @@ This package contains documentation files for %{name}. %patch124 -p1 -b .signal %patch125 -p1 -b .size_type %patch126 -p1 -b .missing_closes +%patch127 -p1 -b .trap echo %{version} > _distribution echo %{release} > _patchlevel @@ -408,6 +410,15 @@ end #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Fri Jan 24 2014 Daniel Mach - 4.2.45-5 +- Mass rebuild 2014-01-24 + +* Fri Jan 24 2014 Ondrej Oprala - 4.2.45-3 +- Mass rebuild 2013-12-27 + * Fri Aug 09 2013 Roman Rakus - 4.2.45-2 - Added suggestion to .bashrc how to disable autopaging in systemctl Resolves: #978841