testing/bash
SHA256
3
0
Fork 0
forked from pool/bash
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=28

Browse Source
This commit is contained in:
OBS User unknown 2008-12-03 15:18:51 +00:00 committed by Git OBS Bridge
parent 972768adc7
commit 9ef2505f04
3 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bash-3.2-setlocale.dif Normal file
View File

@ -0,0 +1,33 @@
--- locale.c
+++ locale.c 2008-11-25 13:26:15.482501498 +0000
@@ -42,6 +42,7 @@ extern int dump_translatable_strings, du
/* The current locale when the program begins */
static char *default_locale;
+static char fallback[128];
/* The current domain for textdomain(3). */
static char *default_domain;
@@ -294,7 +295,21 @@ get_locale_var (var)
if (locale == 0 || *locale == 0)
locale = lang;
if (locale == 0 || *locale == 0)
- locale = default_locale; /* system-dependent; not really portable. should it be "C"? */
+ {
+ char *ptr;
+ if (default_locale && *default_locale && (ptr = strstr(default_locale, var)) && (ptr = strchr(ptr, '=')) && ++ptr)
+ {
+ memset (fallback, 0, sizeof(fallback));
+ strncpy(fallback, ptr, sizeof(fallback)-1);
+
+ if ((ptr = strchr(fallback, ';')))
+ *ptr = '\0';
+
+ locale = fallback;
+ }
+ else
+ locale = default_locale; /* system-dependent; not really portable. should it be "C"? */
+ }
return (locale);
}

