OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 23-Feb-2009 22:48:28
Branch: HEAD Handle: 2009022321482800
Modified files:
openpkg-src/bash bash.patch bash.spec
Log:
upgrading package: bash 3.2.48 -> 4.0.0
Summary:
Revision Changes Path
1.20 +22 -160 openpkg-src/bash/bash.patch
1.103 +10 -104 openpkg-src/bash/bash.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 bash.patch
--- openpkg-src/bash/bash.patch 30 Apr 2008 18:13:34 -0000 1.19
+++ openpkg-src/bash/bash.patch 23 Feb 2009 21:48:28 -0000 1.20
@@ -2,9 +2,9 @@
line options "-v" and "-x". It is derived from Debian GNU/Linux.
Index: doc/bash.1
---- doc/bash.1.orig 2006-10-03 14:54:26 +0200
-+++ doc/bash.1 2008-03-28 15:28:44 +0100
-@@ -116,6 +116,12 @@
+--- doc/bash.1.orig 2009-02-18 21:13:56 +0100
++++ doc/bash.1 2009-02-21 20:52:27 +0100
+@@ -115,6 +115,12 @@
This option allows the positional parameters to be set
when invoking an interactive shell.
.TP
@@ -23,9 +23,9 @@
Port to HP-UX 11i and similar less smart platforms.
Index: configure
---- configure.orig 2006-09-26 17:06:01 +0200
-+++ configure 2008-03-28 15:28:44 +0100
-@@ -1517,6 +1517,7 @@
+--- configure.orig 2009-02-09 14:33:13 +0100
++++ configure 2009-02-21 20:52:27 +0100
+@@ -2198,6 +2198,7 @@
*-beos*) opt_bash_malloc=no ;; # they say it's suitable
*-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment
*-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by
Microsoft
@@ -33,7 +33,7 @@
esac
# memory scrambling on free()
-@@ -1662,7 +1663,7 @@
+@@ -2345,7 +2346,7 @@
else
MALLOC_LIB=
@@ -43,8 +43,8 @@
MALLOC_DEP=
fi
Index: syntax.h
---- syntax.h.orig 2006-06-22 19:45:22 +0200
-+++ syntax.h 2008-03-28 15:28:44 +0100
+--- syntax.h.orig 2009-01-04 20:32:42 +0100
++++ syntax.h 2009-02-21 20:52:27 +0100
@@ -21,6 +21,8 @@
#ifndef _SYNTAX_H_
#define _SYNTAX_H_
@@ -60,26 +60,26 @@
This adds the OpenPKG packaging brand.
Index: version.c
---- version.c.orig 2005-05-16 17:58:34 +0200
-+++ version.c 2008-03-28 15:28:44 +0100
-@@ -77,7 +77,7 @@
+--- version.c.orig 2009-01-04 20:32:46 +0100
++++ version.c 2009-02-21 20:53:12 +0100
+@@ -83,7 +83,7 @@
show_shell_version (extended)
int extended;
{
-- printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
-+ printf ("GNU bash, version %s (%s) [...@l_openpkg_release@]\n",
shell_version_string (), MACHTYPE);
+- printf (_("GNU bash, version %s (%s)\n"), shell_version_string (),
MACHTYPE);
++ printf (_("GNU bash, version %s (%s) [...@l_openpkg_release@]\n"),
shell_version_string (), MACHTYPE);
if (extended)
- printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
- }
+ {
+ printf ("%s\n", _(bash_copyright));
-----------------------------------------------------------------------------
Ensure that Autoconf and friends are not run.
Index: Makefile.in
---- Makefile.in.orig 2006-08-17 20:03:35 +0200
-+++ Makefile.in 2008-03-28 15:28:44 +0100
-@@ -687,7 +687,6 @@
+--- Makefile.in.orig 2009-01-04 20:32:39 +0100
++++ Makefile.in 2009-02-21 20:52:27 +0100
+@@ -704,7 +704,6 @@
# comment out for distribution
$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
$(srcdir)/config.h.in
@@ -94,9 +94,9 @@
of 0 does not malloc buffer as expected by Bash code.
Index: builtins/common.c
---- builtins/common.c.orig 2008-04-30 20:08:34 +0200
-+++ builtins/common.c 2008-04-30 20:09:18 +0200
-@@ -475,10 +479,11 @@
+--- builtins/common.c.orig 2009-01-16 05:06:55 +0100
++++ builtins/common.c 2009-02-21 20:52:27 +0100
+@@ -553,10 +553,11 @@
if (the_current_working_directory == 0)
{
@@ -110,141 +110,3 @@
#endif
if (the_current_working_directory == 0)
{
-
------------------------------------------------------------------------------
-
-Provide the y.tab.[ch] patches corresponding to what Bash 3.2 patches
-001-039 apply to parse.y in order to not require that this package has
-dependencies to the GNU bison package.
-
---- y.tab.c.orig 2008-04-30 19:34:48 +0200
-+++ y.tab.c 2008-04-30 19:39:08 +0200
-@@ -2359,6 +2359,7 @@
- #define PST_CMDTOKEN 0x1000 /* command token OK - unused */
- #define PST_COMPASSIGN 0x2000 /* parsing x=(...) compound
assignment */
- #define PST_ASSIGNOK 0x4000 /* assignment statement ok in
this context */
-+#define PST_REGEXP 0x8000 /* parsing an ERE/BRE as a single word
*/
-
- /* Initial size to allocate for tokens, and the
- amount to grow them by. */
-@@ -3921,6 +3922,9 @@
- return (character);
- }
-
-+ if (parser_state & PST_REGEXP)
-+ goto tokword;
-+
- /* Shell meta-characters. */
- if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0))
- {
-@@ -4028,6 +4032,7 @@
- if MBTEST(character == '-' && (last_read_token == LESS_AND ||
last_read_token == GREATER_AND))
- return (character);
-
-+tokword:
- /* Okay, if we got this far, we have to read a word. Read one,
- and then check it against the known ones. */
- result = read_token_word (character);
-@@ -4065,7 +4070,7 @@
- /* itrace("parse_matched_pair: open = %c close = %c", open, close); */
- count = 1;
- pass_next_character = backq_backslash = was_dollar = in_comment = 0;
-- check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags
& P_DQUOTE) == 0;
-+ check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc !=
'"' && (flags & P_DQUOTE) == 0;
-
- /* RFLAGS is the set of flags we want to pass to recursive calls. */
- rflags = (qc == '"') ? P_DQUOTE : (flags & P_DQUOTE);
-@@ -4532,8 +4537,11 @@
- if (tok == WORD && test_binop (yylval.word->word))
- op = yylval.word;
- #if defined (COND_REGEXP)
-- else if (tok == WORD && STREQ (yylval.word->word,"=~"))
-- op = yylval.word;
-+ else if (tok == WORD && STREQ (yylval.word->word, "=~"))
-+ {
-+ op = yylval.word;
-+ parser_state |= PST_REGEXP;
-+ }
- #endif
- else if (tok == '<' || tok == '>')
- op = make_word_from_token (tok); /* ( */
-@@ -4564,6 +4572,7 @@
-
- /* rhs */
- tok = read_token (READ);
-+ parser_state &= ~PST_REGEXP;
- if (tok == WORD)
- {
- tright = make_cond_node (COND_TERM, yylval.word, (COND_COM *)NULL,
(COND_COM *)NULL);
-@@ -4697,7 +4706,7 @@
- if (pass_next_character)
- {
- pass_next_character = 0;
-- goto got_character;
-+ goto got_escaped_character;
- }
-
- cd = current_delimiter (dstack);
-@@ -4749,9 +4758,34 @@
- goto next_character;
- }
-
-+#ifdef COND_REGEXP
-+ /* When parsing a regexp as a single word inside a conditional
command,
-+ we need to special-case characters special to both the shell and
-+ regular expressions. Right now, that is only '(' and '|'. */ /*)*/
-+ if MBTEST((parser_state & PST_REGEXP) && (character == '(' ||
character == '|')) /*)*/
-+ {
-+ if (character == '|')
-+ goto got_character;
-+
-+ push_delimiter (dstack, character);
-+ ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
-+ pop_delimiter (dstack);
-+ if (ttok == &matched_pair_error)
-+ return -1; /* Bail immediately. */
-+ RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2,
-+ token_buffer_size, TOKEN_DEFAULT_GROW_SIZE);
-+ token[token_index++] = character;
-+ strcpy (token + token_index, ttok);
-+ token_index += ttoklen;
-+ FREE (ttok);
-+ dollar_present = all_digit_token = 0;
-+ goto next_character;
-+ }
-+#endif /* COND_REGEXP */
-+
- #ifdef EXTENDED_GLOB
- /* Parse a ksh-style extended pattern matching specification. */
-- if (extended_glob && PATTERN_CHAR (character))
-+ if MBTEST(extended_glob && PATTERN_CHAR (character))
- {
- peek_char = shell_getc (1);
- if MBTEST(peek_char == '(') /* ) */
-@@ -4946,12 +4980,14 @@
-
- got_character:
-
-- all_digit_token &= DIGIT (character);
-- dollar_present |= character == '$';
--
- if (character == CTLESC || character == CTLNUL)
- token[token_index++] = CTLESC;
-
-+ got_escaped_character:
-+
-+ all_digit_token &= DIGIT (character);
-+ dollar_present |= character == '$';
-+
- token[token_index++] = character;
-
- RESIZE_MALLOCED_BUFFER (token, token_index, 1, token_buffer_size,
-@@ -5660,7 +5696,7 @@
- if (promptvars || posixly_correct)
- {
- last_exit_value = last_command_exit_value;
-- list = expand_prompt_string (result, Q_DOUBLE_QUOTES);
-+ list = expand_prompt_string (result, Q_DOUBLE_QUOTES, 0);
- free (result);
- result = string_list (list);
- dispose_words (list);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
============================================================================
$ cvs diff -u -r1.102 -r1.103 bash.spec
--- openpkg-src/bash/bash.spec 19 Nov 2008 07:02:47 -0000 1.102
+++ openpkg-src/bash/bash.spec 23 Feb 2009 21:48:28 -0000 1.103
@@ -22,10 +22,10 @@
##
# package version
-%define V_base_real 3.2
-%define V_base_comp 32
-%define V_plvl_raw 48
-%define V_plvl_pad 048
+%define V_base_real 4.0
+%define V_base_comp 40
+%define V_plvl_raw 0
+%define V_plvl_pad 000
# package information
Name: bash
@@ -38,60 +38,12 @@
Group: Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20081119
+Release: 20090223
# 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
-Patch14:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-014
-Patch15:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-015
-Patch16:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-016
-Patch17:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-017
-Patch18:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-018
-Patch19:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-019
-Patch20:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-020
-Patch21:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-021
-Patch22:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-022
-Patch23:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-023
-Patch24:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-024
-Patch25:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-025
-Patch26:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-026
-Patch27:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-027
-Patch28:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-028
-Patch29:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-029
-Patch30:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-030
-Patch31:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-031
-Patch32:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-032
-Patch33:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-033
-Patch34:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-034
-Patch35:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-035
-Patch36:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-036
-Patch37:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-037
-Patch38:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-038
-Patch39:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-039
-Patch40:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-040
-Patch41:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-041
-Patch42:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-042
-Patch43:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-043
-Patch44:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-044
-Patch45:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-045
-Patch46:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-046
-Patch47:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-047
-Patch48:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-048
# build information
Prefix: %{l_prefix}
@@ -124,55 +76,7 @@
%prep
# unpack and patch distribution
%setup -q -n bash-%{V_base_real}
- %patch -p0 -P 1
- %patch -p0 -P 2
- %patch -p0 -P 3
- %patch -p0 -P 4
- %patch -p0 -P 5
- %patch -p0 -P 6
- %patch -p0 -P 7
- %patch -p0 -P 8
- %patch -p0 -P 9
- %patch -p0 -P 10
- %patch -p0 -P 11
- %patch -p0 -P 12
- %patch -p0 -P 13
- %patch -p0 -P 14
- %patch -p0 -P 15
- %patch -p0 -P 16
- %patch -p0 -P 17
- %patch -p0 -P 18
- %patch -p0 -P 19
- %patch -p0 -P 20
- %patch -p0 -P 21
- %patch -p0 -P 22
- %patch -p0 -P 23
- %patch -p0 -P 24
- %patch -p0 -P 25
- %patch -p0 -P 26
- %patch -p0 -P 27
- %patch -p0 -P 28
- %patch -p0 -P 29
- %patch -p0 -P 30
- %patch -p0 -P 31
- %patch -p0 -P 32
- %patch -p0 -P 33
- %patch -p0 -P 34
- %patch -p0 -P 35
- %patch -p0 -P 36
- %patch -p0 -P 37
- %patch -p0 -P 38
- %patch -p0 -P 39
- %patch -p0 -P 40
- %patch -p0 -P 41
- %patch -p0 -P 42
- %patch -p0 -P 43
- %patch -p0 -P 44
- %patch -p0 -P 45
- %patch -p0 -P 46
- %patch -p0 -P 47
- %patch -p0 -P 48
- %patch -p0 -P 0
+ %patch -p0
sleep 1
touch y.tab.[ch]
touch configure config.h.in
@@ -197,9 +101,12 @@
) >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ GREP="grep" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
--disable-multibyte \
--enable-debugger \
--without-gnu-malloc \
@@ -218,8 +125,7 @@
%install
# install package
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
# strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
