screen: Update to 4.8.0

- Update screen from 4.2.1 to 4.8.0
- Changelog
	Version 4.8.0 (05/02/2020)
	  * Improve startup time by only polling for files to close
	  Fixes:
		- Fix for segfault if termcap doesn't have Km entry
		- Make screen exit code be 0 when checking --version
		- Fix potential memory corruption when using OSC 49
	Version 4.7.0 (02/10/2019)
	  * Add support for SGR (1006) mouse mode
	  * Add support for OSC 11
	  * Update Unicode ambiguous and wide tables to 12.1.0
	  * Fixes:
	  - cross-compilation support (bug #43223)
	  - a lot of manpage fixes and cleanups
	Version 4.6.2 (23/10/2017):
	  * Fixes:
		- revert changes to cursor position restore behavour (bug #51832)
		- set freed pointer to NULL (bug #52133)
		- documentation fixes
		- fix windowlist crashes (bug #43054 & #51500)
	Version 4.6.1 (10/07/2017):
	  * Fixes:
		- problems with starting session in some cases
		- parallel make install
		- segfault when querying info on nonUTF locale (bug #51402)
	Version 4.6.0 (28/06/2017):
	  * Update Unicode wide tables to 9.0 (bug #50044)
	  * Support more serial speeds
	  * Improved namespaces support
	  * Migrate from fifos to sockets
	  * Start viewing scrollback at first line of output (bug #49377)
	Version 4.5.1 (25/02/2017):
	  * Fixes:
		- logfile permissions problem (CVE-2017-5618)
		- SunOS build problem (bug #50089)
		- FreeBSD core dumps (bug #50143)
	Version 4.5.0 (10/12/2016):
	  * Allow specifying logfile's name via command line parameter '-L'
	  * Fixes:
		- broken handling of "bind u digraph U+" (bug #48691)
		- crash with long $TERM (bug #48983)
		- crash when bumping blank window
		- build for AIX (bug #49149)
		- %x improperly separating arguments
		- install with custom DESTDIR (bug #48370)
	Version 4.4.0 (19/06/2016):
	  * Support up to 24 function keys
	  * Fix runtime issues
	  * 'logfile' command, starts logging into new file upon changing
	Version 4.3.1 (28/06/2015):
	  * Fix resize bug
	Version 4.3.0 (13/06/2015):
	  * Introduce Xx string escape showing the executed command of a window
	  * Implement dead/zombie window polling, allowing for auto reconnecting
	  * Allow setting hardstatus on first line
	  New Commands:
	  * 'sort' command sorting windows by title
	  * 'bumpleft', 'bumpright' - manually move windows on window list
	  * 'collapse' removing numbering 'gaps' between windows, by renumbering
	  * 'windows' command now accepts arguments for use with querying
- Rootfile updated
- Two screen patchfiles deleted as the patch changes are now built into
	the source files

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/screen b/config/rootfiles/common/screen
index 6124db15f7e629b354fc21ae596331247f4e85fc..b30c8ddb560aa70cb6797db98cdf8ba654dd680c 100644 (file)
--- a/config/rootfiles/common/screen
+++ b/config/rootfiles/common/screen
@@ -1,13 +1,6 @@
 etc/screenrc
 usr/bin/screen
-usr/bin/screen-4.2.1
-#usr/info/screen.info
-#usr/info/screen.info-1
-#usr/info/screen.info-2
-#usr/info/screen.info-3
-#usr/info/screen.info-4
-#usr/info/screen.info-5
-#usr/man/man1/screen.1
+usr/bin/screen-4.8.0
 #usr/share/info/screen.info
 #usr/share/man/man1/screen.1
 #usr/share/screen

diff --git a/lfs/screen b/lfs/screen
index eb56ace7cdb321d23ae6d2831a252b71e449b8a5..33102615ab70d82aed7b3a8d7c137ef443075ce1 100644 (file)
--- a/lfs/screen
+++ b/lfs/screen
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.1
+VER        = 4.8.0
 
 THISAPP    = screen-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 419a0594e2b25039239af8b90eda7d92
+$(DL_FILE)_MD5 = d276213d3acd10339cd37848b8c4ab1e
 
 install : $(TARGET)
 
@@ -70,8 +70,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/screen-4.2.1-cpation-hardstatus.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/screen-4.2.1-altscreen.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --with-socket-dir=/var/run/screen --with-sys-screenrc=/etc/screenrc
        cd $(DIR_APP) && sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/*
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/src/patches/screen-4.2.1-altscreen.patch b/src/patches/screen-4.2.1-altscreen.patch
deleted file mode 100644 (file)
index 0a35166..0000000
--- a/src/patches/screen-4.2.1-altscreen.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/ansi.c b/src/ansi.c
-index e76eef4..bbdc119 100644
---- a/ansi.c
-+++ b/ansi.c
-@@ -1444,8 +1444,8 @@ int c, intermediate;
-                 else
-                   {
-                     if (curr->w_alt.on) {
--                      LeaveAltScreen(curr);
--                      RestoreCursor(&curr->w_alt.cursor);
-+                      RestoreCursor(&curr->w_alt.cursor);
-+                      LeaveAltScreen(curr);
-                     }
-                   }
-                 if (a1 == 47 && !i)
-

diff --git a/src/patches/screen-4.2.1-cpation-hardstatus.patch b/src/patches/screen-4.2.1-cpation-hardstatus.patch
deleted file mode 100644 (file)
index c6809af..0000000
--- a/src/patches/screen-4.2.1-cpation-hardstatus.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/screen.c b/src/screen.c
-index 473e4fa..8b36bea 100644
---- a/screen.c
-+++ b/screen.c
-@@ -2271,8 +2271,8 @@ int padlen;
-         while (i-- > 0)
-           *pn-- = ' ';
-         numpad--;
--        if (r && p - buf == winmsg_rendpos[r - 1])
--          winmsg_rendpos[--r] = pn - buf;
-+        if (r && p - buf + 1== winmsg_rendpos[r - 1])
-+          winmsg_rendpos[--r] = pn - buf + 1;
-       }
-     }
-   return pn2;
-