Accepting request 130433 from Base:System

->

OBS-URL: https://build.opensuse.org/request/show/130433
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/screen?expand=0&rev=31

mappedcmd.diff

@@ -0,0 +1,31 @@
+commit ae3e007da3f50e9f4e3c4244e12fce5fcd3774db
+Author: Michael Schroeder <mls@suse.de>
+Date:   Tue Aug 7 17:05:15 2012 +0200
+
+    make ^A DEL work again
+    
+    It was broken because we discarded all mapped sequences. Now we
+    let sequences with length 1 through to ProcessInput2.
+
+diff --git a/src/process.c b/src/process.c
+index d86c62c..bdf9355 100644
+--- a/src/process.c
++++ b/src/process.c
+@@ -6472,6 +6472,7 @@ int i;
+ {
+   struct action *act;
+   int discard = 0;
++  int keyno = i;
+ 
+   debug1("StuffKey #%d", i);
+ #ifdef DEBUG
+@@ -6511,6 +6512,9 @@ int i;
+ 
+   if (discard && (!act || act->nr != RC_COMMAND))
+     {
++      /* if the input was just a single byte we let it through */
++      if (D_tcs[keyno + T_CAPS].str && strlen(D_tcs[keyno + T_CAPS].str) == 1)
++	return -1;
+       if (D_ESCseen)
+         {
+           D_ESCseen = 0;

screen.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Aug  8 19:56:19 CEST 2012 - mls@suse.de
+
+- fix crash when doing 'screen -d -r' inside of screen
+
+-------------------------------------------------------------------
+Tue Aug  7 17:08:55 CEST 2012 - mls@suse.de
+
+- add mappedcmd.diff to make ^A DEL work again
+
 -------------------------------------------------------------------
 Fri Jun  8 18:03:57 CEST 2012 - mls@suse.de
 

screen.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Url:            http://www.gnu.org/software/screen/
 
 Name:           screen
@@ -41,6 +40,8 @@ Patch3:         screen-4.0.3-ipv6.patch
 Patch4:         term_too_long.diff
 Patch5:         sort_command.patch
 Patch6:         libtinfo.diff
+Patch7:         mappedcmd.diff
+Patch8:         styroptcrash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -59,6 +60,8 @@ Documentation: man page
 %patch4 -p1
 %patch5
 %patch6
+%patch7 -p2
+%patch8 -p2
 
 %build
 CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \

styroptcrash.diff

@@ -0,0 +1,19 @@
+commit c64f800e7b197e14433ac97be12f32385a27a04f
+Author: Michael Schroeder <mls@suse.de>
+Date:   Wed Aug 8 19:54:11 2012 +0200
+
+    extend commit #8c1b8e45, which fixed -x but forgot about -r
+
+diff --git a/src/screen.c b/src/screen.c
+index 949df01..6e19732 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -988,7 +988,7 @@ char **av;
+     Panic(0, "$HOME too long - sorry.");
+ 
+   attach_tty = "";
+-  if (!detached && !lsflag && !cmdflag && !(dflag && !mflag && !rflag && !xflag) && !(!mflag && !SockMatch && sty && !xflag))
++  if (!detached && !lsflag && !cmdflag && !(dflag && !mflag && !rflag && !xflag) && !(sty && !SockMatch && !mflag && !rflag && !xflag))
+     {
+ #ifndef NAMEDPIPE
+       int fl;