SliTaz Repositories

     1.1 --- a/bash/receipt	Fri Feb 18 01:18:35 2011 +0000
     1.2 +++ b/bash/receipt	Fri Feb 18 01:20:18 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="bash"
     1.7 -VERSION="4.1"
     1.8 +VERSION="4.2"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="The GNU bourne SHell."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -14,9 +14,7 @@
    1.13  # Rules to compile & install the temporary toolchain.
    1.14  cook_tmp_toolchain()
    1.15  {
    1.16 -	# Patch and then build.
    1.17  	cd $src
    1.18 -	patch -Np1 -i ../stuff/bash-4.1-fixes-3.patch
    1.19  	./configure --without-bash-malloc &&
    1.20  	make && make install
    1.21  }
    1.22 @@ -26,7 +24,6 @@
    1.23  {
    1.24  	# Patch and then build.
    1.25  	cd $src
    1.26 -	patch -Np1 -i ../stuff/bash-4.1-fixes-3.patch
    1.27  	./configure --bindir=/bin \
    1.28  		--enable-history --enable-alias  \
    1.29  		--disable-nls --without-bash-malloc \

     2.1 --- a/bash/stuff/bash-4.1-fixes-3.patch	Fri Feb 18 01:18:35 2011 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,166 +0,0 @@
     2.4 -Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
     2.5 -Date:                    2010-10-11
     2.6 -Initial Package Version: 4.1
     2.7 -Upstream Status:         Already in upstream patch repo
     2.8 -Origin:                  Upstream
     2.9 -Description:             This patch contains upstream patch numbers 1 thru 9.
    2.10 -
    2.11 -diff -Naur bash-4.1.orig/bashline.c bash-4.1/bashline.c
    2.12 ---- bash-4.1.orig/bashline.c	2009-10-24 19:10:19.000000000 +0100
    2.13 -+++ bash-4.1/bashline.c	2010-10-11 22:39:38.213029316 +0100
    2.14 -@@ -1680,7 +1680,7 @@
    2.15 -      a single match (multiple matches that end up reducing the number of
    2.16 -      characters in the common prefix are bad) will ever be returned on
    2.17 -      regular completion. */
    2.18 --  if (glob_pattern_p (hint))
    2.19 -+  if (globpat)
    2.20 -     {
    2.21 -       if (state == 0)
    2.22 - 	{
    2.23 -diff -Naur bash-4.1.orig/builtins/declare.def bash-4.1/builtins/declare.def
    2.24 ---- bash-4.1.orig/builtins/declare.def	2009-11-26 00:42:00.000000000 +0000
    2.25 -+++ bash-4.1/builtins/declare.def	2010-10-11 22:39:38.397029565 +0100
    2.26 -@@ -512,7 +512,7 @@
    2.27 - 	    {
    2.28 - 	      /* let bind_{array,assoc}_variable take care of this. */
    2.29 - 	      if (assoc_p (var))
    2.30 --		bind_assoc_variable (var, name, "0", value, aflags);
    2.31 -+		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
    2.32 - 	      else
    2.33 - 		bind_array_variable (name, 0, value, aflags);
    2.34 - 	    }
    2.35 -diff -Naur bash-4.1.orig/builtins/printf.def bash-4.1/builtins/printf.def
    2.36 ---- bash-4.1.orig/builtins/printf.def	2009-11-20 20:31:23.000000000 +0000
    2.37 -+++ bash-4.1/builtins/printf.def	2010-10-11 22:39:38.381029548 +0100
    2.38 -@@ -117,7 +117,7 @@
    2.39 -     else if (have_fieldwidth) \
    2.40 -       nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
    2.41 -     else if (have_precision) \
    2.42 --      nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
    2.43 -+      nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
    2.44 -     else \
    2.45 -       nw = vflag ? vbprintf (f, func) : printf (f, func); \
    2.46 -     tw += nw; \
    2.47 -@@ -172,7 +172,7 @@
    2.48 - #endif
    2.49 - 
    2.50 - #if !HAVE_VSNPRINTF
    2.51 --extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
    2.52 -+extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
    2.53 - #endif
    2.54 - 
    2.55 - static void printf_erange __P((char *));
    2.56 -diff -Naur bash-4.1.orig/builtins/read.def bash-4.1/builtins/read.def
    2.57 ---- bash-4.1.orig/builtins/read.def	2009-10-08 16:35:46.000000000 +0100
    2.58 -+++ bash-4.1/builtins/read.def	2010-10-11 22:39:38.321029469 +0100
    2.59 -@@ -615,14 +615,15 @@
    2.60 -   if (unbuffered_read == 0)
    2.61 -     zsyncfd (fd);
    2.62 - 
    2.63 --  interrupt_immediately--;
    2.64 --  terminate_immediately--;
    2.65 -   discard_unwind_frame ("read_builtin");
    2.66 - 
    2.67 -   retval = eof ? EXECUTION_FAILURE : EXECUTION_SUCCESS;
    2.68 - 
    2.69 - assign_vars:
    2.70 - 
    2.71 -+  interrupt_immediately--;
    2.72 -+  terminate_immediately--;
    2.73 -+
    2.74 - #if defined (ARRAY_VARS)
    2.75 -   /* If -a was given, take the string read, break it into a list of words,
    2.76 -      an assign them to `arrayname' in turn. */
    2.77 -diff -Naur bash-4.1.orig/lib/readline/complete.c bash-4.1/lib/readline/complete.c
    2.78 ---- bash-4.1.orig/lib/readline/complete.c	2009-11-29 23:39:30.000000000 +0000
    2.79 -+++ bash-4.1/lib/readline/complete.c	2010-10-11 22:39:38.189029310 +0100
    2.80 -@@ -2138,7 +2138,7 @@
    2.81 - 	 All other entries except "." and ".." match. */
    2.82 -       if (filename_len == 0)
    2.83 - 	{
    2.84 --	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
    2.85 -+	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
    2.86 - 	    continue;
    2.87 - 
    2.88 - 	  if (convfn[0] != '.' ||
    2.89 -@@ -2219,7 +2219,7 @@
    2.90 - 		temp[dirlen++] = '/';
    2.91 - 	    }
    2.92 - 
    2.93 --	  strcpy (temp + dirlen, entry->d_name);
    2.94 -+	  strcpy (temp + dirlen, convfn);
    2.95 - 	}
    2.96 -       else
    2.97 - 	temp = savestring (convfn);
    2.98 -diff -Naur bash-4.1.orig/patchlevel.h bash-4.1/patchlevel.h
    2.99 ---- bash-4.1.orig/patchlevel.h	2009-10-01 21:39:22.000000000 +0100
   2.100 -+++ bash-4.1/patchlevel.h	2010-10-11 22:39:38.433029614 +0100
   2.101 -@@ -25,6 +25,6 @@
   2.102 -    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
   2.103 -    looks for to find the patch level (for the sccs version string). */
   2.104 - 
   2.105 --#define PATCHLEVEL 0
   2.106 -+#define PATCHLEVEL 9
   2.107 - 
   2.108 - #endif /* _PATCHLEVEL_H_ */
   2.109 -diff -Naur bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c
   2.110 ---- bash-4.1.orig/print_cmd.c	2009-09-16 20:32:26.000000000 +0100
   2.111 -+++ bash-4.1/print_cmd.c	2010-10-11 22:39:38.357029519 +0100
   2.112 -@@ -113,6 +113,12 @@
   2.113 - 
   2.114 - #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
   2.115 - 
   2.116 -+#define PRINT_DEFERRED_HEREDOCS(x) \
   2.117 -+  do { \
   2.118 -+    if (deferred_heredocs) \
   2.119 -+      print_deferred_heredocs (x); \
   2.120 -+  } while (0)
   2.121 -+
   2.122 - /* Non-zero means the stuff being printed is inside of a function def. */
   2.123 - static int inside_function_def;
   2.124 - static int skip_this_indent;
   2.125 -@@ -560,13 +566,15 @@
   2.126 -      FOR_COM *for_command;
   2.127 - {
   2.128 -   print_for_command_head (for_command);
   2.129 --
   2.130 -   cprintf (";");
   2.131 -   newline ("do\n");
   2.132 -+
   2.133 -   indentation += indentation_amount;
   2.134 -   make_command_string_internal (for_command->action);
   2.135 -+  PRINT_DEFERRED_HEREDOCS ("");
   2.136 -   semicolon ();
   2.137 -   indentation -= indentation_amount;
   2.138 -+
   2.139 -   newline ("done");
   2.140 - }
   2.141 - 
   2.142 -diff -Naur bash-4.1.orig/sig.c bash-4.1/sig.c
   2.143 ---- bash-4.1.orig/sig.c	2009-08-14 21:31:52.000000000 +0100
   2.144 -+++ bash-4.1/sig.c	2010-10-11 22:39:38.421029599 +0100
   2.145 -@@ -655,6 +655,9 @@
   2.146 -     act.sa_flags |= SA_INTERRUPT;	/* XXX */
   2.147 -   else
   2.148 -     act.sa_flags |= SA_RESTART;		/* XXX */
   2.149 -+#else
   2.150 -+  if (sig == SIGCHLD)
   2.151 -+    act.sa_flags |= SA_RESTART;
   2.152 - #endif
   2.153 -   sigemptyset (&act.sa_mask);
   2.154 -   sigemptyset (&oact.sa_mask);
   2.155 -diff -Naur bash-4.1.orig/variables.c bash-4.1/variables.c
   2.156 ---- bash-4.1.orig/variables.c	2009-11-03 19:13:58.000000000 +0000
   2.157 -+++ bash-4.1/variables.c	2010-10-11 22:39:38.281029411 +0100
   2.158 -@@ -3808,6 +3808,11 @@
   2.159 - 
   2.160 -   if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
   2.161 -     {
   2.162 -+      /* Make sure we have a hash table to store the variable in while it is
   2.163 -+	 being propagated down to the global variables table.  Create one if
   2.164 -+	 we have to */
   2.165 -+      if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
   2.166 -+	shell_variables->table = hash_create (0);
   2.167 -       /* XXX - should we set v->context here? */
   2.168 -       v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
   2.169 -       if (shell_variables == global_variables)