From d766e1a4c1e85e397b00f464c0b96211b6d2763f Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Wed, 23 Feb 2022 00:24:03 +0900
Subject: [PATCH] screen: Update to 4.9.0

---
 .../{config.h.in.patch => acconfig.h.patch}   |  7 +++---
 packages/screen/build.sh                      |  9 ++++----
 packages/screen/fileio.c.patch                | 23 +++++++++----------
 3 files changed, 18 insertions(+), 21 deletions(-)
 rename packages/screen/{config.h.in.patch => acconfig.h.patch} (60%)

diff --git a/packages/screen/config.h.in.patch b/packages/screen/acconfig.h.patch
similarity index 60%
rename from packages/screen/config.h.in.patch
rename to packages/screen/acconfig.h.patch
index b69946490..1e7eaaf01 100644
--- a/packages/screen/config.h.in.patch
+++ b/packages/screen/acconfig.h.patch
@@ -1,7 +1,6 @@
-diff -u -r ../screen-4.5.1/config.h.in ./config.h.in
---- ../screen-4.5.1/config.h.in	2017-02-25 16:36:04.156952072 +0100
-+++ ./config.h.in	2017-04-24 23:19:53.515909451 +0200
-@@ -192,7 +192,9 @@
+--- a/acconfig.h
++++ b/acconfig.h
+@@ -191,7 +191,9 @@
   * If screen is installed with permissions to update /etc/utmp (such
   * as if it is installed set-uid root), define UTMPOK.
   */
diff --git a/packages/screen/build.sh b/packages/screen/build.sh
index cb4818e91..99679f9b3 100644
--- a/packages/screen/build.sh
+++ b/packages/screen/build.sh
@@ -1,20 +1,19 @@
 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_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=4.8.0
+TERMUX_PKG_VERSION=4.9.0
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/screen/screen-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1
+TERMUX_PKG_SHA256=f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4
 TERMUX_PKG_DEPENDS="ncurses, libcrypt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-socket-dir
 --enable-colors256
---with-ssl=openssl
 "
 
 termux_step_pre_configure() {
 	# Run autoreconf since we have patched configure.ac
-	autoconf
+	autoreconf -fi
 	CFLAGS+=" -DGETUTENT"
 	export LIBS="-lcrypt"
 }
diff --git a/packages/screen/fileio.c.patch b/packages/screen/fileio.c.patch
index 356b4df43..4645282e1 100644
--- a/packages/screen/fileio.c.patch
+++ b/packages/screen/fileio.c.patch
@@ -1,14 +1,13 @@
-diff -u -r ../screen-4.5.1/fileio.c ./fileio.c
---- ../screen-4.5.1/fileio.c	2017-02-25 16:35:35.132808149 +0100
-+++ ./fileio.c	2017-04-24 23:26:50.355204362 +0200
-@@ -721,8 +721,8 @@
+--- a/fileio.c
++++ b/fileio.c
+@@ -731,8 +731,8 @@
  #ifdef SIGPIPE
-       signal(SIGPIPE, SIG_DFL);
+ 		signal(SIGPIPE, SIG_DFL);
  #endif
--      execl("/bin/sh", "sh", "-c", cmd, (char *)0);
--      Panic(errno, "/bin/sh");
-+      execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (char *)0);
-+      Panic(errno, "@TERMUX_PREFIX@/bin/sh");
-     default:
-       break;
-   }
+-		execl("/bin/sh", "sh", "-c", cmd, (char *)0);
+-		Panic(errno, "/bin/sh");
++		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (char *)0);
++		Panic(errno, "@TERMUX_PREFIX@/bin/sh");
+ 	default:
+ 		break;
+ 	}