patches/bash/bash51-007

   1                              BASH PATCH REPORT
   2                              =================
   3
   4 Bash-Release:   5.1
   5 Patch-ID:       bash51-007
   6
   7 Bug-Reported-by:        Tom Tromey <tom@tromey.com>
   8 Bug-Reference-ID:       <875z3u9fd0.fsf@tromey.com>
   9 Bug-Reference-URL:      https://lists.gnu.org/archive/html/bug-readline/2021-01/msg00009.html
  10
  11 Bug-Description:
  12
  13 The code to check readline versions in an inputrc file had the sense of the
  14 comparisons reversed.
  15
  16 Patch (apply with `patch -p0'):
  17
  18 *** ../bash-5.1-patched/lib/readline/bind.c     2020-10-26 10:03:14.000000000 -0400
  19 --- lib/readline/bind.c 2021-01-18 16:38:48.000000000 -0500
  20 ***************
  21 *** 1235,1239 ****
  22     else if (_rl_strnicmp (args, "version", 7) == 0)
  23       {
  24 !       int rlversion, versionarg, op, previ, major, minor;
  25
  26         _rl_parsing_conditionalized_out = 1;
  27 --- 1235,1239 ----
  28     else if (_rl_strnicmp (args, "version", 7) == 0)
  29       {
  30 !       int rlversion, versionarg, op, previ, major, minor, opresult;
  31
  32         _rl_parsing_conditionalized_out = 1;
  33 ***************
  34 *** 1295,1316 ****
  35         {
  36         case OP_EQ:
  37 !         _rl_parsing_conditionalized_out = rlversion == versionarg;
  38           break;
  39         case OP_NE:
  40 !         _rl_parsing_conditionalized_out = rlversion != versionarg;
  41           break;
  42         case OP_GT:
  43 !         _rl_parsing_conditionalized_out = rlversion > versionarg;
  44           break;
  45         case OP_GE:
  46 !         _rl_parsing_conditionalized_out = rlversion >= versionarg;
  47           break;
  48         case OP_LT:
  49 !         _rl_parsing_conditionalized_out = rlversion < versionarg;
  50           break;
  51         case OP_LE:
  52 !         _rl_parsing_conditionalized_out = rlversion <= versionarg;
  53           break;
  54         }
  55       }
  56     /* Check to see if the first word in ARGS is the same as the
  57 --- 1295,1317 ----
  58         {
  59         case OP_EQ:
  60 !         opresult = rlversion == versionarg;
  61           break;
  62         case OP_NE:
  63 !         opresult = rlversion != versionarg;
  64           break;
  65         case OP_GT:
  66 !         opresult = rlversion > versionarg;
  67           break;
  68         case OP_GE:
  69 !         opresult = rlversion >= versionarg;
  70           break;
  71         case OP_LT:
  72 !         opresult = rlversion < versionarg;
  73           break;
  74         case OP_LE:
  75 !         opresult = rlversion <= versionarg;
  76           break;
  77         }
  78 +       _rl_parsing_conditionalized_out = 1 - opresult;
  79       }
  80     /* Check to see if the first word in ARGS is the same as the
  81 *** ../bash-5.1/patchlevel.h    2020-06-22 14:51:03.000000000 -0400
  82 --- patchlevel.h        2020-10-01 11:01:28.000000000 -0400
  83 ***************
  84 *** 26,30 ****
  85      looks for to find the patch level (for the sccs version string). */
  86
  87 ! #define PATCHLEVEL 6
  88
  89   #endif /* _PATCHLEVEL_H_ */
  90 --- 26,30 ----
  91      looks for to find the patch level (for the sccs version string). */
  92
  93 ! #define PATCHLEVEL 7
  94
  95   #endif /* _PATCHLEVEL_H_ */