[packages/screen] - updated to 5.0.0
qboosh
qboosh at pld-linux.org
Sun Sep 1 19:54:29 CEST 2024
commit ea24d5a450f80c7c6f744f2e978014e92079eabb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 1 19:39:07 2024 +0200
- updated to 5.0.0
screen-4.1.0-suppress_remap.patch | 22 ++--
screen-E3.patch | 62 ----------
screen-bracketed_paste_mode.patch | 247 --------------------------------------
screen-ia64.patch | 12 --
screen-info.patch | 57 +++++----
screen-manual.patch | 28 ++---
screen-no-libs.patch | 14 ---
screen.spec | 14 +--
8 files changed, 60 insertions(+), 396 deletions(-)
---
diff --git a/screen.spec b/screen.spec
index 85f809d..9d8aacb 100644
--- a/screen.spec
+++ b/screen.spec
@@ -10,29 +10,25 @@ Summary(ru.UTF-8): Менеджер экрана, поддерживающий
Summary(tr.UTF-8): Bir uçbirimde birden fazla oturumu düzenler
Summary(uk.UTF-8): Менеджер екрану, що підтримує кілька логінів з одного терміналу
Name: screen
-Version: 4.9.1
+Version: 5.0.0
Release: 1
License: GPL v3+
Group: Applications/Terminal
Source0: https://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
-# Source0-md5: 9a9bdc956bd93e4f0cb9e48678889e26
+# Source0-md5: befc115989242ed4bceeff8d8bfeb4e6
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 236166e774cee788cf594b05dd1dd70d
Source2: %{name}.pamd
Source3: %{name}rc
Patch2: %{name}-manual.patch
-Patch3: %{name}-ia64.patch
Patch4: %{name}-info.patch
Patch7: %{name}-no_hardcoded_term_sequences.patch
Patch8: %{name}-home_etc.patch
-Patch9: %{name}-no-libs.patch
Patch12: %{name}-screenrc.patch
Patch13: %{name}-osc.patch
-Patch17: %{name}-E3.patch
Patch18: %{name}-4.1.0-suppress_remap.patch
-Patch23: %{name}-bracketed_paste_mode.patch
URL: http://www.gnu.org/software/screen/
-BuildRequires: autoconf >= 2.60
+BuildRequires: autoconf >= 2.71
BuildRequires: automake
BuildRequires: ncurses-devel >= 5.0
BuildRequires: pam-devel
@@ -97,19 +93,15 @@ Screen корисний користувачам, які заходять на
%prep
%setup -q
%patch2 -p1
-%patch3 -p0
%patch4 -p1
# DON'T ENABLE IT UNLESS YOU REALLY FIX IT
# (it's heavily broken - note that some sequences should be get for
# $TERM before running screen instance, and others for TERM=screen!)
###%patch7 -p1
#%patch8 -p1
-%patch9 -p1
%patch12 -p1
#%patch13 -p1 # my brain farted here, see if you have better luck
-%patch17 -p2
%patch18 -p1
-%patch23 -p1
%build
%{__aclocal}
diff --git a/screen-4.1.0-suppress_remap.patch b/screen-4.1.0-suppress_remap.patch
index 85109a2..3c6077f 100644
--- a/screen-4.1.0-suppress_remap.patch
+++ b/screen-4.1.0-suppress_remap.patch
@@ -1,13 +1,13 @@
Author: Loic Minier <lool at dooz.org>
Description: Unbreak several useful keybindings.
---- a/termcap.c
-+++ b/termcap.c
-@@ -552,8 +552,6 @@
- else
- break;
- }
-- if (n < KMAP_KEYS)
-- domap = 1;
- if (map == 0 && domap)
- return 0;
- if (map && !domap)
+--- screen-5.0.0/termcap.c.orig 2024-09-01 19:21:35.029767789 +0200
++++ screen-5.0.0/termcap.c 2024-09-01 19:22:08.722918591 +0200
+@@ -449,8 +449,6 @@ int remap(int n, int map)
+ } else
+ break;
+ }
+- if (n < KMAP_KEYS)
+- domap = 1;
+ if (map == 0 && domap)
+ return 0;
+ if (map && !domap)
diff --git a/screen-E3.patch b/screen-E3.patch
deleted file mode 100644
index ba83dc9..0000000
--- a/screen-E3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit 0aec2900f63820c3405ba38a4d1cd67cc22f0715
-Author: Miroslav Lichvar <mlichvar at redhat.com>
-Date: Mon Jul 18 17:26:47 2011 +0200
-
- Clear scrollback buffer when locking terminal
-
- Linux kernel 3.0 adds a new command to clear the scrollback buffer in
- the linux console. It's available in the ncurses terminfo entry as
- extended capability E3. This is useful to prevent an attacker to read
- content of a locked terminal via Shift-PgUp key.
-
-diff --git a/src/display.c b/src/display.c
-index 5fa11cb..038c435 100644
---- a/src/display.c
-+++ b/src/display.c
-@@ -3779,4 +3779,10 @@ char **cmdv;
-
- #endif /* BLANKER_PRG */
-
-+void
-+ClearScrollbackBuffer()
-+{
-+ if (D_CE3)
-+ AddCStr(D_CE3);
-+}
-
-diff --git a/src/extern.h b/src/extern.h
-index c787d99..d3fecf0 100644
---- a/src/extern.h
-+++ b/src/extern.h
-@@ -316,6 +316,7 @@ extern int color256to88 __P((int));
- extern void ResetIdle __P((void));
- extern void KillBlanker __P((void));
- extern void DisplaySleep1000 __P((int, int));
-+extern void ClearScrollbackBuffer __P((void));
-
- /* resize.c */
- extern int ChangeWindowSize __P((struct win *, int, int, int));
-diff --git a/src/screen.c b/src/screen.c
-index cc8f565..3efb67b 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -1967,6 +1967,7 @@ int mode;
-
- case D_LOCK:
- ClearAll();
-+ ClearScrollbackBuffer();
- sign = SIG_LOCK;
- /* tell attacher to lock terminal with a lockprg. */
- break;
-diff --git a/src/term.c b/src/term.c
-index 991de1b..7485900 100644
---- a/src/term.c
-+++ b/src/term.c
-@@ -83,6 +83,7 @@ struct term term[T_N] =
- { "CD", T_STR },
- { "ce", T_STR },
- { "cb", T_STR },
-+ { "E3", T_STR },
-
- /* initialise */
- { "is", T_STR },
diff --git a/screen-bracketed_paste_mode.patch b/screen-bracketed_paste_mode.patch
deleted file mode 100644
index a780f69..0000000
--- a/screen-bracketed_paste_mode.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -ruNp screen-4.8.0.orig/ansi.c screen-4.8.0/ansi.c
---- screen-4.8.0.orig/ansi.c 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/ansi.c 2020-11-01 19:13:54.023721138 +0100
-@@ -195,6 +195,8 @@ register struct win *p;
- p->w_insert = 0;
- p->w_revvid = 0;
- p->w_mouse = 0;
-+ p->w_bracketed = 0;
-+ p->w_cursorstyle = 0;
- p->w_curinv = 0;
- p->w_curvvis = 0;
- p->w_autolf = 0;
-@@ -1346,6 +1348,12 @@ int c, intermediate;
- break;
- }
- break;
-+ case ' ':
-+ if (c == 'q') {
-+ curr->w_cursorstyle = a1;
-+ LCursorStyle(&curr->w_layer, curr->w_cursorstyle);
-+ }
-+ break;
- case '?':
- for (a2 = 0; a2 < curr->w_NumArgs; a2++)
- {
-@@ -1477,6 +1485,10 @@ int c, intermediate;
- LExtMouseMode(&curr->w_layer, curr->w_extmouse);
- break;
- /* case 1015: UXRVT mouse mode rejected */
-+ case 2004: /* bracketed paste mode */
-+ curr->w_bracketed = i ? 1 : 0;
-+ LBracketedPasteMode(&curr->w_layer, curr->w_bracketed);
-+ break;
- }
- }
- break;
-diff -ruNp screen-4.8.0.orig/display.c screen-4.8.0/display.c
---- screen-4.8.0.orig/display.c 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/display.c 2020-11-01 19:20:51.953148789 +0100
-@@ -130,6 +130,8 @@ struct display TheDisplay;
- int defobuflimit = OBUF_MAX;
- int defnonblock = -1;
- int defmousetrack = 0;
-+int defbracketed = 0;
-+int defcursorstyle = 0;
- #ifdef AUTO_NUKE
- int defautonuke = 0;
- #endif
-@@ -192,6 +194,8 @@ DefRestore()
- LCursorkeysMode(flayer, 0);
- LCursorVisibility(flayer, 0);
- LMouseMode(flayer, 0);
-+ LBracketedPasteMode(flayer, 0);
-+ LCursorStyle(flayer, 0);
- LSetRendition(flayer, &mchar_null);
- LSetFlow(flayer, nwin_default.flowflag & FLOW_NOW);
- }
-@@ -323,6 +327,8 @@ struct mode *Mode;
- D_user = *u;
- D_processinput = ProcessInput;
- D_mousetrack = defmousetrack;
-+ D_bracketed = defbracketed;
-+ D_cursorstyle = defcursorstyle;
- return display;
- }
-
-@@ -497,6 +503,8 @@ FinitTerm()
- D_mousetrack = 0;
- MouseMode(0);
- ExtMouseMode(0);
-+ BracketedPasteMode(0);
-+ CursorStyle(0);
- SetRendition(&mchar_null);
- SetFlow(FLOW_NOW);
- #ifdef MAPKEYS
-@@ -871,6 +879,42 @@ ExtMouseMode(mode)
- }
- }
-
-+void BracketedPasteMode(int mode)
-+{
-+ if (!display)
-+ return;
-+
-+ if (D_bracketed != mode) {
-+ if (!D_CXT)
-+ return;
-+ if (D_bracketed) {
-+ AddStr("\033[?2004l");
-+ }
-+ if (mode) {
-+ AddStr("\033[?2004h");
-+ }
-+ D_bracketed = mode;
-+ }
-+}
-+
-+void CursorStyle(int mode)
-+{
-+ char buf[32];
-+
-+ if (!display)
-+ return;
-+
-+ if (D_cursorstyle != mode) {
-+ if (!D_CXT)
-+ return;
-+ if (mode < 0)
-+ return;
-+ sprintf(buf, "\033[%d q", mode);
-+ AddStr(buf);
-+ D_cursorstyle = mode;
-+ }
-+}
-+
- static int StrCost;
-
- /* ARGSUSED */
-@@ -1297,6 +1341,8 @@ int cur_only;
- CursorVisibility(0);
- MouseMode(0);
- ExtMouseMode(0);
-+ BracketedPasteMode(0);
-+ CursorStyle(0);
- SetRendition(&mchar_null);
- SetFlow(FLOW_NOW);
-
-@@ -3198,6 +3244,8 @@ NukePending()
- int oldcurvis = D_curvis;
- int oldmouse = D_mouse;
- int oldextmouse = D_extmouse;
-+ int oldbracketed = D_bracketed;
-+ int oldcursorstyle = D_cursorstyle;
-
- oldrend = D_rend;
- len = D_obufp - D_obuf;
-@@ -3261,6 +3309,8 @@ NukePending()
- CursorVisibility(oldcurvis);
- MouseMode(oldmouse);
- ExtMouseMode(oldextmouse);
-+ BracketedPasteMode(oldbracketed);
-+ CursorStyle(oldcursorstyle);
- if (D_CWS)
- {
- debug("ResizeDisplay: using WS\n");
-diff -ruNp screen-4.8.0.orig/display.h screen-4.8.0/display.h
---- screen-4.8.0.orig/display.h 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/display.h 2020-11-01 19:21:49.009918688 +0100
-@@ -111,6 +111,8 @@ struct display
- struct mouse_parse d_mouse_parse; /* state of mouse code parsing */
- int d_mousetrack; /* set when user wants to use mouse even when the window
- does not */
-+ int d_bracketed; /* bracketed paste mode */
-+ int d_cursorstyle; /* cursor style */
- #ifdef RXVT_OSC
- int d_xtermosc[5]; /* osc used */
- #endif
-@@ -198,6 +200,8 @@ extern struct display TheDisplay;
-
- #define D_user DISPLAY(d_user)
- #define D_username (DISPLAY(d_user) ? DISPLAY(d_user)->u_name : 0)
-+#define D_bracketed DISPLAY(d_bracketed)
-+#define D_cursorstyle DISPLAY(d_cursorstyle)
- #define D_canvas DISPLAY(d_canvas)
- #define D_cvlist DISPLAY(d_cvlist)
- #define D_layout DISPLAY(d_layout)
-diff -ruNp screen-4.8.0.orig/extern.h screen-4.8.0/extern.h
---- screen-4.8.0.orig/extern.h 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/extern.h 2020-11-01 19:22:46.794689164 +0100
-@@ -291,6 +291,8 @@ extern void ReverseVideo __P((int));
- extern void CursorVisibility __P((int));
- extern void MouseMode __P((int));
- extern void ExtMouseMode __P((int));
-+extern void BracketedPasteMode (int);
-+extern void CursorStyle (int);
- extern void SetFont __P((int));
- extern void SetAttr __P((int));
- extern void SetColor __P((int, int));
-@@ -452,6 +454,8 @@ extern void LKeypadMode __P((struct lay
- extern void LCursorkeysMode __P((struct layer *, int));
- extern void LMouseMode __P((struct layer *, int));
- extern void LExtMouseMode __P((struct layer *, int));
-+extern void LBracketedPasteMode (struct layer *, int);
-+extern void LCursorStyle (struct layer *, int);
- #if defined(USEVARARGS)
- extern void LMsg __P((int, const char *, ...)) __attribute__((format(printf, 2, 3)));
- #else
-diff -ruNp screen-4.8.0.orig/layer.c screen-4.8.0/layer.c
---- screen-4.8.0.orig/layer.c 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/layer.c 2020-11-01 19:23:49.096422746 +0100
-@@ -840,6 +840,32 @@ void LMouseMode(struct layer *l, int on)
- }
- }
-
-+void LBracketedPasteMode(struct layer *l, int on)
-+{
-+ struct canvas *cv;
-+ for (cv = l->l_cvlist; cv; cv = cv->c_lnext) {
-+ display = cv->c_display;
-+ if (D_blocked)
-+ continue;
-+ if (cv != D_forecv)
-+ continue;
-+ BracketedPasteMode(on);
-+ }
-+}
-+
-+void LCursorStyle(struct layer *l, int style)
-+{
-+ struct canvas *cv;
-+ for (cv = l->l_cvlist; cv; cv = cv->c_lnext) {
-+ display = cv->c_display;
-+ if (D_blocked)
-+ continue;
-+ if (cv != D_forecv)
-+ continue;
-+ CursorStyle(style);
-+ }
-+}
-+
- void LClearAll(struct layer *l, int uself)
- {
- LClearArea(l, 0, 0, l->l_width - 1, l->l_height - 1, 0, uself);
-diff -ruNp screen-4.8.0.orig/window.c screen-4.8.0/window.c
---- screen-4.8.0.orig/window.c 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/window.c 2020-11-01 19:25:26.665004901 +0100
-@@ -509,6 +509,8 @@ WinRestore()
- CursorVisibility(fore->w_curinv ? -1 : fore->w_curvvis);
- MouseMode(fore->w_mouse);
- ExtMouseMode(fore->w_extmouse);
-+ BracketedPasteMode(fore->w_bracketed);
-+ CursorStyle(fore->w_cursorstyle);
- }
- }
-
-diff -ruNp screen-4.8.0.orig/window.h screen-4.8.0/window.h
---- screen-4.8.0.orig/window.h 2020-02-05 21:09:38.000000000 +0100
-+++ screen-4.8.0/window.h 2020-11-01 19:26:23.990767940 +0100
-@@ -241,6 +241,8 @@ struct win
- #endif
- int w_mouse; /* mouse mode 0,9,1000 */
- int w_extmouse; /* extended mouse mode 0,1006 */
-+ int w_bracketed; /* bracketed paste mode */
-+ int w_cursorstyle; /* cursor style */
- #ifdef HAVE_BRAILLE
- int w_bd_x, w_bd_y; /* Braille cursor position */
- #endif
diff --git a/screen-ia64.patch b/screen-ia64.patch
deleted file mode 100644
index 2cf84f9..0000000
--- a/screen-ia64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig Wed Jun 14 16:04:17 2000
-+++ configure.ac Fri Sep 8 19:15:51 2000
-@@ -625,6 +625,9 @@
- #include <string.h>
- #include <term.h>
-
-+
-+extern char *tgoto(char *,int,int);
-+
- int
- main()
- {
diff --git a/screen-info.patch b/screen-info.patch
index 6d8ef9d..3e23f72 100644
--- a/screen-info.patch
+++ b/screen-info.patch
@@ -1,5 +1,5 @@
---- screen-4.7.0/doc/screen.texinfo.orig 2019-10-02 00:07:59.000000000 +0200
-+++ screen-4.7.0/doc/screen.texinfo 2019-11-12 21:00:02.497808741 +0100
+--- screen-5.0.0/doc/screen.texinfo.orig 2024-08-28 21:55:03.000000000 +0200
++++ screen-5.0.0/doc/screen.texinfo 2024-09-01 19:14:07.342193120 +0200
@@ -4,14 +4,14 @@
@documentencoding ISO-8859-15
@setfilename screen.info
@@ -9,7 +9,7 @@
@finalout
@setchapternewpage odd
@c %**end of header
- @set version 4.9.1
+ @set version 5.0.0
@direntry
-* Screen: (screen). Full-screen window manager.
@@ -17,7 +17,7 @@
@end direntry
@c For examples, use a literal escape in info.
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ start the @code{emacs} editor (editing @
the invoking shell to the application (emacs in this case), because it is
forked from the parent screen process, not from the invoking shell.
@@ -26,7 +26,7 @@
will be written to this file for each window, and removed when the
window is closed. This is useful for working with @code{talk},
@code{script}, @code{shutdown}, @code{rsend}, @code{sccs} and other
-@@ -497,7 +497,7 @@
+@@ -503,7 +503,7 @@ to be executed at startup, or on the fly
@cindex screenrc
When @code{screen} is invoked, it executes initialization commands from
the files @file{.screenrc} in the user's home directory and
@@ -34,8 +34,8 @@
+ at file{/etc/screenrc}. These defaults can be overridden in the
following ways:
For the global screenrc file @code{screen} searches for the environment
- variable @code{$SYSSCREENRC} (this override feature may be disabled at
-@@ -1036,7 +1036,7 @@
+ variable @code{$SYSTEM_SCREENRC} (this override feature may be disabled at
+@@ -1044,7 +1044,7 @@ Append to hardcopy files. @xref{Hardcop
Place, where to dump hardcopy files. @xref{Hardcopy}.
@item hardstatus [@var{state}]
Use the hardware status line. @xref{Hardware Status Line}.
@@ -44,7 +44,7 @@
Set display height. @xref{Window Size}.
@item help [-c @var{class}]
Display current key bindings. @xref{Help}.
-@@ -1089,7 +1089,7 @@
+@@ -1097,7 +1097,7 @@ Log all output in the current window. @
@item logfile @var{filename}
Place where to collect logfiles. @xref{Log}.
@item login [@var{state}]
@@ -53,7 +53,16 @@
@item logtstamp [@var{state}]
Configure logfile time-stamps. @xref{Log}.
@item mapdefault
-@@ -2405,7 +2404,7 @@
+@@ -1772,7 +1772,7 @@ Without a parameter, the current message
+ @kindex C-x
+ @deffn Command lockscreen
+ (@kbd{C-a x}, @kbd{C-a C-x})@*
+-Call a screenlock program (@file{/local/bin/lck} or @file{/usr/bin/lock}
++Call a screenlock program (@file{/bin/lock} or @file{/usr/bin/lock}
+ or a builtin, if no other is available). Screen does not accept any
+ command keys until this program terminates. Meanwhile processes in the
+ windows may continue, as the windows are in the detached state.
+@@ -2414,7 +2414,7 @@ terminal emulation itself.
* Naming Windows:: Control the name of the window
* Console:: See the host's console messages
* Kill:: Destroy an unwanted window
@@ -62,7 +71,7 @@
* Mode:: Control the file mode of the pty
* Monitor:: Watch for activity or inactivity in a window
* Windows:: List the active windows
-@@ -2614,7 +2613,7 @@
+@@ -2623,7 +2623,7 @@ compile time (@pxref{Installation}). Bot
@kindex L
@deffn Command login [state]
(@kbd{C-a L})@*
@@ -71,10 +80,10 @@
This controls whether or not the window is @dfn{logged in}. In addition
to this toggle, it is convenient to have ``log in'' and ``log out''
keys. For instance, @code{bind I login on} and @code{bind O
-@@ -5802,22 +5801,19 @@
+@@ -5748,21 +5748,18 @@ Examples in the @code{screen} distributi
global initialization files.
- @item @code{$SYSSCREENRC}
+ @item @code{$SYSTEM_SCREENRC}
- at itemx /local/etc/screenrc
+ at itemx /etc/screenrc
@code{screen} initialization commands
@@ -88,16 +97,16 @@
@item @code{$SCREENDIR}/S- at var{login}
- at item /local/screens/S- at var{login}
-+ at item /tmp/screens/S- at var{login}
- Socket directories (default)
-
+-Socket directories (default)
+-
- at item /usr/tmp/screens/S- at var{login}
-Alternate socket directories.
--
++ at item /tmp/screens/S- at var{login}
++Socket directories.
+
@item @var{socket directory}/.termcap
Written by the @code{dumptermcap} command
-
-@@ -5835,7 +5831,7 @@
+@@ -5781,7 +5778,7 @@ Output log files created by the log comm
@itemx /etc/termcap
Terminal capability databases
@@ -106,22 +115,20 @@
Login records
@item @code{$LOCKPRG}
-@@ -5860,10 +5856,10 @@
+@@ -5806,9 +5803,9 @@ Contributors @*
============
@verbatim
-- Maarten ter Huurne <maarten at treewalker.org>,
-- Jussi Kukkonen <jussi.kukkonen at intel.com>,
+- Eric S. Raymond <esr at thyrsus.com>,
- Thomas Renninger <treen at suse.com>,
- Axel Beckert <abe at deuxchevaux.org>,
-+ Maarten ter Huurne <maarten@@treewalker.org>,
-+ Jussi Kukkonen <jussi.kukkonen@@intel.com>,
++ Eric S. Raymond <esr@@thyrsus.com>,
+ Thomas Renninger <treen@@suse.com>,
+ Axel Beckert <abe@@deuxchevaux.org>,
Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
-@@ -5947,10 +5943,10 @@
+@@ -5892,10 +5889,10 @@ capabilities to @code{$TERMCAP} may not
in order to be able to
correctly change the owner of the tty device file for each window.
Special permission may also be required to write the file
@@ -134,7 +141,7 @@
with SIGKILL. This will cause some programs (like "w" or "rwho") to
advertise that a user is logged on who really isn't.
-@@ -6030,8 +6026,7 @@
+@@ -5972,8 +5969,7 @@ does not include these features of 4.2 a
@cindex socket directory
The socket directory defaults either to @file{$HOME/.screen} or simply to
diff --git a/screen-manual.patch b/screen-manual.patch
index ab6ddb5..0d271a9 100644
--- a/screen-manual.patch
+++ b/screen-manual.patch
@@ -1,6 +1,6 @@
---- screen-4.2.1/doc/screen.1.orig 2014-04-28 00:10:01.000000000 +0200
-+++ screen-4.2.1/doc/screen.1 2014-07-20 09:45:37.959175974 +0200
-@@ -103,7 +103,7 @@
+--- screen-5.0.0/doc/screen.1.orig 2024-08-28 21:55:03.000000000 +0200
++++ screen-5.0.0/doc/screen.1 2024-09-01 18:59:59.180121342 +0200
+@@ -100,7 +100,7 @@ to its window. - Note that you cannot tr
the invoking shell to the application (emacs in this case), because it is
forked from the parent screen process, not from the invoking shell.
.PP
@@ -9,7 +9,7 @@
.IR screen ,
an appropriate record will be written to this file for each window, and
removed when the window is terminated.
-@@ -232,7 +232,7 @@
+@@ -229,7 +229,7 @@ See the \*Qdefflow\*U .screenrc command
The use of this option is discouraged.
.TP 5
.BR \-l " and " \-ln
@@ -18,7 +18,7 @@
This can also be defined through the \*Qdeflogin\*U .screenrc command.
.TP 5
.BR \-ls " [" \fImatch ]
-@@ -625,7 +625,7 @@
+@@ -767,7 +767,7 @@ _
.SH CUSTOMIZATION
The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
@@ -27,7 +27,7 @@
.I screen
is installed setuid-root, then the administrator
should compile
-@@ -638,7 +638,7 @@
+@@ -780,7 +780,7 @@ in the environment variable $SCREENDIR.
When
.I screen
is invoked, it executes initialization commands from the files
@@ -36,7 +36,7 @@
\*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
defaults\*U that can be overridden in the following ways: for the
global screenrc file
-@@ -1845,7 +1845,7 @@
+@@ -2047,7 +2047,7 @@ when seeing proper escape sequence. See
The echo command may be used to annoy
.I screen
users with a 'message of the
@@ -45,10 +45,10 @@
The option \*Q\-n\*U may be used to suppress the line feed.
See also \*Qsleep\*U.
Echo is also useful for online checking of environment variables.
-@@ -4857,20 +4857,18 @@
+@@ -5194,20 +5194,20 @@ Examples in the
.I screen
distribution package for private and global initialization files.
- .IP $SYSSCREENRC
+ .IP $SYSSCREENRC
-.IP /usr/local/etc/screenrc
+.IP /etc/screenrc
.I screen
@@ -58,11 +58,11 @@
-Read in after /usr/local/etc/screenrc
+Read in after /etc/screenrc
.IP $SCREENDIR/S\-<login>
--.IP /local/screens/S\-<login>
-+.IP /tmp/screens/S\-<login>
+ .IP $HOME/.screen
Socket directories (default)
-.IP /usr/tmp/screens/S\-<login>
--Alternate socket directories.
++.IP /tmp/screens/S\-<login>
+ Alternate socket directories.
.IP "<socket directory>/.termcap"
Written by the "termcap" output function
-.IP /usr/tmp/screens/screen\-exchange
@@ -70,7 +70,7 @@
or
.IP /tmp/screen\-exchange
.I screen
-@@ -4879,11 +4877,9 @@
+@@ -5216,11 +5216,9 @@ or
Screen images created by the hardcopy function
.IP screenlog.[0-9]
Output log files created by the log function
@@ -84,7 +84,7 @@
Login records
.IP $LOCKPRG
Program that locks a terminal.
-@@ -5005,9 +5001,9 @@
+@@ -5333,9 +5331,9 @@ does not make use of hardware tabs.
must be installed as set-uid with owner root on most systems in order
to be able to correctly change the owner of the tty device file for
each window.
diff --git a/screen-no-libs.patch b/screen-no-libs.patch
deleted file mode 100644
index 1e8f38e..0000000
--- a/screen-no-libs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- screen-4.7.0/configure.ac.orig 2019-11-12 21:01:24.174032929 +0100
-+++ screen-4.7.0/configure.ac 2019-11-12 21:02:55.326872445 +0100
-@@ -864,11 +864,6 @@
- dnl
- dnl **** loadav ****
- dnl
--if test "$cross_compiling" = no ; then
--AC_CHECKING(for libutil(s))
--test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
--test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
--fi
-
- AC_CHECKING(getloadavg)
- AC_TRY_LINK([
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/screen.git/commitdiff/ea24d5a450f80c7c6f744f2e978014e92079eabb
More information about the pld-cvs-commit
mailing list