diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-08 21:20:28 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-02-09 08:59:49 +0100 |
commit | 83ec0a78cbc3542992d00ec84a7fa9bd649d7ef5 (patch) | |
tree | edc1778c859a089f97aceeeb604db85ea5e9b25c /source/a/bash/bash-5.0-patches/bash50-013 | |
parent | 080300e1e7dec7bb1a6297b5a4406e2c0be46048 (diff) | |
download | current-83ec0a78cbc3542992d00ec84a7fa9bd649d7ef5.tar.gz current-83ec0a78cbc3542992d00ec84a7fa9bd649d7ef5.tar.xz |
Sat Feb 8 21:20:28 UTC 202020200208212028
a/bash-5.0.016-x86_64-1.txz: Upgraded.
a/kernel-firmware-20200207_6f89735-noarch-1.txz: Upgraded.
ap/nvme-cli-1.10.1-x86_64-1.txz: Added.
d/gdb-9.1-x86_64-1.txz: Upgraded.
l/ConsoleKit2-1.2.1-x86_64-1.txz: Upgraded.
l/imagemagick-7.0.9_22-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.50-x86_64-1.txz: Upgraded.
Upgraded to nss-3.50 and nspr-4.25.
l/readline-8.0.004-x86_64-1.txz: Upgraded.
n/libgpg-error-1.37-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/bash/bash-5.0-patches/bash50-013')
-rw-r--r-- | source/a/bash/bash-5.0-patches/bash50-013 | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/source/a/bash/bash-5.0-patches/bash50-013 b/source/a/bash/bash-5.0-patches/bash50-013 new file mode 100644 index 000000000..e44fdb505 --- /dev/null +++ b/source/a/bash/bash-5.0-patches/bash50-013 @@ -0,0 +1,73 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-013 + +Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com> +Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html + +Bug-Description: + +Reading history entries with timestamps can result in history entries joined +by linefeeds. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/readline/histfile.c 2018-06-11 09:14:52.000000000 -0400 +--- lib/readline/histfile.c 2019-05-16 15:55:57.000000000 -0400 +*************** +*** 370,376 **** + + has_timestamps = HIST_TIMESTAMP_START (buffer); +! history_multiline_entries += has_timestamps && history_write_timestamps; + + /* Skip lines until we are at FROM. */ + for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) + if (*line_end == '\n') +--- 370,378 ---- + + has_timestamps = HIST_TIMESTAMP_START (buffer); +! history_multiline_entries += has_timestamps && history_write_timestamps; + + /* Skip lines until we are at FROM. */ ++ if (has_timestamps) ++ last_ts = buffer; + for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) + if (*line_end == '\n') +*************** +*** 381,385 **** +--- 383,398 ---- + if (HIST_TIMESTAMP_START(p) == 0) + current_line++; ++ else ++ last_ts = p; + line_start = p; ++ /* If we are at the last line (current_line == from) but we have ++ timestamps (has_timestamps), then line_start points to the ++ text of the last command, and we need to skip to its end. */ ++ if (current_line >= from && has_timestamps) ++ { ++ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) ++ ; ++ line_start = (*line_end == '\n') ? line_end + 1 : line_end; ++ } + } + + +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ |