testing/screen
SHA256
3
0
Fork 0
forked from pool/screen
Code Pull Requests Activity

Accepting request 232907 from Base:System

Browse Source 
GNU screen 4.2.1 (forwarded request 232488 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/232907
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/screen?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2014-05-22 18:37:31 +00:00 committed by Git OBS Bridge
commit fdc20f7bd5
10 changed files with 24 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
msg_version_3.patch
View File

@ -1,13 +0,0 @@
--- screen-4.2.0/screen.h 2014-04-16 23:38:41.000000000 +0200
+++ screen-4.2.0/screen.h.new 2014-04-17 12:13:38.014982957 +0200
@@ -182,8 +182,9 @@
* A few revisions after 8147d08 incorrectly
* carried version 1, but should have carried 2.
* 2: screen version 4.1.0devel (revisions 8b46d8a upto YYYYYYY)
+ * 3: screen version 4.2.0 (was incorrectly originally. Patched here)
*/
-#define MSG_VERSION 2
+#define MSG_VERSION 3
#define MSG_REVISION (('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION)
struct msg

3
screen-4.2.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7dc1b7a3e7669eefe7e65f32e201704d7a11cc688244fcf71757f7792a5ff413
size 786565

3
screen-4.2.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080
size 1062485

BIN
screen-4.2.1.tar.gz.sig Normal file
View File

Binary file not shown.

142
screen-man-loginshell.diff
View File

@ -1,142 +0,0 @@
---
doc/screen.1 | 18 ++++++++++++------
doc/screen.texinfo | 19 ++++++++++++-------
2 files changed, 24 insertions(+), 13 deletions(-)
Index: screen-4.0.3/doc/screen.texinfo
===================================================================
--- screen-4.0.3.orig/doc/screen.texinfo
+++ screen-4.0.3/doc/screen.texinfo
@@ -140,7 +140,8 @@ whole screen session is detached from th
When a program terminates, @code{screen} (per default) kills the window
that contained it. If this window was in the foreground, the display
switches to the previously displayed window; if none are left,
-@code{screen} exits.
+@code{screen} exits. Shells usually distinguish between running as login-shell or sub-shell.
+Screen runs them as sub-shells, unless told otherwise (See @code{shell} .screenrc command).
Everything you type is sent to the program running in the current
window. The only exception to this is the one keystroke that is used to
@@ -151,7 +152,8 @@ Character}) and all the key bindings (@p
customized to be anything you like, though they are always two
characters in length.
-@code{Screen} does not understand the prefix @kbd{C-} to mean control.
+@code{Screen} does not understand the prefix @kbd{C-} to mean control, although
+this notation is used in this manual for readability.
Please use the caret notation (@kbd{^A} instead of @kbd{C-a}) as arguments
to e.g. the @code{escape} command or the @code{-e} option. @code{Screen}
will also print out control characters in caret notation.
@@ -386,7 +388,7 @@ For combinations with the
Set the default shell to be @var{program}. By default, @code{screen}
uses the value of the environment variable @code{$SHELL}, or
@file{/bin/sh} if it is not defined. This option is equivalent to the
-@code{shell} command (@pxref{Shell}).
+@code{shell} command (@pxref{Shell}). See also there.
@item -S @var{sessionname}
Set the name of the new session to @var{sessionname}. This option can
@@ -1261,10 +1263,12 @@ Unset an environment variable.
Set the command to be used to create a new shell. This overrides the
value of the environment variable @code{$SHELL}. This is useful if
you'd like to run a tty-enhancer which is expecting to execute the
-program specified in @code{$SHELL}. If the command begins with
-a @samp{-} character, the shell will be started as a login-shell.
+program specified in @code{$SHELL}.
+If the command begins with a @samp{-} character, the shell will be started as a
+login-shell. Typical shells do only minimal initialization when not started as a login-shell.
+E.g. Bash will not read your @file{~/.bashrc} unless it is a login-shell.
-@code{defshell} is currently a synonym to the @code{shell} command.
+@code{defshell} is currently a synonym to the @code{shell} .screenrc command.
@end deffn
@deffn Command shelltitle title
@@ -1544,7 +1548,7 @@ password checking.
Mainly the same as @code{detach}, but also sends a HANGUP signal
to the parent process of @code{screen}.@*
@emph{Caution}: This will result in a
-logout if @code{screen} was started from your login shell.
+logout if @code{screen} was started from your login-shell.
@end deffn
@deffn Command pow_detach_msg [message]
@@ -4932,6 +4936,7 @@ Alternate user screenrc file.
@item SHELL
Default shell program for opening windows (default @file{/bin/sh}).
+See also @code{shell} .screenrc command.
@item STY
Alternate socket name. If @code{screen} is invoked, and the environment variable
Index: screen-4.0.3/doc/screen.1
===================================================================
--- screen-4.0.3.orig/doc/screen.1
+++ screen-4.0.3/doc/screen.1
@@ -59,7 +59,8 @@ session is detached from the user's term
If this window was in the foreground, the display switches to the previous
window; if none are left,
.I screen
-exits.
+exits. Shells usually distinguish between running as login-shell or sub-shell.
+Screen runs them as sub-shells, unless told otherwise (See \*Qshell\*U .screenrc command).
.PP
Everything you type is sent to the program running in the current window.
The only exception to this is the one keystroke that is used to initiate
@@ -70,7 +71,8 @@ The command character and all the key bi
to be anything you like, though they are always two characters in length.
.PP
.I Screen
-does not understand the prefix \*QC-\*U to mean control.
+does not understand the prefix \*QC-\*U to mean control, although this notation is
+used in this manual for readability.
Please use the caret notation (\*Q^A\*U instead of \*QC-a\*U) as arguments
to e.g. the
.I escape
@@ -330,6 +332,7 @@ For combinations with the \fB\-d\fP/\fB\
sets the default shell to the program specified, instead of the value
in the environment variable $SHELL (or \*Q/bin/sh\*U if not defined).
This can also be defined through the \*Qshell\*U .screenrc command.
+See also there.
.TP 5
.BI "\-S " sessionname
When creating a new session, this option can be used to specify a
@@ -1557,7 +1560,7 @@ windows is changed. Initial setting is 1
.ne 3
.BI "defshell " command
.PP
-Synonym to the \fBshell\fP command. See there.
+Synonym to the \fBshell\fP .screenrc command. See there.
.sp
.ne 3
.BR "defsilence on" | off
@@ -2381,7 +2384,7 @@ the parent process of
.IR screen .
CAUTION: This will result in a logout, when
.I screen
-was started from your login shell.
+was started from your login-shell.
.sp
.ne 3
.B pow_detach_msg
@@ -2625,8 +2628,10 @@ only in rare circumstances.
Set the command to be used to create a new shell.
This overrides the value of the environment variable $SHELL.
This is useful if you'd like to run a tty-enhancer which is expecting to
-execute the program specified in $SHELL. If the command begins with
-a '-' character, the shell will be started as a login-shell.
+execute the program specified in $SHELL.
+If the command begins with a '-' character, the shell will be started as a
+login-shell. Typical shells do only minimal initialization when not started as a login-shell.
+E.g. Bash will not read your \*Q~/.bashrc\*U unless it is a login-shell.
.sp
.ne 3
.B "shelltitle \fItitle\fP"
@@ -4397,6 +4402,7 @@ Alternate socket directory.
Alternate user screenrc file.
.IP SHELL
Default shell program for opening windows (default \*Q/bin/sh\*U).
+See also \*Qshell\*U .screenrc command.
.IP STY
Alternate socket name.
.IP SYSSCREENRC

17
screen.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri May 2 19:42:12 UTC 2014 - andreas.stieger@gmx.de
- GNU screen 4.2.1:
* allow for terminal with long $TERM (up to 32 characters)
(already patched in this package previously)
* allow to use long logins
* documentation fixes
* runtime fixes
- packaging changes:
* use source URLs
* verify source signatures
* drop screen-man-loginshell.diff, equivalent change upstream
* drop term_too_long.diff, equivalent change upstream
* drop use_locale.diff, applied upstream
* drop msg_version_3.patch, obsolete after upstream changes
-------------------------------------------------------------------
Thu Apr 17 10:23:40 UTC 2014 - jw@suse.com

BIN
screen.keyring Normal file
View File

Binary file not shown.

18
screen.spec
View File

@ -38,25 +38,23 @@ BuildRequires: autoconf
BuildRequires: automake
PreReq: %install_info_prereq
PreReq: coreutils
Version: 4.2.0
Version: 4.2.1
Release: 0
Summary: A program to allow multiple screens on a VT100/ANSI Terminal
License: GPL-2.0+
Group: System/Console
Source: %{name}-%{version}.tar.gz
Source: http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
Source1: screen.conf
Source2: http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz.sig
Source3: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=screen&download=1#/%{name}.keyring
Patch0: global_screenrc.patch
Patch2: screen-man-loginshell.diff
Patch3: screen-4.0.3-ipv6.patch
# upstream savannah#30880
Patch4: term_too_long.diff
Patch5: sort_command.patch
Patch6: libtinfo.diff
Patch9: use_locale.diff
Patch10: screen-poll-zombies.patch
Patch11: xX_string_escape.patch
Patch12: screen_enhance_windows_list.patch
Patch13: msg_version_3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -70,26 +68,18 @@ Documentation: man page
%setup
# global_screenrc.patch
%patch0
# screen-man-loginshell.diff
%patch2 -p1
# screen-4.0.3-ipv6.patch
%patch3
# term_too_long.diff
%patch4 -p1
# sort_command.patch
%patch5
# libtinfo.diff
%patch6
# use_locale.diff
%patch9 -p1
# screen-poll-zombies.patch
%patch10 -p1
# xX_string_escape.patch
%patch11
# screen_enhance_windows_list.patch
%patch12
# msg_version_3.patch
%patch13 -p1
%build
sh ./autogen.sh

35
term_too_long.diff
View File

@ -1,35 +0,0 @@
Index: screen-4.0.3/display.h
===================================================================
--- screen-4.0.3.orig/display.h
+++ screen-4.0.3/display.h
@@ -85,7 +85,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[42 + 1]; /* $TERM */
char *d_tentry; /* buffer for tgetstr */
char d_tcinited; /* termcap inited flag */
int d_width, d_height; /* width/height of the screen */
Index: screen-4.0.3/screen.h
===================================================================
--- screen-4.0.3.orig/screen.h
+++ screen-4.0.3/screen.h
@@ -191,7 +191,7 @@ struct msg
int nargs;
char line[MAXPATHLEN];
char dir[MAXPATHLEN];
- char screenterm[20]; /* is screen really "screen" ? */
+ char screenterm[42]; /* is screen really "screen" ? */
}
create;
struct
@@ -203,7 +203,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[42 + 1]; /* terminal type */
int encoding; /* encoding of display */
int detachfirst; /* whether to detach remote sessions first */
}

12
use_locale.diff
View File

@ -1,12 +0,0 @@
diff -Pdpru a/configure.in b/configure.in
--- a/configure.in 2012-09-19 14:44:09.592017464 +0200
+++ b/configure.in 2012-09-19 15:21:45.555515336 +0200
@@ -1265,7 +1276,7 @@ if test "$enable_pam" = "yes"; then
AC_MSG_RESULT(no);LIBS="$oldlibs")
fi
-AC_ARG_ENABLE(use_locale, [ --enable-locale use localized month/day names])
+AC_ARG_ENABLE(use_locale, [ --enable-use-locale use localized month/day names])
if test "$enable_use_locale" = "yes"; then
AC_DEFINE(USE_LOCALE)
fi