OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Sep-2004 09:18:58
Branch: HEAD Handle: 2004090908185800
Modified files:
openpkg-src/bash bash.patch bash.spec
Log:
upgrading package: bash 3.0.0 -> 3.0.13
Summary:
Revision Changes Path
1.11 +0 -59 openpkg-src/bash/bash.patch
1.55 +17 -7 openpkg-src/bash/bash.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 bash.patch
--- openpkg-src/bash/bash.patch 11 Aug 2004 13:20:46 -0000 1.10
+++ openpkg-src/bash/bash.patch 9 Sep 2004 07:18:58 -0000 1.11
@@ -148,31 +148,6 @@
-----------------------------------------------------------------------------
-Fix display handling of multi-line prompts.
-
-Index: lib/readline/display.c
---- lib/readline/display.c.orig 2004-05-28 04:57:51 +0200
-+++ lib/readline/display.c 2004-07-28 20:17:43 +0200
-@@ -351,14 +351,14 @@
- local_prompt = expand_prompt (p, &prompt_visible_length,
- &prompt_last_invisible,
- (int *)NULL,
-- (int *)NULL);
-+ &prompt_physical_chars);
- c = *t; *t = '\0';
- /* The portion of the prompt string up to and including the
- final newline is now null-terminated. */
- local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
- (int *)NULL,
- &prompt_invis_chars_first_line,
-- &prompt_physical_chars);
-+ (int *)NULL);
- *t = c;
- return (prompt_prefix_length);
- }
-
------------------------------------------------------------------------------
-
Fix timezone handling for HPUX
Index: lib/sh/strftime.c
@@ -200,37 +175,3 @@
off = -zone.tz_minuteswest;
#endif /* !HAVE_TZNAME */
------------------------------------------------------------------------------
-
-Fix segfault when accessing an unset array.
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00026.html
-
-Index: arrayfunc.c
---- arrayfunc.c.orig 2003-12-19 06:03:09 +0100
-+++ arrayfunc.c 2004-08-11 15:17:03 +0200
-@@ -611,7 +611,7 @@
- var = find_variable (t);
-
- free (t);
-- return var;
-+ return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
- }
-
- /* Return a string containing the elements in the array and subscript
-
------------------------------------------------------------------------------
-
-Fix nested brace vs. variable expansion.
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00056.html
-
-Index: braces.c
---- braces.c.orig 2003-12-04 17:09:52 +0100
-+++ braces.c 2004-08-11 15:18:14 +0200
-@@ -402,6 +402,7 @@
- {
- pass_next = 1;
- i++;
-+ level++;
- continue;
- }
- #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 bash.spec
--- openpkg-src/bash/bash.spec 11 Aug 2004 13:20:46 -0000 1.54
+++ openpkg-src/bash/bash.spec 9 Sep 2004 07:18:58 -0000 1.55
@@ -26,8 +26,8 @@
# package version
%define V_base_real 3.0
%define V_base_comp 30
-%define V_plvl_raw 0
-%define V_plvl_pad 000
+%define V_plvl_raw 13
+%define V_plvl_pad 013
# package information
Name: bash
@@ -40,12 +40,25 @@
Group: Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20040811
+Release: 20040909
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
Source1: profile
Patch0: bash.patch
+Patch1:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-001
+Patch2:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-002
+Patch3:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-003
+Patch4:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-004
+Patch5:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-005
+Patch6:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-006
+Patch7:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-007
+Patch8:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-008
+Patch9:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-009
+Patch10:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-010
+Patch11:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-011
+Patch12:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-012
+Patch13:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-013
# build information
Prefix: %{l_prefix}
@@ -77,15 +90,12 @@
%prep
# unpack and patch distribution
%setup -q -n bash-%{V_base_real}
- %patch -p0
+ %patch -p0 -P 0 1 2 3 4 5 6 7 8 9 10 11 12 13
# brand with OpenPKG release and fix patchlevel
%{l_shtool} subst \
-e 's;@l_openpkg_release@;%{l_openpkg_release};' \
version.c
- %{l_shtool} subst \
- -e 's;\(PATCHLEVEL\) 0;\1 %{V_plvl_raw};' \
- patchlevel.h
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
