Merge remote-tracking branch 'mfischer/screen' into next

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

diff --git a/lfs/screen b/lfs/screen
index b94d62e6ebc3515e9fa20f4c1c974496ab04adc2..f3c451dffa5379ddfed56251944bbd72d8155464 100644 (file)
--- a/lfs/screen
+++ b/lfs/screen
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2014  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.3
+VER        = 4.2.1
 
 THISAPP    = screen-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8506fd205028a96c741e4037de6e3c42
+$(DL_FILE)_MD5 = 419a0594e2b25039239af8b90eda7d92
 
 install : $(TARGET)
 
@@ -70,7 +70,8 @@ $(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.0.3-stropts.patch
+       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.0.3-stropts.patch b/src/patches/screen-4.0.3-stropts.patch
deleted file mode 100644 (file)
index d6cbed7..0000000
--- a/src/patches/screen-4.0.3-stropts.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up screen-4.0.3/tty.sh.stropts screen-4.0.3/tty.sh
---- screen-4.0.3/tty.sh.stropts        2003-09-08 16:24:25.000000000 +0200
-+++ screen-4.0.3/tty.sh        2008-04-07 11:28:34.000000000 +0200
-@@ -76,7 +76,7 @@ exit 0
- #endif
- 
- #include "config.h"
--#ifdef SVR4
-+#if 0
- #include <sys/stropts.h>      /* for I_POP */
- #endif
- 
-diff -up screen-4.0.3/screen.c.stropts screen-4.0.3/screen.c
---- screen-4.0.3/screen.c.stropts      2008-04-07 11:25:21.000000000 +0200
-+++ screen-4.0.3/screen.c      2008-04-07 11:29:14.000000000 +0200
-@@ -50,7 +50,7 @@
- 
- #include "config.h"
- 
--#ifdef SVR4
-+#if 0
- # include <sys/stropts.h>
- #endif
- 
-diff -up screen-4.0.3/process.c.stropts screen-4.0.3/process.c
---- screen-4.0.3/process.c.stropts     2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.3/process.c     2008-04-07 11:29:47.000000000 +0200
-@@ -37,7 +37,7 @@
- #include "config.h"
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
-+#if 0 
- # include <sys/stropts.h>
- #endif
- 
-diff -up screen-4.0.3/pty.c.stropts screen-4.0.3/pty.c
---- screen-4.0.3/pty.c.stropts 2003-09-08 16:26:18.000000000 +0200
-+++ screen-4.0.3/pty.c 2008-04-07 11:30:07.000000000 +0200
-@@ -34,7 +34,7 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
-+#if 0 
- # include <sys/stropts.h>
- #endif
- 

diff --git a/src/patches/screen-4.2.1-altscreen.patch b/src/patches/screen-4.2.1-altscreen.patch
new file mode 100644 (file)
index 0000000..0a35166
--- /dev/null
+++ b/src/patches/screen-4.2.1-altscreen.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644 (file)
index 0000000..c6809af
--- /dev/null
+++ b/src/patches/screen-4.2.1-cpation-hardstatus.patch
@@ -0,0 +1,16 @@
+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;
+