alexlau/bash-custom-action
1
0
Fork 0
Code Pull Requests Actions Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2007-12-05 22:45:24 +00:00 committed by Git OBS Bridge
parent aaa7b46270
commit 2e8f6e1876
5 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bash-3.2.dif
View File

@ -1,6 +1,6 @@
--- .pkgextract
+++ .pkgextract 2006-03-27 14:15:25.000000000 +0200
@@ -0,0 +1,15 @@
@@ -0,0 +1,17 @@
+tar Oxfj ../bash-3.2-patches.tar.bz2 | patch -p0 -s
+patch -p0 -s --suffix=".manual" < ../bash-2.03-manual.patch
+patch -p0 -s --suffix=".security" < ../bash-2.05a-security.patch
@ -17,8 +17,9 @@
+patch -p0 -s --suffix=".zerotty" < ../readline-4.3-input.dif
+patch -p0 -s --suffix=".wrap" < ../readline-5.2-wrap.patch
+patch -p0 -s --suffix=".conf" < ../readline-5.2-conf.patch
+patch -p0 -s --suffix=".input" < ../readline-5.1-input.patch
--- config-top.h
+++ config-top.h 2006-03-27 14:15:25.000000000 +0200
+++ config-top.h 2007-12-04 15:44:39.314025629 +0100
@@ -52,14 +52,14 @@
/* The default value of the PATH variable. */
#ifndef DEFAULT_PATH_VALUE
@ -36,7 +37,7 @@
#endif
/* Default primary and secondary prompt strings. */
@@ -73,14 +73,14 @@
@@ -73,15 +73,15 @@
#define KSH_COMPATIBLE_SELECT
/* System-wide .bashrc file for interactive shells. */
@ -54,6 +55,8 @@
/* Define this if you want bash to try to check whether it's being run by
sshd and source the .bashrc if so (like the rshd behavior). */
-/* #define SSH_SOURCE_BASHRC */
+#define SSH_SOURCE_BASHRC
--- general.h
+++ general.h 2006-03-27 14:15:25.000000000 +0200
@@ -21,10 +21,13 @@
@ -129,7 +132,7 @@
/* Need to get the argument to a -c option processed in the
--- subst.c
+++ subst.c 2006-03-27 14:15:25.000000000 +0200
@@ -2707,6 +2707,7 @@ call_expand_word_internal (w, q, i, c, e
@@ -2717,6 +2717,7 @@ call_expand_word_internal (w, q, i, c, e
last_command_exit_value = EXECUTION_FAILURE;
exp_jump_to_top_level ((result == &expand_word_error) ? DISCARD : FORCE_EOF);
/* NOTREACHED */

6
bash.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 4 16:44:05 CET 2007 - werner@suse.de
- Extend fix for off-by-one error in libreadline (bug #274120)
- Enable ssh detection in the bash (bug #345570)
-------------------------------------------------------------------
Thu Sep 20 15:10:06 CEST 2007 - werner@suse.de

17
bash.spec
View File

@ -19,7 +19,7 @@ Group: System/Shells
Recommends: bash-doc = %bash_vers
AutoReqProv: on
Version: 3.2
Release: 59
Release: 70
Summary: The GNU Bourne-Again Shell
Url: http://www.gnu.org/software/bash/bash.html
Source0: bash-%{bash_vers}.tar.bz2
@ -44,6 +44,7 @@ Patch20: readline-%{rl_vers}.dif
Patch21: readline-4.3-input.dif
Patch22: readline-5.2-wrap.patch
Patch23: readline-5.2-conf.patch
Patch24: readline-5.1-input.patch
Patch30: readline-5.1-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -66,7 +67,7 @@ Summary: Documentation how to Use the GNU Bourne-Again Shell
Group: Documentation/Man
Provides: bash:/usr/share/info/bash.info.gz
Version: 3.2
Release: 18
Release: 29
AutoReqProv: on
%description -n bash-doc
@ -85,7 +86,7 @@ Summary: The Readline Library
Group: System/Libraries
Provides: bash:/%{_lib}/libreadline.so.5
Version: 5.2
Release: 18
Release: 29
Recommends: readline-doc = %{version}
Provides: readline = 5.2
Obsoletes: readline <= 5.2
@ -108,7 +109,7 @@ Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/C and C++
Provides: bash:/usr/%{_lib}/libreadline.a
Version: 5.2
Release: 59
Release: 70
Requires: libreadline5 = %{version}
Requires: ncurses-devel
Requires: /%{_lib}/libhistory.so.%{rl_vers}
@ -132,7 +133,7 @@ Summary: Documentation how to Use and Programm with the Readline Library
Group: System/Libraries
Provides: readline:/usr/share/info/readline.info.gz
Version: 5.2
Release: 18
Release: 29
AutoReqProv: on
%description -n readline-doc
@ -181,6 +182,7 @@ unset p
%patch21 -p0 -b .zerotty
%patch22 -p0 -b .wrap
%patch23 -p0 -b .conf
%patch24 -p0 -b .input
%patch0 -p0
cd ../readline-%{rl_vers}
for p in ../readline-%{rl_vers}-patches/*; do
@ -191,6 +193,7 @@ done
%patch21 -p2 -b .zerotty
%patch22 -p2 -b .wrap
%patch23 -p2 -b .conf
%patch24 -p2 -b .input
%patch30 -p0 -b .destdir
%patch20 -p0
@ -392,7 +395,11 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_infodir}/history.info.gz
%doc %{_infodir}/readline.info.gz
%doc %{_defaultdocdir}/readline/
%changelog
* Tue Dec 04 2007 - werner@suse.de
- Extend fix for off-by-one error in libreadline (bug #274120)
- Enable ssh detection in the bash (bug #345570)
* Thu Sep 20 2007 - werner@suse.de
- Remove error triggering path requirement (bug #326751)
* Mon Aug 27 2007 - schwab@suse.de

11
readline-5.1-input.patch Normal file
View File

@ -0,0 +1,11 @@
--- lib/readline/input.c
+++ lib/readline/input.c 2007-05-11 10:42:11.000000000 +0200
@@ -151,7 +151,7 @@
{
pop_index--;
if (pop_index < 0)
- pop_index = ibuffer_len - 1;
+ pop_index = ibuffer_len;
ibuffer[pop_index] = key;
return (1);
}

5
readline-5.2.dif
View File

@ -1,10 +1,11 @@
--- .pkgextract
+++ .pkgextract 2005-12-09 17:09:26.000000000 +0100
@@ -0,0 +1,5 @@
+#tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s
@@ -0,0 +1,6 @@
+tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s
+patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif
+patch -p2 -s --suffix=".wrap" < ../readline-5.2-wrap.patch
+patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch
+patch -p2 -s --suffix=".input" < ../readline-5.1-input.patch
+patch -p0 -s --suffix=".destdir" < ../readline-5.1-destdir.patch
--- Makefile.in
+++ Makefile.in 2005-12-09 17:09:26.000000000 +0100