Import Debian changes 3.0.2-2+deb10u1
fish (3.0.2-2+deb10u1) buster; urgency=medium
.
* Non-maintainer upload.
+ With permission from package maintainer and uploader.
.
[ Miao Wang ]
* debian/patches: Add patch to ensure tty options are restored on exit.
This fixes upstream issue 5663.
(Closes: #970777)
Boyuan Yang authored 3 years ago
Mo Zhou committed 3 years ago
| 0 | |
fish (3.0.2-2+deb10u1) stable; urgency=medium
|
| 1 | |
|
| 2 | |
* Ensure tty options are restored on exit.
|
|
0 |
fish (3.0.2-2+deb10u1) buster; urgency=medium
|
|
1 |
|
|
2 |
* Non-maintainer upload.
|
|
3 |
+ With permission from package maintainer and uploader.
|
|
4 |
|
|
5 |
[ Miao Wang ]
|
|
6 |
* debian/patches: Add patch to ensure tty options are restored on exit.
|
|
7 |
This fixes upstream issue 5663.
|
| 3 | 8 |
(Closes: #970777)
|
| 4 | 9 |
|
| 5 | |
-- Miao Wang <shankerwangmiao@gmail.com> Sun, 27 Sep 2020 21:13:52 +0800
|
|
10 |
-- Boyuan Yang <byang@debian.org> Sun, 04 Oct 2020 19:37:04 -0400
|
| 6 | 11 |
|
| 7 | 12 |
fish (3.0.2-2) unstable; urgency=medium
|
| 8 | 13 |
|
debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.diff
less
more
| 0 | |
Source: https://github.com/fish-shell/fish-shell/commit/2418e1e50b636a3457b58a77feb0a2b14cbf82f9
|
| 1 | |
Fixes: https://github.com/fish-shell/fish-shell/issues/5663
|
| 2 | |
Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970777
|
| 3 | |
Index: fish/src/reader.cpp
|
| 4 | |
===================================================================
|
| 5 | |
--- fish.orig/src/reader.cpp
|
| 6 | |
+++ fish/src/reader.cpp
|
| 7 | |
@@ -952,7 +952,7 @@ void reader_init() {
|
| 8 | |
/// Restore the term mode if we own the terminal. It's important we do this before
|
| 9 | |
/// restore_foreground_process_group, otherwise we won't think we own the terminal.
|
| 10 | |
void restore_term_mode() {
|
| 11 | |
- if (getpid() != tcgetpgrp(STDIN_FILENO)) return;
|
| 12 | |
+ if (getpgrp() != tcgetpgrp(STDIN_FILENO)) return;
|
| 13 | |
|
| 14 | |
if (tcsetattr(STDIN_FILENO, TCSANOW, &terminal_mode_on_startup) == -1 && errno == EIO) {
|
| 15 | |
redirect_tty_output();
|
|
0 |
From: Fabian Homborg <FHomborg@gmail.com>
|
|
1 |
Date: Mon, 25 Feb 2019 20:23:34 +0100
|
|
2 |
Subject: [PATCH] Don't mix up pgroup and pid
|
|
3 |
|
|
4 |
This is another case where we used pid when we meant pgroup.
|
|
5 |
|
|
6 |
Since 55b3c45f95ba09efa4b9eaad8ec49256a7435823, the assumption that
|
|
7 |
both are the same no longer holds in all cases, so this check was wrong.
|
|
8 |
|
|
9 |
Might fix #5663.
|
|
10 |
|
|
11 |
Bug-Debian: https://bugs.debian.org/970777
|
|
12 |
Forwarded: https://github.com/fish-shell/fish-shell/issues/5663
|
|
13 |
Applied-Upstream: https://github.com/fish-shell/fish-shell/commit/2418e1e50b636a3457b58a77feb0a2b14cbf82f9
|
|
14 |
---
|
|
15 |
src/reader.cpp | 2 +-
|
|
16 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
17 |
|
|
18 |
diff --git a/src/reader.cpp b/src/reader.cpp
|
|
19 |
index a370e2719f..9821482d7f 100644
|
|
20 |
--- a/src/reader.cpp
|
|
21 |
+++ b/src/reader.cpp
|
|
22 |
@@ -966,7 +966,7 @@ void reader_init() {
|
|
23 |
/// Restore the term mode if we own the terminal. It's important we do this before
|
|
24 |
/// restore_foreground_process_group, otherwise we won't think we own the terminal.
|
|
25 |
void restore_term_mode() {
|
|
26 |
- if (getpid() != tcgetpgrp(STDIN_FILENO)) return;
|
|
27 |
+ if (getpgrp() != tcgetpgrp(STDIN_FILENO)) return;
|
|
28 |
|
|
29 |
if (tcsetattr(STDIN_FILENO, TCSANOW, &terminal_mode_on_startup) == -1 && errno == EIO) {
|
|
30 |
redirect_tty_output();
|
| 1 | 1 |
isolate-home-tests
|
| 2 | 2 |
use-curdir-not-pwd
|
| 3 | 3 |
c6ec4235136e82c709e8d7b455f7c463f9714b48.diff
|
| 4 | |
2418e1e50b636a3457b58a77feb0a2b14cbf82f9.diff
|
|
4 |
2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch
|