From a97ac5dc0346cf6bb077c91e0cd2af1dbb5fdf8dc8582d33454a6fc2e755660d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 May 2014 09:40:51 +0000 Subject: [PATCH] Accepting request 232488 from home:AndreasStieger:branches:Base:System GNU screen 4.2.1 OBS-URL: https://build.opensuse.org/request/show/232488 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=55 --- msg_version_3.patch | 13 ---- screen-4.2.0.tar.gz | 3 - screen-4.2.1.tar.gz | 3 + screen-4.2.1.tar.gz.sig | Bin 0 -> 543 bytes screen-man-loginshell.diff | 142 ------------------------------------- screen.changes | 17 +++++ screen.keyring | Bin 0 -> 3394 bytes screen.spec | 18 ++--- term_too_long.diff | 35 --------- use_locale.diff | 12 ---- 10 files changed, 24 insertions(+), 219 deletions(-) delete mode 100644 msg_version_3.patch delete mode 100644 screen-4.2.0.tar.gz create mode 100644 screen-4.2.1.tar.gz create mode 100644 screen-4.2.1.tar.gz.sig delete mode 100644 screen-man-loginshell.diff create mode 100644 screen.keyring delete mode 100644 term_too_long.diff delete mode 100644 use_locale.diff diff --git a/msg_version_3.patch b/msg_version_3.patch deleted file mode 100644 index d065c0c..0000000 --- a/msg_version_3.patch +++ /dev/null @@ -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 diff --git a/screen-4.2.0.tar.gz b/screen-4.2.0.tar.gz deleted file mode 100644 index 03df903..0000000 --- a/screen-4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dc1b7a3e7669eefe7e65f32e201704d7a11cc688244fcf71757f7792a5ff413 -size 786565 diff --git a/screen-4.2.1.tar.gz b/screen-4.2.1.tar.gz new file mode 100644 index 0000000..67d434b --- /dev/null +++ b/screen-4.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 +size 1062485 diff --git a/screen-4.2.1.tar.gz.sig b/screen-4.2.1.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..1f6779347c388e7bd0e91f9802808f0733089e91418a1852f96b6f4772f6ffc9 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SW*H1p-rDgn9r92@tmkql3jh^Q7S$5CEb(GCo|@i`$VNet7h_ zv4N-6g;&VT6M-I6F{O<0U7s3#q5vHF`u9dVF`I#4<_R+wXiE*_O&oXeJ~o`HWO5!4<P}5-%?Ux&t>dh hx!zZA&U@iy)lz!5d-Fz-?B$@pTh0pG+c>-n&9xHw1_%HE literal 0 HcmV?d00001 diff --git a/screen-man-loginshell.diff b/screen-man-loginshell.diff deleted file mode 100644 index f5b7282..0000000 --- a/screen-man-loginshell.diff +++ /dev/null @@ -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 diff --git a/screen.changes b/screen.changes index 2778ad4..a5d10b6 100644 --- a/screen.changes +++ b/screen.changes @@ -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 diff --git a/screen.keyring b/screen.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..c5a953dc22d06f45cfc9b7575d506b6459561f33ece9f209d4a8dd7a5e598fc9 GIT binary patch literal 3394 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: 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 */ - } diff --git a/use_locale.diff b/use_locale.diff deleted file mode 100644 index 958e196..0000000 --- a/use_locale.diff +++ /dev/null @@ -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