[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#971685: marked as done (buster-pu: package fish/3.0.2-2+deb10u1)

Your message dated Sat, 05 Dec 2020 11:02:00 +0000
with message-id <b70f86aac27195271a9b5212c7acc936da6ff100.camel@adam-barratt.org.uk>
and subject line Closing bugs for updates in 10.7 point release
has caused the Debian Bug report #971685,
regarding buster-pu: package fish/3.0.2-2+deb10u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
971685: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971685
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-CC: shankerwangmiao@gmail.com fish@packages.debian.org

Hi,

I am working on solving https://bugs.debian.org/970777 , a bug that
made package fish in Debian 10 unusable with sudo in terminal. The
patch comes from upstream trunk.

This will be a NMU but under permission from both the maintainer and
uploader.

The full debdiff is attached below as well as in the attachment.

Regards,
Boyuan Yang


===========================

diff -Nru fish-3.0.2/debian/changelog fish-3.0.2/debian/changelog
--- fish-3.0.2/debian/changelog	2019-03-26 09:16:52.000000000 -0400
+++ fish-3.0.2/debian/changelog	2020-10-04 19:37:04.000000000 -0400
@@ -1,3 +1,15 @@
+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 <byang@debian.org>  Sun, 04 Oct 2020 19:37:04 -0400
+
 fish (3.0.2-2) unstable; urgency=medium
 
   * Discard stderr message from systemd 241 when doing completion.
diff -Nru fish-
3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch
fish-
3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch
--- fish-
3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch	
1969-12-31 19:00:00.000000000 -0500
+++ fish-
3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch	
2020-10-04 19:37:04.000000000 -0400
@@ -0,0 +1,31 @@
+From: Fabian Homborg <FHomborg@gmail.com>
+Date: Mon, 25 Feb 2019 20:23:34 +0100
+Subject: [PATCH] Don't mix up pgroup and pid
+
+This is another case where we used pid when we meant pgroup.
+
+Since 55b3c45f95ba09efa4b9eaad8ec49256a7435823, the assumption that
+both are the same no longer holds in all cases, so this check was
wrong.
+
+Might fix #5663.
+
+Bug-Debian: https://bugs.debian.org/970777
+Forwarded: https://github.com/fish-shell/fish-shell/issues/5663
+Applied-Upstream: 
https://github.com/fish-shell/fish-shell/commit/2418e1e50b636a3457b58a77feb0a2b14cbf82f9
+---
+ src/reader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/reader.cpp b/src/reader.cpp
+index a370e2719f..9821482d7f 100644
+--- a/src/reader.cpp
++++ b/src/reader.cpp
+@@ -966,7 +966,7 @@ void reader_init() {
+ /// Restore the term mode if we own the terminal. It's important we
do this before
+ /// restore_foreground_process_group, otherwise we won't think we own
the terminal.
+ void restore_term_mode() {
+-    if (getpid() != tcgetpgrp(STDIN_FILENO)) return;
++    if (getpgrp() != tcgetpgrp(STDIN_FILENO)) return;
+ 
+     if (tcsetattr(STDIN_FILENO, TCSANOW, &terminal_mode_on_startup)
== -1 && errno == EIO) {
+         redirect_tty_output();
diff -Nru fish-3.0.2/debian/patches/series fish-
3.0.2/debian/patches/series
--- fish-3.0.2/debian/patches/series	2019-03-26 09:16:52.000000000
-0400
+++ fish-3.0.2/debian/patches/series	2020-10-04 19:37:04.000000000
-0400
@@ -2,3 +2,4 @@
 isolate-home-tests
 use-curdir-not-pwd
 c6ec4235136e82c709e8d7b455f7c463f9714b48.diff
+2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch


================================

diff -Nru fish-3.0.2/debian/changelog fish-3.0.2/debian/changelog
--- fish-3.0.2/debian/changelog	2019-03-26 09:16:52.000000000 -0400
+++ fish-3.0.2/debian/changelog	2020-10-04 19:37:04.000000000 -0400
@@ -1,3 +1,15 @@
+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 <byang@debian.org>  Sun, 04 Oct 2020 19:37:04 -0400
+
 fish (3.0.2-2) unstable; urgency=medium
 
   * Discard stderr message from systemd 241 when doing completion.
diff -Nru fish-3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch fish-3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch
--- fish-3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch	1969-12-31 19:00:00.000000000 -0500
+++ fish-3.0.2/debian/patches/2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch	2020-10-04 19:37:04.000000000 -0400
@@ -0,0 +1,31 @@
+From: Fabian Homborg <FHomborg@gmail.com>
+Date: Mon, 25 Feb 2019 20:23:34 +0100
+Subject: [PATCH] Don't mix up pgroup and pid
+
+This is another case where we used pid when we meant pgroup.
+
+Since 55b3c45f95ba09efa4b9eaad8ec49256a7435823, the assumption that
+both are the same no longer holds in all cases, so this check was wrong.
+
+Might fix #5663.
+
+Bug-Debian: https://bugs.debian.org/970777
+Forwarded: https://github.com/fish-shell/fish-shell/issues/5663
+Applied-Upstream: https://github.com/fish-shell/fish-shell/commit/2418e1e50b636a3457b58a77feb0a2b14cbf82f9
+---
+ src/reader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/reader.cpp b/src/reader.cpp
+index a370e2719f..9821482d7f 100644
+--- a/src/reader.cpp
++++ b/src/reader.cpp
+@@ -966,7 +966,7 @@ void reader_init() {
+ /// Restore the term mode if we own the terminal. It's important we do this before
+ /// restore_foreground_process_group, otherwise we won't think we own the terminal.
+ void restore_term_mode() {
+-    if (getpid() != tcgetpgrp(STDIN_FILENO)) return;
++    if (getpgrp() != tcgetpgrp(STDIN_FILENO)) return;
+ 
+     if (tcsetattr(STDIN_FILENO, TCSANOW, &terminal_mode_on_startup) == -1 && errno == EIO) {
+         redirect_tty_output();
diff -Nru fish-3.0.2/debian/patches/series fish-3.0.2/debian/patches/series
--- fish-3.0.2/debian/patches/series	2019-03-26 09:16:52.000000000 -0400
+++ fish-3.0.2/debian/patches/series	2020-10-04 19:37:04.000000000 -0400
@@ -2,3 +2,4 @@
 isolate-home-tests
 use-curdir-not-pwd
 c6ec4235136e82c709e8d7b455f7c463f9714b48.diff
+2418e1e50b636a3457b58a77feb0a2b14cbf82f9.patch

Attachment: signature.asc
Description: This is a digitally signed message part


--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 10.7

Hi,

Each of the updates referenced by these bugs was included in this
morning's buster 10.7 point release.

Regards,

Adam

--- End Message ---
Reply to: