Browse Source

update to GNU Bash 2.05a

master
parent
commit
676f1e5e80
  1. 20
      bash/bash-2.05.patch.1
  2. 22
      bash/bash-2.05.patch.2
  3. 12
      bash/bash.spec

20
bash/bash-2.05.patch.1

@ -1,20 +0,0 @@
--- execute_cmd.c.orig Thu Mar 22 16:17:23 2001
+++ execute_cmd.c Tue Apr 10 11:29:09 2001
@@ -2792,6 +2792,8 @@
if (tc && (flags & CMD_IGNORE_RETURN))
tc->flags |= CMD_IGNORE_RETURN;
+ old_shell_function = this_shell_function;
+
if (subshell == 0)
{
begin_unwind_frame ("function_calling");
@@ -2878,6 +2880,8 @@
if (variable_context == 0 || this_shell_function == 0)
make_funcname_visible (0);
+
+ this_shell_function = old_shell_function;
return (result);
}

22
bash/bash-2.05.patch.2

@ -1,22 +0,0 @@
--- configure.orig Tue Jan 23 18:57:28 2001
+++ configure Tue Apr 10 11:29:11 2001
@@ -763,7 +763,7 @@
mips-irix6*) opt_bash_malloc=no ;; # needs 8-byte alignment
m68k-sysv) opt_bash_malloc=no ;; # fixes file descriptor leak in closedir
sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF
-#*-freebsd*) opt_bash_malloc=no ;; # they claim it's better
+*-freebsd*) opt_bash_malloc=no ;; # they claim it's better
*-aix*) opt_bash_malloc=no ;; # AIX machines
*-nextstep*) opt_bash_malloc=no ;; # NeXT machines running NeXTstep
*-macos*) opt_bash_malloc=no ;; # Apple MacOS X
--- support/config.guess.orig Mon Dec 18 16:43:18 2000
+++ support/config.guess Tue Apr 10 11:29:11 2001
@@ -697,7 +697,7 @@
*:FreeBSD:*:*)
if test -x /usr/bin/objformat; then
if test "elf" = "`/usr/bin/objformat`"; then
- echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
exit 0
fi
fi

12
bash/bash.spec

@ -25,20 +25,18 @@
# package information
Name: bash
Summary: Bourne-Again Shell
URL: http://www.gnu.org/software/bash/
URL: http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
Vendor: Free Software Foundation
Packager: The OpenPKG Project
Distribution: OpenPKG [EXP]
Group: Shell
License: GPL
Version: 2.05
Version: 2.05a
Release: %{l_branch}.0
# list of sources
Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{version}.tar.gz
Source1: profile
Patch0: bash-%{version}.patch.1
Patch1: bash-%{version}.patch.2
# build information
Prefix: %{l_prefix}
@ -57,8 +55,6 @@ AutoReqProv: no
%prep
%setup -q
%patch0 -p0
%patch1 -p0
%build
CC="%{l_cc}" \
@ -71,7 +67,7 @@ AutoReqProv: no
%{l_rpmtool} subst \
's;/etc/profile;%{l_prefix}/etc/bash/profile;' \
-- doc/bash.1
%{l_make} %{l_mflags -O}
%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT

Loading…
Cancel
Save