From a1a8924ff23dd910bc26ead3380ba327906c4de049d7e8340654c1c28a8a4991 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 9 Sep 2009 16:11:34 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=9 --- bash-4.0-async-bnc523667.dif | 18 ++++++++++++++++++ bash-4.0-patches.tar.bz2 | 4 ++-- bash-4.0.24-memleak-read.patch | 16 ---------------- bash.changes | 11 +++++++++++ bash.spec | 4 ++-- 5 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 bash-4.0-async-bnc523667.dif delete mode 100644 bash-4.0.24-memleak-read.patch diff --git a/bash-4.0-async-bnc523667.dif b/bash-4.0-async-bnc523667.dif new file mode 100644 index 0000000..8561aea --- /dev/null +++ b/bash-4.0-async-bnc523667.dif @@ -0,0 +1,18 @@ +--- 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 870ed0f..351be21 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:5976375a49b913bacb5aafa2e1471666731621f19bd3d7872c2eacb035824f9e -size 15858 +oid sha256:64b45587a32f84769d300c251406047bf8ecf8e54eec72281da82913b4ad4b5b +size 17535 diff --git a/bash-4.0.24-memleak-read.patch b/bash-4.0.24-memleak-read.patch deleted file mode 100644 index 4ac65e1..0000000 --- a/bash-4.0.24-memleak-read.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 54f3dca..34990f0 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 88c37c1..4b25afb 100644 --- a/bash.spec +++ b/bash.spec @@ -47,6 +47,7 @@ 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 @@ -61,7 +62,6 @@ 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,6 +286,7 @@ 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 @@ -298,7 +299,6 @@ 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 From fd8abfa16365dfa7f4757133531acd0e764e8d9d3da0885533ee3ba3e4398a20 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 10 Sep 2009 10:39:24 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=10 --- bash-4.0-async-bnc523667.dif | 18 ------------------ bash-4.0-patches.tar.bz2 | 4 ++-- bash-4.0.24-memleak-read.patch | 16 ++++++++++++++++ bash.changes | 11 ----------- bash.spec | 4 ++-- 5 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 bash-4.0-async-bnc523667.dif create mode 100644 bash-4.0.24-memleak-read.patch 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 From edfdd8f0461c639d89dddc9a6610787571ac5463c4bafe0c8ddd12e0a46afa95 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 10 Sep 2009 10:39:25 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/bash revision 44 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=298a1e60354c7906e7c8e1aa2f16e67e --- bash-4.0-async-bnc523667.dif | 18 ++++++++++++++++++ bash-4.0-patches.tar.bz2 | 4 ++-- bash-4.0.24-memleak-read.patch | 16 ---------------- bash.changes | 11 +++++++++++ bash.spec | 18 +++++++++--------- 5 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 bash-4.0-async-bnc523667.dif delete mode 100644 bash-4.0.24-memleak-read.patch diff --git a/bash-4.0-async-bnc523667.dif b/bash-4.0-async-bnc523667.dif new file mode 100644 index 0000000..8561aea --- /dev/null +++ b/bash-4.0-async-bnc523667.dif @@ -0,0 +1,18 @@ +--- 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 870ed0f..351be21 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:5976375a49b913bacb5aafa2e1471666731621f19bd3d7872c2eacb035824f9e -size 15858 +oid sha256:64b45587a32f84769d300c251406047bf8ecf8e54eec72281da82913b4ad4b5b +size 17535 diff --git a/bash-4.0.24-memleak-read.patch b/bash-4.0.24-memleak-read.patch deleted file mode 100644 index 4ac65e1..0000000 --- a/bash-4.0.24-memleak-read.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 54f3dca..34990f0 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 88c37c1..e9c1881 100644 --- a/bash.spec +++ b/bash.spec @@ -28,7 +28,7 @@ Recommends: bash-lang = %bash_vers Suggests: command-not-found AutoReqProv: on Version: 4.0 -Release: 15 +Release: 16 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -47,6 +47,7 @@ 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 @@ -61,7 +62,6 @@ 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} @@ -90,7 +90,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.0 -Release: 15 +Release: 16 AutoReqProv: on %description -n bash-doc @@ -110,7 +110,7 @@ License: GPL v2 or later Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.0 -Release: 4 +Release: 5 AutoReqProv: on %description -n bash-devel @@ -130,7 +130,7 @@ License: GPL v2 or later Summary: Loadable bash builtins Group: System/Shells Version: 4.0 -Release: 4 +Release: 5 AutoReqProv: on %description -n bash-loadables @@ -199,7 +199,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.0 -Release: 15 +Release: 16 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 @@ -228,7 +228,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.0 -Release: 15 +Release: 16 Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -257,7 +257,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.0 -Release: 15 +Release: 16 AutoReqProv: on %description -n readline-doc @@ -286,6 +286,7 @@ 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 @@ -298,7 +299,6 @@ 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