Hello community, here is the log from the commit of package screen for openSUSE:12.2 checked in at 2012-08-08 21:57:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/screen (Old) and /work/SRC/openSUSE:12.2/.screen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "screen", Maintainer is "m...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/screen/screen.changes 2012-06-25 15:52:52.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.screen.new/screen.changes 2012-08-08 21:57:55.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 8 19:56:19 CEST 2012 - m...@suse.de + +- fix crash when doing 'screen -d -r' inside of screen + +------------------------------------------------------------------- +Tue Aug 7 17:08:55 CEST 2012 - m...@suse.de + +- add mappedcmd.diff to make ^A DEL work again + +------------------------------------------------------------------- New: ---- mappedcmd.diff styroptcrash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screen.spec ++++++ --- /var/tmp/diff_new_pack.BEwk51/_old 2012-08-08 21:57:55.000000000 +0200 +++ /var/tmp/diff_new_pack.BEwk51/_new 2012-08-08 21:57:55.000000000 +0200 @@ -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 @@ 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 @@ %patch4 -p1 %patch5 %patch6 +%patch7 -p2 +%patch8 -p2 %build CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ ++++++ mappedcmd.diff ++++++ commit ae3e007da3f50e9f4e3c4244e12fce5fcd3774db Author: Michael Schroeder <m...@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; ++++++ styroptcrash.diff ++++++ commit c64f800e7b197e14433ac97be12f32385a27a04f Author: Michael Schroeder <m...@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; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
