diff --git a/bash-4.0-async-bnc523667.dif b/bash-4.0-async-bnc523667.dif deleted file mode 100644 index 8561aea..0000000 --- a/bash-4.0-async-bnc523667.dif +++ /dev/null @@ -1,18 +0,0 @@ ---- jobs.c -+++ jobs.c 2009-09-09 17:38:46.286401756 +0200 -@@ -626,6 +626,7 @@ stop_pipeline (async, deferred) - if (newjob) - { - newjob->flags |= J_FOREGROUND; -+#if !defined(__linux__) - /* - * !!!!! NOTE !!!!! (chet@ins.cwru.edu) - * -@@ -640,6 +641,7 @@ stop_pipeline (async, deferred) - */ - if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0) - maybe_give_terminal_to (shell_pgrp, newjob->pgrp, 0); -+#endif - } - } - diff --git a/bash-4.0-patches.tar.bz2 b/bash-4.0-patches.tar.bz2 index 351be21..870ed0f 100644 --- a/bash-4.0-patches.tar.bz2 +++ b/bash-4.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64b45587a32f84769d300c251406047bf8ecf8e54eec72281da82913b4ad4b5b -size 17535 +oid sha256:5976375a49b913bacb5aafa2e1471666731621f19bd3d7872c2eacb035824f9e +size 15858 diff --git a/bash-4.0.24-memleak-read.patch b/bash-4.0.24-memleak-read.patch new file mode 100644 index 0000000..4ac65e1 --- /dev/null +++ b/bash-4.0.24-memleak-read.patch @@ -0,0 +1,16 @@ +Index: builtins/read.def +=================================================================== +--- builtins/read.def.orig ++++ builtins/read.def +@@ -763,7 +763,10 @@ assign_vars: + if (*input_string == 0) + tofree = input_string = t; + else +- input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape); ++ { ++ input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape); ++ tofree = t; ++ } + } + #endif + diff --git a/bash.changes b/bash.changes index 34990f0..54f3dca 100644 --- a/bash.changes +++ b/bash.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 9 17:41:15 CEST 2009 - werner@suse.de - -- Do not change tty owner group twice by child and parent (bnc#523667) - -------------------------------------------------------------------- -Wed Sep 9 17:32:20 CEST 2009 - werner@suse.de - -- Update to newest patch level 33 - * Includes one of our own patches - ------------------------------------------------------------------- Wed Aug 26 13:01:19 CEST 2009 - coolo@novell.com diff --git a/bash.spec b/bash.spec index 4b25afb..88c37c1 100644 --- a/bash.spec +++ b/bash.spec @@ -47,7 +47,6 @@ Patch4: bash-3.0-evalexp.patch Patch5: bash-3.0-warn-locale.patch Patch6: bash-3.0-nfs_redir.patch Patch7: bash-3.0-decl.patch -Patch8: bash-4.0-async-bnc523667.dif Patch9: bash-4.0-extended_quote.patch Patch10: bash-3.2-printf.patch Patch11: bash-4.0-loadables.dif @@ -62,6 +61,7 @@ Patch23: readline-5.2-conf.patch Patch30: readline-6.0-destdir.patch Patch40: bash-4.0.10-typo.patch Patch42: bash-4.0.24-acl.dif +Patch43: bash-4.0.24-memleak-read.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _incdir %{_includedir} @@ -286,7 +286,6 @@ unset p %patch5 -p0 -b .warnlc %patch6 -p0 -b .nfs_redir %patch7 -p0 -b .decl -%patch8 -p0 -b .async %patch9 -p0 -b .extended_quote %patch10 -p0 -b .printf %patch11 -p0 -b .plugins @@ -299,6 +298,7 @@ unset p %patch23 -p0 -b .conf %patch40 -p0 -b .typo %patch42 -p0 -b .acl +%patch43 -p0 -b .leak %patch0 -p0 cd ../readline-%{rl_vers} for p in ../readline-%{rl_vers}-patches/*; do