Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mosh: Fix patch
Date: Mon, 11 Nov 2019 22:42:11 +0100
Message-ID: <20191111214211.L9mzam0pDv2h8Px2sT-fHiU1yvIc485uCv-D2J5oeXI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16357@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages mosh
https://github.com/void-linux/void-packages/pull/16357

mosh: Fix patch
assert(false); in patch causes the fish shell
to fail to start, essentially causing lock in
a mobile terminal

A patch file from https://github.com/void-linux/void-packages/pull/16357.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mosh-16357.patch --]
[-- Type: text/x-diff, Size: 4879 bytes --]

From a6c6e0f3bcec177626dee77374313041b6278d27 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Mon, 11 Nov 2019 01:32:14 -0600
Subject: [PATCH] mosh: Remove patch

Patch causes issue with users using fish shell
---
 .../patches/ignore-unknown-renditions.patch   | 122 ------------------
 srcpkgs/mosh/template                         |   2 +-
 2 files changed, 1 insertion(+), 123 deletions(-)
 delete mode 100644 srcpkgs/mosh/patches/ignore-unknown-renditions.patch

diff --git a/srcpkgs/mosh/patches/ignore-unknown-renditions.patch b/srcpkgs/mosh/patches/ignore-unknown-renditions.patch
deleted file mode 100644
index c1c805b2b23..00000000000
--- a/srcpkgs/mosh/patches/ignore-unknown-renditions.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 4835dcf5eed93f8dee44e5d1932c38b1cd243d41 Mon Sep 17 00:00:00 2001
-From: John Hood <cgull@glup.org>
-Date: Mon, 7 Nov 2016 01:00:03 -0500
-Subject: [PATCH] Various switch statement fixes.
-
----
- src/frontend/mosh-server.cc         |  5 +++--
- src/terminal/terminalframebuffer.cc |  1 +
- src/terminal/terminalfunctions.cc   | 22 ++++++++++++++++------
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git src/frontend/mosh-server.cc src/frontend/mosh-server.cc
-index 386fcf92..71acc74d 100644
---- src/frontend/mosh-server.cc
-+++ src/frontend/mosh-server.cc
-@@ -250,8 +250,9 @@ int main( int argc, char *argv[] )
- 	locale_vars.push_back( string( optarg ) );
- 	break;
-       default:
--	print_usage( stderr, argv[ 0 ] );
- 	/* don't die on unknown options */
-+	print_usage( stderr, argv[ 0 ] );
-+	break;
-       }
-     }
-   } else if ( argc == 1 ) {
-@@ -658,7 +659,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
- 
-   bool child_released = false;
- 
--  while ( 1 ) {
-+  while ( true ) {
-     try {
-       static const uint64_t timeout_if_no_client = 60000;
-       int timeout = INT_MAX;
-diff --git src/terminal/terminalframebuffer.cc src/terminal/terminalframebuffer.cc
-index a724afa6..93a31553 100644
---- src/terminal/terminalframebuffer.cc
-+++ src/terminal/terminalframebuffer.cc
-@@ -512,6 +512,7 @@ void Renditions::set_rendition( color_type num )
-   case 5: case 25: set_attribute(blink, value); break;
-   case 7: case 27: set_attribute(inverse, value); break;
-   case 8: case 28: set_attribute(invisible, value); break;
-+  default: assert(false);
-   }
- }
- 
-diff --git src/terminal/terminalfunctions.cc src/terminal/terminalfunctions.cc
-index 87cb95c4..a0210e34 100644
---- src/terminal/terminalfunctions.cc
-+++ src/terminal/terminalfunctions.cc
-@@ -64,6 +64,8 @@ static void CSI_EL( Framebuffer *fb, Dispatcher *dispatch )
-   case 2: /* all of line */
-     fb->reset_row( fb->get_mutable_row( -1 ) );
-     break;
-+  default:
-+    break;
-   }
- }
- 
-@@ -89,6 +91,8 @@ static void CSI_ED( Framebuffer *fb, Dispatcher *dispatch ) {
-       fb->reset_row( fb->get_mutable_row( y ) );
-     }
-     break;
-+  default:
-+    break;
-   }
- }
- 
-@@ -114,10 +118,11 @@ static void CSI_cursormove( Framebuffer *fb, Dispatcher *dispatch )
-     break;
-   case 'H':
-   case 'f':
--    int x = dispatch->getparam( 0, 1 );
--    int y = dispatch->getparam( 1, 1 );
--    fb->ds.move_row( x - 1 );
--    fb->ds.move_col( y - 1 );
-+    fb->ds.move_row( dispatch->getparam( 0, 1 ) - 1 );
-+    fb->ds.move_col( dispatch->getparam( 1, 1 ) - 1 );
-+    break;
-+  default:
-+    break;
-   }
- }
- 
-@@ -261,6 +266,8 @@ static void CSI_TBC( Framebuffer *fb, Dispatcher *dispatch )
-       fb->ds.clear_tab( x );
-     }
-     break;
-+  default:
-+    break;
-   }
- }
- 
-@@ -295,6 +302,8 @@ static bool *get_DEC_mode( int param, Framebuffer *fb ) {
-     return &(fb->ds.mouse_alternate_scroll);
-   case 2004: /* bracketed paste */
-     return &(fb->ds.bracketed_paste);
-+  default:
-+    break;
-   }
-   return NULL;
- }
-@@ -340,8 +349,7 @@ static Function func_CSI_DECSM( CSI, "?h", CSI_DECSM, false );
- static Function func_CSI_DECRM( CSI, "?l", CSI_DECRM, false );
- 
- static bool *get_ANSI_mode( int param, Framebuffer *fb ) {
--  switch ( param ) {
--  case 4: /* insert/replace mode */
-+  if ( param == 4 ) { /* insert/replace mode */
-     return &(fb->ds.insert_mode);
-   }
-   return NULL;
-@@ -452,6 +460,8 @@ static void CSI_DSR( Framebuffer *fb, Dispatcher *dispatch )
- 	      fb->ds.get_cursor_col() + 1 );
-     dispatch->terminal_to_host.append( cpr );
-     break;
-+  default:
-+    break;
-   }
- }
- 
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index bb333076cba..ac3d8112a79 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=13
+revision=14
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
 makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"

  reply	other threads:[~2019-11-11 21:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-11  7:36 [PR PATCH] " voidlinux-github
2019-11-11 21:42 ` voidlinux-github [this message]
2019-11-11 21:44 ` [PR PATCH] [Updated] " voidlinux-github
2019-11-12 11:59 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191111214211.L9mzam0pDv2h8Px2sT-fHiU1yvIc485uCv-D2J5oeXI@z \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git