5
bash.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 25 14:41:50 CET 2008 - werner@suse.de
- Parse the return value of setlocale(LC_ALL) (bnc#447846)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 16 12:07:20 CEST 2008 - werner@suse.de Thu Oct 16 12:07:20 CEST 2008 - werner@suse.de

32
bash.spec
View File

@ -28,7 +28,7 @@ Recommends: bash-doc = %bash_vers
Suggests: command-not-found Suggests: command-not-found
AutoReqProv: on AutoReqProv: on
Version: 3.2 Version: 3.2
Release: 141 Release: 142
Summary: The GNU Bourne-Again Shell Summary: The GNU Bourne-Again Shell
Url: http://www.gnu.org/software/bash/bash.html Url: http://www.gnu.org/software/bash/bash.html
Source0: bash-%{bash_vers}.tar.bz2 Source0: bash-%{bash_vers}.tar.bz2
@ -54,6 +54,7 @@ Patch11: bash-3.1-loadables.dif
Patch12: bash-3.2-valgrind.patch Patch12: bash-3.2-valgrind.patch
Patch14: bash-3.2-sigrestart.patch Patch14: bash-3.2-sigrestart.patch
Patch15: bash-3.2-longjmp.dif Patch15: bash-3.2-longjmp.dif
Patch16: bash-3.2-setlocale.dif
Patch20: readline-%{rl_vers}.dif Patch20: readline-%{rl_vers}.dif
Patch21: readline-4.3-input.dif Patch21: readline-4.3-input.dif
Patch22: readline-5.2-wrap.patch Patch22: readline-5.2-wrap.patch
@ -85,7 +86,7 @@ Group: Documentation/Man
Provides: bash:%{_infodir}/bash.info.gz Provides: bash:%{_infodir}/bash.info.gz
PreReq: %install_info_prereq PreReq: %install_info_prereq
Version: 3.2 Version: 3.2
Release: 100 Release: 101
AutoReqProv: on AutoReqProv: on
%description -n bash-doc %description -n bash-doc
@ -105,7 +106,7 @@ Summary: The Readline Library
Group: System/Libraries Group: System/Libraries
Provides: bash:/%{_lib}/libreadline.so.5 Provides: bash:/%{_lib}/libreadline.so.5
Version: 5.2 Version: 5.2
Release: 100 Release: 101
Recommends: readline-doc = %{version} Recommends: readline-doc = %{version}
Provides: readline = 5.2 Provides: readline = 5.2
Obsoletes: readline <= 5.2 Obsoletes: readline <= 5.2
@ -129,7 +130,7 @@ Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: bash:%{_libdir}/libreadline.a Provides: bash:%{_libdir}/libreadline.a
Version: 5.2 Version: 5.2
Release: 141 Release: 142
Requires: libreadline5 = %{version} Requires: libreadline5 = %{version}
Requires: ncurses-devel Requires: ncurses-devel
Recommends: readline-doc = %{version} Recommends: readline-doc = %{version}
@ -153,7 +154,7 @@ Group: System/Libraries
Provides: readline:%{_infodir}/readline.info.gz Provides: readline:%{_infodir}/readline.info.gz
PreReq: %install_info_prereq PreReq: %install_info_prereq
Version: 5.2 Version: 5.2
Release: 100 Release: 101
AutoReqProv: on AutoReqProv: on
%description -n readline-doc %description -n readline-doc
@ -189,6 +190,7 @@ unset p
%patch12 -p0 -b .valgrind %patch12 -p0 -b .valgrind
%patch14 -p0 -b .sigrestart %patch14 -p0 -b .sigrestart
%patch15 -p0 -b .longjmp %patch15 -p0 -b .longjmp
%patch16 -p0 -b .setlocale
%patch21 -p0 -b .zerotty %patch21 -p0 -b .zerotty
%patch22 -p0 -b .wrap %patch22 -p0 -b .wrap
%patch23 -p0 -b .conf %patch23 -p0 -b .conf
@ -438,6 +440,8 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
%doc %{_defaultdocdir}/readline/ %doc %{_defaultdocdir}/readline/
%changelog %changelog
* Tue Nov 25 2008 werner@suse.de
- Parse the return value of setlocale(LC_ALL) (bnc#447846)
* Thu Oct 16 2008 werner@suse.de * Thu Oct 16 2008 werner@suse.de
- Let's avoid not needed library dependencies (bnc#439051) - Let's avoid not needed library dependencies (bnc#439051)
* Mon Sep 01 2008 prusnak@suse.cz * Mon Sep 01 2008 prusnak@suse.cz
@ -493,7 +497,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
- add ncurses-devel requires to readline-devel - add ncurses-devel requires to readline-devel
* Mon Mar 26 2007 rguenther@suse.de * Mon Mar 26 2007 rguenther@suse.de
- Add bison and ncurses-devel BuildRequires. - Add bison and ncurses-devel BuildRequires.
* Wed Mar 07 2007 rguenther@suse.de * Tue Mar 06 2007 rguenther@suse.de
- Fix order of changelog entries. Remove duplicate entry. - Fix order of changelog entries. Remove duplicate entry.
* Wed Feb 28 2007 werner@suse.de * Wed Feb 28 2007 werner@suse.de
- Don't access buffer but resulting pointer for array element names - Don't access buffer but resulting pointer for array element names
@ -626,7 +630,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
- Fix prompt problem with invisible characters (bug #36919) - Fix prompt problem with invisible characters (bug #36919)
* Fri Sep 17 2004 werner@suse.de * Fri Sep 17 2004 werner@suse.de
- Fix line wraping for newlines in prompt (bug #45519) - Fix line wraping for newlines in prompt (bug #45519)
* Thu Sep 16 2004 schwab@suse.de * Wed Sep 15 2004 schwab@suse.de
- Fix missing return value. - Fix missing return value.
* Sat Sep 11 2004 kukuk@suse.de * Sat Sep 11 2004 kukuk@suse.de
- Disable use of WCONTINUED as long as bash does not check if - Disable use of WCONTINUED as long as bash does not check if
@ -745,7 +749,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
- readline-devel should require readline - readline-devel should require readline
* Mon Jul 29 2002 werner@suse.de * Mon Jul 29 2002 werner@suse.de
- Expansion of `~user/<dir>' is like `/<dir>' - Expansion of `~user/<dir>' is like `/<dir>'
* Sun Jul 28 2002 kukuk@suse.de * Sat Jul 27 2002 kukuk@suse.de
- Remove not used tetex from neededforbuild - Remove not used tetex from neededforbuild
- Fix building of man2html (bash.html still broken) - Fix building of man2html (bash.html still broken)
* Fri Jul 19 2002 werner@suse.de * Fri Jul 19 2002 werner@suse.de
@ -810,7 +814,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
* Thu Apr 12 2001 werner@suse.de * Thu Apr 12 2001 werner@suse.de
- Provide cpp macro OLD_READLINE for backwards compatibility - Provide cpp macro OLD_READLINE for backwards compatibility
at compile time with old readline interface at compile time with old readline interface
* Thu Apr 12 2001 ro@suse.de * Wed Apr 11 2001 ro@suse.de
- added split-alias as provides (again) - added split-alias as provides (again)
* Wed Apr 11 2001 werner@suse.de * Wed Apr 11 2001 werner@suse.de
- Update to bash 2.05 and readline 4.2 - Update to bash 2.05 and readline 4.2
@ -835,7 +839,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
- Upgrade to bash 2.04 and readline 4.1. - Upgrade to bash 2.04 and readline 4.1.
* Sun May 21 2000 kukuk@suse.de * Sun May 21 2000 kukuk@suse.de
- Use docdir - Use docdir
* Sun Apr 02 2000 bk@suse.de * Sat Apr 01 2000 bk@suse.de
- remove obviosly unneeded link /usr/lib/libreadline.so on s390 - remove obviosly unneeded link /usr/lib/libreadline.so on s390
* Tue Mar 14 2000 werner@suse.de * Tue Mar 14 2000 werner@suse.de
- Add locale patch to enable LC_NUMERIC handling - Add locale patch to enable LC_NUMERIC handling
@ -846,7 +850,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
* Tue Feb 15 2000 schwab@suse.de * Tue Feb 15 2000 schwab@suse.de
- Update config.{guess,sub} to latest version. - Update config.{guess,sub} to latest version.
- Fix spec file to create doc directory before installing into it. - Fix spec file to create doc directory before installing into it.
* Sat Jan 29 2000 werner@suse.de * Fri Jan 28 2000 werner@suse.de
- Add mailstat patch (handles mail directories) - Add mailstat patch (handles mail directories)
- Fix configuration (system is %%arch-suse-linux) - Fix configuration (system is %%arch-suse-linux)
- Fix segfault (job handling) - Fix segfault (job handling)
@ -875,7 +879,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
- update to bash 2.03, readline 4.0 - update to bash 2.03, readline 4.0
* Wed Jan 13 1999 @suse.de * Wed Jan 13 1999 @suse.de
- disabled `Broken pipe' messages - disabled `Broken pipe' messages
* Mon Dec 14 1998 bs@suse.de * Sun Dec 13 1998 bs@suse.de
- removed notify message - bash 2.0 is standard for a long time now. - removed notify message - bash 2.0 is standard for a long time now.
* Mon Dec 07 1998 florian@suse.de * Mon Dec 07 1998 florian@suse.de
- remove SSH_CLIENT-kludge as this cannot detect all correct cases - remove SSH_CLIENT-kludge as this cannot detect all correct cases
@ -903,7 +907,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
of LC_ALL of LC_ALL
* Sat Jul 05 1997 florian@suse.de * Sat Jul 05 1997 florian@suse.de
- add another bugfix from gnu.utils.bugs - add another bugfix from gnu.utils.bugs
* Tue Jun 24 1997 florian@suse.de * Mon Jun 23 1997 florian@suse.de
- create the history file with 0600 perms - create the history file with 0600 perms
- add minor bugfix to check for new email - add minor bugfix to check for new email
* Thu Jun 05 1997 florian@suse.de * Thu Jun 05 1997 florian@suse.de
@ -911,7 +915,7 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
- add bashref.info and newer FAQ - add bashref.info and newer FAQ
* Tue Apr 22 1997 bs@suse.de * Tue Apr 22 1997 bs@suse.de
- added FAQ and bashref.html to /usr/doc/packages/bash - added FAQ and bashref.html to /usr/doc/packages/bash
* Mon Apr 14 1997 florian@suse.de * Sun Apr 13 1997 florian@suse.de
- update to bash 2.0 with lots of patches from gnu.utils.bugs - update to bash 2.0 with lots of patches from gnu.utils.bugs
Mon Sep 2 02:48:35 MET DST 1996 Mon Sep 2 02:48:35 MET DST 1996
new version with security patches new version with security patches