From 519b273051161dc66e0b8fada05301622e228214 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 9 Mar 2011 12:18:41 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/bash revision 74.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=40323a128908eb3787c32a92c945a71e --- bash.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bash.spec b/bash.spec index 4b89c9ee..92b25cf8 100644 --- a/bash.spec +++ b/bash.spec @@ -37,7 +37,7 @@ Recommends: bash-doc = %bash_vers %endif AutoReqProv: on Version: 4.2 -Release: 1 +Release: 2 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 @@ -107,7 +107,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 -Release: 1 +Release: 2 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -143,7 +143,7 @@ License: GPLv2+ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.2 -Release: 1 +Release: 2 AutoReqProv: on %description -n bash-devel @@ -163,7 +163,7 @@ License: GPLv2+ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 -Release: 1 +Release: 2 AutoReqProv: on %description -n bash-loadables @@ -232,7 +232,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 -Release: 1 +Release: 2 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -263,7 +263,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.2 -Release: 1 +Release: 2 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -294,7 +294,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 -Release: 1 +Release: 2 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch From a0a990852240d446e44dbe054a0f3e5edae63dea Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 15 Mar 2011 17:31:42 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=69 --- bash-4.2-history.dif | 34 ---------------------------------- bash-4.2-patches.tar.bz2 | 4 ++-- bash.changes | 7 +++++++ bash.spec | 2 -- 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 bash-4.2-history.dif diff --git a/bash-4.2-history.dif b/bash-4.2-history.dif deleted file mode 100644 index f6922772..00000000 --- a/bash-4.2-history.dif +++ /dev/null @@ -1,34 +0,0 @@ -*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010 ---- sig.c Tue Mar 8 21:28:32 2011 -*************** -*** 47,50 **** ---- 47,51 ---- - #if defined (READLINE) - # include "bashline.h" -+ # include - #endif - -*************** -*** 63,66 **** ---- 64,68 ---- - extern int history_lines_this_session; - #endif -+ extern int no_line_editing; - - extern void initialize_siglist (); -*************** -*** 506,510 **** - #if defined (HISTORY) - /* XXX - will inhibit history file being written */ -! history_lines_this_session = 0; - #endif - terminate_immediately = 0; ---- 508,515 ---- - #if defined (HISTORY) - /* XXX - will inhibit history file being written */ -! # if defined (READLINE) -! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) -! # endif -! history_lines_this_session = 0; - #endif - terminate_immediately = 0; diff --git a/bash-4.2-patches.tar.bz2 b/bash-4.2-patches.tar.bz2 index 4340a8c3..5addda5a 100644 --- a/bash-4.2-patches.tar.bz2 +++ b/bash-4.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2fc41cc8e9ba0a9d83f2e1eccf28762adedb7b12584db1fae683c22771f3992 -size 5099 +oid sha256:0b80c189a132da8ecbbfb8c283224f75ebcd774c4fb5468117b218a9a6ea7021 +size 7397 diff --git a/bash.changes b/bash.changes index 98d2c714..df9132d7 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 15 18:28:58 CET 2011 - werner@suse.de + +- Update bash 4.2 to patch level 8 +- Add Ctr-C patch from upstream +- Add fix for endless loop in UTF-8 locale + ------------------------------------------------------------------- Wed Mar 9 12:00:48 CET 2011 - werner@suse.de diff --git a/bash.spec b/bash.spec index 92b25cf8..09692557 100644 --- a/bash.spec +++ b/bash.spec @@ -66,7 +66,6 @@ Patch9: bash-4.0-extended_quote.patch Patch10: bash-3.2-printf.patch Patch11: bash-4.0-loadables.dif Patch12: bash-4.1-completion.dif -Patch13: bash-4.2-history.dif Patch14: bash-4.2-sigrestart.patch Patch15: bash-3.2-longjmp.dif Patch16: bash-4.0-setlocale.dif @@ -330,7 +329,6 @@ unset p %patch10 -p0 -b .printf %patch11 -p0 -b .plugins %patch12 -p0 -b .completion -%patch13 -p0 -b .history %patch14 -p0 -b .sigrestart %patch15 -p0 -b .longjmp %patch16 -p0 -b .setlocale