[screen/f16] fix for resuming screen in screen (#752622)
Lukáš Nykrýn
lnykryn at fedoraproject.org
Wed Mar 28 14:56:01 UTC 2012
commit e76f04530508ed467c4c1807672226be78d3013a
Author: Lukas Nykryn <lnykryn at redhat.com>
Date: Wed Mar 28 16:37:09 2012 +0200
fix for resuming screen in screen (#752622)
Conflicts:
screen.spec
screen-4.1.0-reattach.patch | 13 +++++++++++++
screen.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/screen-4.1.0-reattach.patch b/screen-4.1.0-reattach.patch
new file mode 100644
index 0000000..db67c2d
--- /dev/null
+++ b/screen-4.1.0-reattach.patch
@@ -0,0 +1,13 @@
+diff --git a/src/screen.c b/src/screen.c
+index af0fd82..cd0c71b 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -1005,7 +1005,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) && !(!mflag && !SockMatch && sty && !xflag && !rflag))
+ {
+ #ifndef NAMEDPIPE
+ int fl;
diff --git a/screen.spec b/screen.spec
index 7c272e8..0fa3b32 100644
--- a/screen.spec
+++ b/screen.spec
@@ -3,7 +3,7 @@
Summary: A screen manager that supports multiple logins on one terminal
Name: screen
Version: 4.1.0
-Release: 0.6.20110328git8cf5ef%{?dist}
+Release: 0.7.20110328git8cf5ef%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.gnu.org/software/screen
@@ -26,6 +26,8 @@ Patch4: screen-cc.patch
Patch5: screen-E3.patch
Patch6: screen-4.1.0-suppress_remap.patch
Patch7: screen-4.1.0-resize.patch
+Patch8: screen-4.1.0-reattach.patch
+
%description
The screen utility allows you to have multiple logins on just one
@@ -46,6 +48,7 @@ support multiple logins on one terminal.
%patch5 -p2 -b .E3
%patch6 -p1 -b .suppress_remap
%patch7 -p2 -b .resize
+%patch8 -p2 -b .reattach
%build
@@ -142,6 +145,9 @@ fi
%endif
%changelog
+* Wed Mar 28 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 4.1.0-0.7.20110328git8cf5ef
+- fix for resuming screen in screen (#752622)
+
* Wed Mar 14 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 4.1.0-0.6.20110328git8cf5ef
- fix a crash when switching from altscreen after window resize (#784504)
More information about the scm-commits
mailing list