From 24411c0e3755151d32a9830aa58c089b7ec59ea2 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 5 Feb 2013 13:10:24 +0100 Subject: [PATCH 1/3] Fix (#907472) xterm too long - sorry. --- screen-4.1.0-long-term.patch | 26 ++++++++++++++++++++++++++ screen.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 screen-4.1.0-long-term.patch diff --git a/screen-4.1.0-long-term.patch b/screen-4.1.0-long-term.patch new file mode 100644 index 0000000..38213d1 --- /dev/null +++ b/screen-4.1.0-long-term.patch @@ -0,0 +1,26 @@ +diff --git a/src/display.h b/src/display.h +index e8b3b80..b1ab748 100644 +--- a/src/display.h ++++ b/src/display.h +@@ -73,7 +73,7 @@ struct display + struct win *d_other; /* pointer to other window */ + int d_nonblock; /* -1 don't block if obufmax reached */ + /* >0: block after nonblock secs */ +- char d_termname[20 + 1]; /* $TERM */ ++ char d_termname[40 + 1]; /* $TERM */ + char *d_tentry; /* buffer for tgetstr */ + char d_tcinited; /* termcap inited flag */ + int d_width, d_height; /* width/height of the screen */ +diff --git a/src/screen.h b/src/screen.h +index 5c93f32..1a388e3 100644 +--- a/src/screen.h ++++ b/src/screen.h +@@ -214,7 +214,7 @@ struct msg + char preselect[20]; + int esc; /* his new escape character unless -1 */ + int meta_esc; /* his new meta esc character unless -1 */ +- char envterm[20 + 1]; /* terminal type */ ++ char envterm[40 + 1]; /* terminal type */ + int encoding; /* encoding of display */ + int detachfirst; /* whether to detach remote sessions first */ + } diff --git a/screen.spec b/screen.spec index f2aebbc..c868b9a 100644 --- a/screen.spec +++ b/screen.spec @@ -4,7 +4,7 @@ Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.1.0 -Release: 0.13.20120314git3c2946%{?dist} +Release: 0.14.20120314git3c2946%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnu.org/software/screen @@ -28,6 +28,7 @@ Patch5: screen-E3.patch Patch6: screen-4.1.0-suppress_remap.patch Patch7: screen-4.1.0-reattach.patch Patch8: screen-4.1.0-crypt.patch +Patch9: screen-4.1.0-long-term.patch %description The screen utility allows you to have multiple logins on just one @@ -49,6 +50,7 @@ support multiple logins on one terminal. %patch6 -p1 -b .suppress_remap %patch7 -p2 -b .reattach %patch8 -p2 -b .crypto +%patch9 -p2 -b .long-term %build @@ -145,6 +147,9 @@ fi %endif %changelog +* Tue Feb 05 2013 stone - 4.1.0-0.14.20120314git3c2946 +- Fix (#907472) xterm too long - sorry + * Wed Dec 05 2012 Lukáš Nykrýn - 4.1.0-0.13.20120314git3c2946 - Use hardened build From 6d60390ffc732708512a7eedb08f5b632566e78f Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 8 Feb 2013 12:12:55 +0100 Subject: [PATCH 2/3] Related: (#907472) xterm too long - sorry. --- screen.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen.spec b/screen.spec index c868b9a..ed34ebc 100644 --- a/screen.spec +++ b/screen.spec @@ -147,7 +147,7 @@ fi %endif %changelog -* Tue Feb 05 2013 stone - 4.1.0-0.14.20120314git3c2946 +* Tue Feb 05 2013 Petr Hracek - 4.1.0-0.14.20120314git3c2946 - Fix (#907472) xterm too long - sorry * Wed Dec 05 2012 Lukáš Nykrýn - 4.1.0-0.13.20120314git3c2946 From d443bf9917ece8b1b68cbedb15853c4d703108c2 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 18 Jun 2013 16:06:04 +0200 Subject: [PATCH 3/3] Segfault in alternate screen handling (#948617) --- screen-altscreen.patch | 14 ++++++++++++++ screen.spec | 29 +++++++++++++++++------------ 2 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 screen-altscreen.patch diff --git a/screen-altscreen.patch b/screen-altscreen.patch new file mode 100644 index 0000000..49e5cc4 --- /dev/null +++ b/screen-altscreen.patch @@ -0,0 +1,14 @@ +diff --git a/src/ansi.c b/src/ansi.c +index d88e153..8df79b2 100644 +--- a/src/ansi.c ++++ b/src/ansi.c +@@ -1438,8 +1438,8 @@ int c, intermediate; + } + else + { +- LeaveAltScreen(curr); + RestoreCursor(&curr->w_alt.cursor); ++ LeaveAltScreen(curr); + } + if (a1 == 47 && !i) + curr->w_saved.on = 0; diff --git a/screen.spec b/screen.spec index ed34ebc..ca9a318 100644 --- a/screen.spec +++ b/screen.spec @@ -4,7 +4,7 @@ Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.1.0 -Release: 0.14.20120314git3c2946%{?dist} +Release: 0.15.20120314git3c2946%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnu.org/software/screen @@ -29,6 +29,7 @@ Patch6: screen-4.1.0-suppress_remap.patch Patch7: screen-4.1.0-reattach.patch Patch8: screen-4.1.0-crypt.patch Patch9: screen-4.1.0-long-term.patch +Patch10: screen-altscreen.patch %description The screen utility allows you to have multiple logins on just one @@ -51,6 +52,7 @@ support multiple logins on one terminal. %patch7 -p2 -b .reattach %patch8 -p2 -b .crypto %patch9 -p2 -b .long-term +%patch10 -p2 -b .altscreen.patch %build @@ -147,6 +149,9 @@ fi %endif %changelog +* Tue Jun 18 2013 Petr Hracek - 4.1.0-0.15.20120314git3c2946 +- Fix: Segfault in alternate screen handling (#948617) + * Tue Feb 05 2013 Petr Hracek - 4.1.0-0.14.20120314git3c2946 - Fix (#907472) xterm too long - sorry @@ -182,7 +187,7 @@ fi - update to git snapshot 20110328git8cf5ef - clear scrollback buffer before locking linux terminal (#683733) -* Tue Feb 10 2011 Miroslav Lichvar - 4.1.0-0.3.20101110git066b098 +* Thu Feb 10 2011 Miroslav Lichvar - 4.1.0-0.3.20101110git066b098 - move sockets back to /var/run/screen (#676663) * Wed Feb 09 2011 Fedora Release Engineering - 4.1.0-0.2.20101110git066b098 @@ -250,7 +255,7 @@ fi * Fri Jan 5 2007 Marcela Maslanova - 4.0.3-2 - rebuilt (change in spec file) -* Wed Oct 15 2006 Marcela Maslanova - 4.0.3-1 +* Sun Oct 15 2006 Marcela Maslanova - 4.0.3-1 - new version from upstream - ipv6 patch #198410 @@ -346,16 +351,16 @@ and thus, the patch isn't necessary.) - Comment out lines in screenrc causing screen to complain at startup. -* Tue Jul 10 2003 Lon Hohberger 3.9.15-11 +* Thu Jul 10 2003 Lon Hohberger 3.9.15-11 - Rebuilt -* Tue Jul 10 2003 Lon Hohberger 3.9.15-10 +* Thu Jul 10 2003 Lon Hohberger 3.9.15-10 - Put the bindkey back in for now. -* Mon Jul 01 2003 Lon Hohberger 3.9.15-9 +* Tue Jul 01 2003 Lon Hohberger 3.9.15-9 - Rebuilt -* Mon Jul 01 2003 Lon Hohberger 3.9.15-8 +* Tue Jul 01 2003 Lon Hohberger 3.9.15-8 - Change screen's behavior to do the following: Attempt to use ~/.screen as the screen directory. Failing that (ie, on files systems without Unix sockets support), try using /tmp/screen-. @@ -418,10 +423,10 @@ for build 2. * Wed Aug 14 2002 Philip Copeland 3.9.11-10 - #65344 - doomed by utf8 -* Tue Aug 12 2002 Philip Copeland 3.9.11-9 +* Mon Aug 12 2002 Philip Copeland 3.9.11-9 - #60597 - what /shall/ we make the defaults today? -* Thu Jul 17 2002 Philip Copeland 3.9.11-8 +* Wed Jul 17 2002 Philip Copeland 3.9.11-8 - Prevent the makefile from stripping the binary - Really get rid of the libelf dependancy @@ -476,7 +481,7 @@ for build 2. - update to 3.9.8 - change the .jbj patch and add some more "user" -> "auser" cases -* Thu Aug 15 2000 Crutcher Dunnavant +* Tue Aug 15 2000 Crutcher Dunnavant - Patched the documentation to change the 'C-a C-\' to 'C-a \', - which is what is the real behaviour. this fixes bug #16103 @@ -536,7 +541,7 @@ for build 2. * Wed Jun 16 1999 Bill Nottingham - force tty permissions/group -* Wed Jun 5 1999 Dale Lovelace +* Sat Jun 5 1999 Dale Lovelace - permissions on /etc/skel/.screenrc to 644 * Mon Apr 26 1999 Bill Nottingham @@ -566,7 +571,7 @@ for build 2. * Mon Apr 27 1998 Prospector System - translations modified for de, fr, tr -* Wed Oct 21 1997 Cristian Gafton +* Tue Oct 21 1997 Cristian Gafton - upgraded to 3.7.4 * Wed Oct 08 1997 Erik Troan