screen: update to 4.8.0

This commit is contained in:
Leonid Pliushch 2020-02-10 14:16:53 +02:00
parent 4ed8419472
commit 1dd8816757
2 changed files with 17 additions and 21 deletions

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/screen/
TERMUX_PKG_DESCRIPTION="Terminal multiplexer with VT100/ANSI terminal emulation"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=4.7.0
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=4.8.0
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/screen/screen-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1
TERMUX_PKG_SHA256=6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1
TERMUX_PKG_DEPENDS="ncurses, libcrypt"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-socket-dir

View File

@ -1,19 +1,16 @@
--- ../cache/screen-4.4.0/misc.c 2016-06-19 19:41:03.000000000 +0000
+++ ./misc.c 2016-12-20 03:13:04.387236649 +0000
@@ -37,7 +37,6 @@
#ifdef SVR4
# include <sys/resource.h>
#endif
-
extern struct layer *flayer;
diff -uNr screen-4.8.0/misc.c screen-4.8.0.mod/misc.c
--- screen-4.8.0/misc.c 2020-02-05 22:09:38.000000000 +0200
+++ screen-4.8.0.mod/misc.c 2020-02-10 14:15:45.256423801 +0200
@@ -389,8 +389,11 @@
int maxfd, i, ret, z;
extern int eff_uid, real_uid;
@@ -379,6 +378,8 @@
#endif /* SVR4 */
#if defined(SYSV) && defined(NOFILE) && !defined(ISC)
f = NOFILE;
+#elif defined(__ANDROID__)
+ f = sysconf(_SC_OPEN_MAX);
#else /* SYSV && !ISC */
f = getdtablesize();
#endif /* SYSV && !ISC */
i = 3; /* skip stdin, stdout and stderr */
+#if defined(__ANDROID__)
+ maxfd = sysconf(_SC_OPEN_MAX);
+#else
maxfd = getdtablesize();
-
+#endif
while (i < maxfd)
{
memset(pfd, 0, sizeof(pfd));