From 3f3b0a0272f3e3a1c05bfc68949630069790bb1b Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Wed, 29 Dec 2021 15:20:46 +0900
Subject: [PATCH] new package: zssh

---
 packages/zssh/Makefile.in.patch     | 21 +++++++++++
 packages/zssh/build.sh              | 14 +++++++
 packages/zssh/escape.c.patch        | 58 +++++++++++++++++++++++++++++
 packages/zssh/misc.c.patch          | 24 ++++++++++++
 packages/zssh/openpty.c.patch       | 13 +++++++
 packages/zssh/quote_removal.c.patch | 15 ++++++++
 packages/zssh/zmodem_act.c.patch    | 23 ++++++++++++
 7 files changed, 168 insertions(+)
 create mode 100644 packages/zssh/Makefile.in.patch
 create mode 100644 packages/zssh/build.sh
 create mode 100644 packages/zssh/escape.c.patch
 create mode 100644 packages/zssh/misc.c.patch
 create mode 100644 packages/zssh/openpty.c.patch
 create mode 100644 packages/zssh/quote_removal.c.patch
 create mode 100644 packages/zssh/zmodem_act.c.patch

diff --git a/packages/zssh/Makefile.in.patch b/packages/zssh/Makefile.in.patch
new file mode 100644
index 000000000..8d8d56d6b
--- /dev/null
+++ b/packages/zssh/Makefile.in.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -71,13 +71,13 @@
+ 
+ ztelnet : $(NAME)
+ 	@-rm $@ > /dev/null 2>&1
+-	ln $(NAME) $@
++	ln -s $(NAME) $@
+ 
+ install :
+-	strip $(NAME)
+-	$(INSTALL) -m 0711 zssh @bindir@
+-	ln -f @bindir@/zssh  @bindir@/ztelnet
+-	$(INSTALL) -m 0644 $(MANS) @mandir@/man1
++	$(STRIP) $(NAME)
++	$(INSTALL) -Dm 0711 -t @bindir@ zssh
++	ln -fs @bindir@/zssh  @bindir@/ztelnet
++	$(INSTALL) -Dm 0644 -t @mandir@/man1 $(MANS) 
+ 
+ uninstall :
+ 	-cd @bindir@      && rm $(PRGS)
diff --git a/packages/zssh/build.sh b/packages/zssh/build.sh
new file mode 100644
index 000000000..f6ab9b547
--- /dev/null
+++ b/packages/zssh/build.sh
@@ -0,0 +1,14 @@
+TERMUX_PKG_HOMEPAGE=http://zssh.sourceforge.net/
+TERMUX_PKG_DESCRIPTION="A program for interactively transferring files to a remote machine while using the secure shell (ssh)"
+TERMUX_PKG_LICENSE="GPL-2.0"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=1.5c
+TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/zssh/zssh-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_SHA256=a2e840f82590690d27ea1ea1141af509ee34681fede897e58ae8d354701ce71b
+TERMUX_PKG_DEPENDS="libandroid-glob, lrzsz, openssh, readline"
+TERMUX_PKG_BUILD_IN_SRC=true
+
+termux_step_pre_configure() {
+	echo "ac_cv_func_getpgrp_void=yes" >> config.cache
+	LDFLAGS+=" -landroid-glob"
+}
diff --git a/packages/zssh/escape.c.patch b/packages/zssh/escape.c.patch
new file mode 100644
index 000000000..24456690d
--- /dev/null
+++ b/packages/zssh/escape.c.patch
@@ -0,0 +1,58 @@
+--- a/escape.c
++++ b/escape.c
+@@ -10,11 +10,8 @@
+ 
+ #include "zssh.h"
+ 
+-int		pc_escape_double_chr(str,i,chr,c2)
+-char		*str;
+-int		*i;
+-char		chr;
+-char		c2;
++int
++pc_escape_double_chr(char *str, int *i, char chr, char c2)
+ {
+    int		j;
+    
+@@ -32,11 +29,8 @@
+    return (1);
+ }
+ 
+-int		pc_escape_par(str,i,c1,c2)
+-char		*str;
+-int		*i;
+-char		c1;
+-char		c2;
++int
++pc_escape_par(char *str, int *i, char c1, char c2)
+ {
+    int		n;
+    int		j;
+@@ -65,11 +59,8 @@
+ }
+ 
+ 
+-int		pc_escape_backslash(str,i,c1,c2)
+-char		*str;
+-int		*i;
+-char		c1;
+-char		c2;
++int
++pc_escape_backslash(char *str, int *i, char c1, char c2)
+ {
+    if (str[*i] != '\\')
+       return (0);
+@@ -82,11 +73,8 @@
+ 
+ 
+ 
+-int		pc_escape_dollar_par(str,i,c1,c2)
+-char		*str;
+-int		*i;
+-char		c1;
+-char		c2;
++int
++pc_escape_dollar_par(char *str, int *i, char c1, char c2)
+ {
+    int		n;
+    int		j;
diff --git a/packages/zssh/misc.c.patch b/packages/zssh/misc.c.patch
new file mode 100644
index 000000000..0bd255e04
--- /dev/null
+++ b/packages/zssh/misc.c.patch
@@ -0,0 +1,24 @@
+--- a/misc.c
++++ b/misc.c
+@@ -11,8 +11,8 @@
+ #include "zssh.h"
+ 
+ 
+-char            *chr2str(chr)
+-char            chr;
++char *
++chr2str(char chr)
+ {
+    char         *pt;
+ 
+@@ -32,8 +32,8 @@
+ };
+ 
+ 
+-int     mi_is_whitespace(chr)
+-char    chr;
++int
++mi_is_whitespace(char chr)
+ {
+    int  j;
+    
diff --git a/packages/zssh/openpty.c.patch b/packages/zssh/openpty.c.patch
new file mode 100644
index 000000000..bdaefcc25
--- /dev/null
+++ b/packages/zssh/openpty.c.patch
@@ -0,0 +1,13 @@
+--- a/openpty.c
++++ b/openpty.c
+@@ -10,6 +10,10 @@
+ 
+ #include "zssh.h"
+ 
++#ifdef __ANDROID__
++#include <pty.h>
++#endif
++
+ #define GL_SLAVENAMELEN	50
+ static char	gl_slavename[GL_SLAVENAMELEN + 1] = {0};
+ 
diff --git a/packages/zssh/quote_removal.c.patch b/packages/zssh/quote_removal.c.patch
new file mode 100644
index 000000000..a0ca45b48
--- /dev/null
+++ b/packages/zssh/quote_removal.c.patch
@@ -0,0 +1,15 @@
+--- a/quote_removal.c
++++ b/quote_removal.c
+@@ -23,10 +23,8 @@
+    return (1);
+ }
+ 
+-int		pc_remove_double_chr(str,i,chr)
+-char		*str;
+-int		*i;
+-char		chr;
++int
++pc_remove_double_chr(char *str, int *i, char chr)
+ {
+    str_shift(str,*i,1);
+    while (str[*i] && str[*i] != chr)
diff --git a/packages/zssh/zmodem_act.c.patch b/packages/zssh/zmodem_act.c.patch
new file mode 100644
index 000000000..eb5d127e1
--- /dev/null
+++ b/packages/zssh/zmodem_act.c.patch
@@ -0,0 +1,23 @@
+--- a/zmodem_act.c
++++ b/zmodem_act.c
+@@ -113,6 +113,9 @@
+ char	**av;
+ int	master;
+ {
++   char cmd[10] = "l";
++   strncat(cmd, av[0], sizeof(cmd)-1);
++   if (!sfork(&gl_child_rz))
+    tcsetattr(gl_slave, TCSAFLUSH, &gl_rtt);
+    if (!sfork(&gl_child_rz))
+    {
+@@ -120,8 +123,8 @@
+       signal(SIGWINCH,SIG_DFL);
+       dup2(master,0);
+       dup2(master,1);
+-      execvp(av[0],av);
+-      error("error: execvp %s\n",av[0]);
++      execvp(cmd,av);
++      error("error: execvp %s\n",cmd);
+       exit (1);
+    }
+ #ifdef DEBUG