package/bash/0034-patchlevel-34.patch

   1 From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-034
   2
   3 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
   4
   5                              BASH PATCH REPORT
   6                              =================
   7
   8 Bash-Release:   4.3
   9 Patch-ID:       bash43-034
  10
  11 Bug-Reported-by:        Dreamcat4 <dreamcat4@gmail.com>
  12 Bug-Reference-ID:       <CAN39uTpAEs2GFu4ebC_SfSVMRTh-DJ9YanrY4BZZ3OO+CCHjng@mail.gmail.com>
  13 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2015-05/msg00001.html
  14
  15 Bug-Description:
  16
  17 If neither the -f nor -v options is supplied to unset, and a name argument is
  18 found to be a function and unset, subsequent name arguments are not treated as
  19 variables before attempting to unset a function by that name.
  20
  21 Patch (apply with `patch -p0'):
  22
  23 *** a/bash-4.3-patched/builtins/set.def 2013-04-19 07:20:34.000000000 -0400
  24 --- b/builtins/set.def  2015-05-05 13:25:36.000000000 -0400
  25 ***************
  26 *** 752,758 ****
  27 --- 797,805 ----
  28   {
  29     int unset_function, unset_variable, unset_array, opt, nameref, any_failed;
  30 +   int global_unset_func, global_unset_var;
  31     char *name;
  32
  33     unset_function = unset_variable = unset_array = nameref = any_failed = 0;
  34 +   global_unset_func = global_unset_var = 0;
  35
  36     reset_internal_getopt ();
  37 ***************
  38 *** 762,769 ****
  39         {
  40         case 'f':
  41 !         unset_function = 1;
  42           break;
  43         case 'v':
  44 !         unset_variable = 1;
  45           break;
  46         case 'n':
  47 --- 809,816 ----
  48         {
  49         case 'f':
  50 !         global_unset_func = 1;
  51           break;
  52         case 'v':
  53 !         global_unset_var = 1;
  54           break;
  55         case 'n':
  56 ***************
  57 *** 778,782 ****
  58     list = loptend;
  59
  60 !   if (unset_function && unset_variable)
  61       {
  62         builtin_error (_("cannot simultaneously unset a function and a variable"));
  63 --- 825,829 ----
  64     list = loptend;
  65
  66 !   if (global_unset_func && global_unset_var)
  67       {
  68         builtin_error (_("cannot simultaneously unset a function and a variable"));
  69 ***************
  70 *** 796,799 ****
  71 --- 843,849 ----
  72         name = list->word->word;
  73
  74 +       unset_function = global_unset_func;
  75 +       unset_variable = global_unset_var;
  76 +
  77   #if defined (ARRAY_VARS)
  78         unset_array = 0;
  79
  80 *** a/bash-4.3/patchlevel.h     2012-12-29 10:47:57.000000000 -0500
  81 --- b/patchlevel.h      2014-03-20 20:01:28.000000000 -0400
  82 ***************
  83 *** 26,30 ****
  84      looks for to find the patch level (for the sccs version string). */
  85
  86 ! #define PATCHLEVEL 33
  87
  88   #endif /* _PATCHLEVEL_H_ */
  89 --- 26,30 ----
  90      looks for to find the patch level (for the sccs version string). */
  91
  92 ! #define PATCHLEVEL 34
  93
  94   #endif /* _PATCHLEVEL_H_ */