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

   1                              BASH PATCH REPORT
   2                              =================
   3
   4 Bash-Release:   5.2
   5 Patch-ID:       bash52-035
   6
   7 Bug-Reported-by:        Henry Bent <henry.r.bent@gmail.com>
   8 Bug-Reference-ID:       <CAEdTPBdD0WOW2n0-y-XyZ_VwhbiG-oS3bXfGkOPPG617rGH-Ww@mail.gmail.com>
   9 Bug-Reference-URL:      https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00044.html
  10
  11 Bug-Description:
  12
  13 There are systems that supply one of select or pselect, but not both.
  14
  15 Patch (apply with `patch -p0'):
  16
  17 https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00058.html
  18
  19 *** ../bash/bash-5.2-patched/lib/readline/input.c       2022-04-08 15:43:24.000000000 -0400
  20 --- lib/readline/input.c        2022-11-16 09:10:41.000000000 -0500
  21 ***************
  22 *** 152,156 ****
  23 --- 152,158 ----
  24   int _rl_timeout_init (void);
  25   int _rl_timeout_sigalrm_handler (void);
  26 + #if defined (RL_TIMEOUT_USE_SELECT)
  27   int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
  28 + #endif
  29
  30   static void _rl_timeout_handle (void);
  31 ***************
  32 *** 249,253 ****
  33     int chars_avail, k;
  34     char input;
  35 ! #if defined(HAVE_SELECT)
  36     fd_set readfds, exceptfds;
  37     struct timeval timeout;
  38 --- 251,255 ----
  39     int chars_avail, k;
  40     char input;
  41 ! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
  42     fd_set readfds, exceptfds;
  43     struct timeval timeout;
  44 ***************
  45 *** 806,810 ****
  46     unsigned char c;
  47     int fd;
  48 ! #if defined (HAVE_PSELECT)
  49     sigset_t empty_set;
  50     fd_set readfds;
  51 --- 808,812 ----
  52     unsigned char c;
  53     int fd;
  54 ! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
  55     sigset_t empty_set;
  56     fd_set readfds;
  57 *** ../bash-5.2-patched/lib/sh/input_avail.c    2021-05-24 11:16:33.000000000 -0400
  58 --- lib/sh/input_avail.c        2022-11-16 09:12:48.000000000 -0500
  59 ***************
  60 *** 34,40 ****
  61   #endif /* HAVE_SYS_FILE_H */
  62
  63 ! #if defined (HAVE_PSELECT)
  64 ! #  include <signal.h>
  65 ! #endif
  66
  67   #if defined (HAVE_UNISTD_H)
  68 --- 34,38 ----
  69   #endif /* HAVE_SYS_FILE_H */
  70
  71 ! #include <signal.h>
  72
  73   #if defined (HAVE_UNISTD_H)
  74 ***************
  75 *** 108,115 ****
  76   {
  77     int result, chars_avail;
  78 - #if defined(HAVE_SELECT)
  79 -   fd_set readfds, exceptfds;
  80 - #endif
  81   #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
  82     sigset_t set, oset;
  83   #endif
  84 --- 106,111 ----
  85   {
  86     int result, chars_avail;
  87   #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
  88 +   fd_set readfds, exceptfds;
  89     sigset_t set, oset;
  90   #endif
  91 ***************
  92 *** 122,132 ****
  93     chars_avail = 0;
  94
  95 ! #if defined (HAVE_SELECT)
  96     FD_ZERO (&readfds);
  97     FD_ZERO (&exceptfds);
  98     FD_SET (fd, &readfds);
  99     FD_SET (fd, &exceptfds);
 100 - #endif
 101 - #if defined (HAVE_SELECT) || defined (HAVE_PSELECT)
 102     sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &set);
 103   #  ifdef SIGCHLD
 104 --- 115,123 ----
 105     chars_avail = 0;
 106
 107 ! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
 108     FD_ZERO (&readfds);
 109     FD_ZERO (&exceptfds);
 110     FD_SET (fd, &readfds);
 111     FD_SET (fd, &exceptfds);
 112     sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &set);
 113   #  ifdef SIGCHLD
 114
 115 *** ../bash-5.2/patchlevel.h    2020-06-22 14:51:03.000000000 -0400
 116 --- patchlevel.h        2020-10-01 11:01:28.000000000 -0400
 117 ***************
 118 *** 26,30 ****
 119      looks for to find the patch level (for the sccs version string). */
 120
 121 ! #define PATCHLEVEL 34
 122
 123   #endif /* _PATCHLEVEL_H_ */
 124 --- 26,30 ----
 125      looks for to find the patch level (for the sccs version string). */
 126
 127 ! #define PATCHLEVEL 35
 128
 129   #endif /* _PATCHLEVEL_H_ */