components/shell/bash/patches/bash52-024.patch

   1                              BASH PATCH REPORT
   2                              =================
   3
   4 Bash-Release:   5.2
   5 Patch-ID:       bash52-024
   6
   7 Bug-Reported-by:        Marco <maroloccio@gmail.com>
   8 Bug-Reference-ID:       <eaf9af76-c4ed-8b61-c517-22ed980529d3@gmail.com>
   9 Bug-Reference-URL:      https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00044.html
  10
  11 Bug-Description:
  12
  13 Fix bug where associative array compound assignment would not expand tildes
  14 in values.
  15
  16 Patch (apply with `patch -p0'):
  17
  18 *** ../bash-20230105/arrayfunc.c        Thu Jan  5 14:23:28 2023
  19 --- arrayfunc.c Wed Feb  8 16:27:48 2023
  20 ***************
  21 *** 651,655 ****
  22         }
  23
  24 !       aval = expand_subscript_string (v, 0);
  25         if (aval == 0)
  26         {
  27 --- 651,655 ----
  28         }
  29
  30 !       aval = expand_assignment_string_to_string (v, 0);
  31         if (aval == 0)
  32         {
  33 ***************
  34 *** 843,847 ****
  35         if (assoc_p (var))
  36         {
  37 !         val = expand_subscript_string (val, 0);
  38           if (val == 0)
  39             {
  40 --- 843,847 ----
  41         if (assoc_p (var))
  42         {
  43 !         val = expand_assignment_string_to_string (val, 0);
  44           if (val == 0)
  45             {
  46 ***************
  47 *** 1031,1035 ****
  48     nword[i++] = w[ind++];
  49
  50 !   t = expand_subscript_string (w+ind, 0);
  51     s = (t && strchr (t, CTLESC)) ? quote_escapes (t) : t;
  52     value = sh_single_quote (s ? s : "");
  53 --- 1031,1035 ----
  54     nword[i++] = w[ind++];
  55
  56 !   t = expand_assignment_string_to_string (w+ind, 0);
  57     s = (t && strchr (t, CTLESC)) ? quote_escapes (t) : t;
  58     value = sh_single_quote (s ? s : "");
  59 *** ../bash-20230201/subst.c    Mon Jan 30 16:19:46 2023
  60 --- subst.c     Mon Feb  6 16:25:22 2023
  61 ***************
  62 *** 10803,10807 ****
  63 --- 10803,10811 ----
  64     ret = (char *)NULL;
  65
  66 + #if 0
  67     td.flags = W_NOPROCSUB|W_NOTILDE|W_NOSPLIT2;        /* XXX - W_NOCOMSUB? */
  68 + #else
  69 +   td.flags = W_NOPROCSUB|W_NOSPLIT2;  /* XXX - W_NOCOMSUB? */
  70 + #endif
  71     td.word = savestring (string);              /* in case it's freed on error */
  72
  73
  74 *** ../bash-5.2/patchlevel.h    2020-06-22 14:51:03.000000000 -0400
  75 --- patchlevel.h        2020-10-01 11:01:28.000000000 -0400
  76 ***************
  77 *** 26,30 ****
  78      looks for to find the patch level (for the sccs version string). */
  79
  80 ! #define PATCHLEVEL 23
  81
  82   #endif /* _PATCHLEVEL_H_ */
  83 --- 26,30 ----
  84      looks for to find the patch level (for the sccs version string). */
  85
  86 ! #define PATCHLEVEL 24
  87
  88   #endif /* _PATCHLEVEL_H_ */