diff --git a/disabled-packages/lrzsz/build.sh b/disabled-packages/lrzsz/build.sh deleted file mode 100644 index 4a8d2721b..000000000 --- a/disabled-packages/lrzsz/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://ohse.de/uwe/software/lrzsz.html -TERMUX_PKG_DESCRIPTION="Tools for zmodem/xmodem/ymodem file transfer" -TERMUX_PKG_VERSION=0.12.20 -TERMUX_PKG_SRCURL=https://ohse.de/uwe/releases/lrzsz-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --mandir=$TERMUX_PREFIX/share/man" diff --git a/packages/lrzsz/build.sh b/packages/lrzsz/build.sh new file mode 100644 index 000000000..bb69f241a --- /dev/null +++ b/packages/lrzsz/build.sh @@ -0,0 +1,15 @@ +TERMUX_PKG_HOMEPAGE=https://ohse.de/uwe/software/lrzsz.html +TERMUX_PKG_DESCRIPTION="Tools for zmodem/xmodem/ymodem file transfer" +TERMUX_PKG_LICENSE="GPL-2.0" +TERMUX_PKG_VERSION=0.12.21-rc1 +_COMMIT=8cb2a6a29f6345f84d5e8248e2d3376166ab844f +TERMUX_PKG_SRCURL=https://github.com/UweOhse/lrzsz/archive/$_COMMIT.tar.gz +TERMUX_PKG_SHA256=56f79c3eb8f6b140693667802d516824c2e115a83d15e1b4d5adbe1deab7c2e0 +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--disable-syslog +--mandir=$TERMUX_PREFIX/share/man +" + +termux_step_pre_configure() { + autoreconf -vfi +} diff --git a/packages/lrzsz/configure.ac.patch b/packages/lrzsz/configure.ac.patch new file mode 100644 index 000000000..872b863d9 --- /dev/null +++ b/packages/lrzsz/configure.ac.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.orig 2021-11-10 10:02:16.023654429 +0100 ++++ ./configure.ac 2021-11-10 10:02:41.180869468 +0100 +@@ -145,7 +145,7 @@ + AC_SUBST(LIBS) + + AM_GNU_GETTEXT(external) +-AM_GNU_GETTEXT_VERSION ++AM_GNU_GETTEXT_VERSION([0.19]) + + dnl AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[The name of the directory for locale stuff]) + diff --git a/packages/lrzsz/locale.patch b/packages/lrzsz/locale.patch new file mode 100644 index 000000000..7f117836d --- /dev/null +++ b/packages/lrzsz/locale.patch @@ -0,0 +1,26 @@ +--- ./src/lrz.c.orig 2021-11-10 10:16:37.913534371 +0100 ++++ ./src/lrz.c 2021-11-10 10:18:10.292214167 +0100 +@@ -195,8 +195,9 @@ + + lrzsz_check_stderr(&config); + chkinvok(argv[0]); /* if called as [-]rzCOMMAND set flag */ +- ++#ifndef __ANDROID__ + setlocale (LC_ALL, ""); ++#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + +--- ./src/lsz.c.orig 2021-11-10 10:28:24.495598664 +0100 ++++ ./src/lsz.c 2021-11-10 10:28:44.152693678 +0100 +@@ -268,8 +269,9 @@ + Restricted=1; + lrzsz_check_stderr(&config); + chkinvok(argv[0]); +- ++#ifndef __ANDROID__ + setlocale (LC_ALL, ""); ++#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + diff --git a/packages/lrzsz/log.patch b/packages/lrzsz/log.patch new file mode 100644 index 000000000..0f756dee5 --- /dev/null +++ b/packages/lrzsz/log.patch @@ -0,0 +1,60 @@ +--- ./src/iomode.c.orig 2021-11-10 10:09:28.314172038 +0100 ++++ ./src/iomode.c 2021-11-10 10:08:57.053490735 +0100 +@@ -26,6 +26,7 @@ + #include "lrzsz.h" + + #include ++#include + + static struct termios oldtty; + +--- ./src/lrz.c.orig 2021-11-10 10:07:52.992094536 +0100 ++++ ./src/lrz.c 2021-11-10 10:08:43.819868988 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include "timing.h" + #include "long-options.h" +--- ./src/log.c.orig 2021-11-10 10:08:42.623176240 +0100 ++++ ./src/log.c 2021-11-10 10:08:49.183319213 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const char *username; + static int lrzsz_locallog_severity=LOG_INFO; +--- ./src/zm.c.orig 2021-11-10 10:15:55.309272598 +0100 ++++ ./src/zm.c 2021-11-10 10:16:04.896148184 +0100 +@@ -40,6 +40,7 @@ + #include "lrzsz.h" + + #include ++#include + + unsigned int Rxtimeout = 100; /* Tenths of seconds to wait for something */ + +--- ./src/lsz.c.orig 2021-11-10 10:26:52.693598169 +0100 ++++ ./src/lsz.c 2021-11-10 10:27:05.573878846 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + struct lrzsz_config config; + +--- ./src/zreadline.c.orig 2021-11-10 10:29:30.677040827 +0100 ++++ ./src/zreadline.c 2021-11-10 10:29:41.483942987 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "error.h" + diff --git a/disabled-packages/lrzsz/src-Makefile.in.patch b/packages/lrzsz/src-Makefile.am.patch similarity index 75% rename from disabled-packages/lrzsz/src-Makefile.in.patch rename to packages/lrzsz/src-Makefile.am.patch index 4f1dee0ff..6091f23fb 100644 --- a/disabled-packages/lrzsz/src-Makefile.in.patch +++ b/packages/lrzsz/src-Makefile.am.patch @@ -1,9 +1,6 @@ -Hard links are not supported on Android 6.0+ - -diff -u -r ../lrzsz-0.12.20/src/Makefile.in ./src/Makefile.in ---- ../lrzsz-0.12.20/src/Makefile.in 1998-12-30 17:31:46.000000000 +0100 -+++ ./src/Makefile.in 2017-01-25 01:17:46.135033894 +0100 -@@ -370,16 +370,16 @@ +--- ./src/Makefile.am.orig 2021-11-10 10:12:52.155281162 +0100 ++++ ./src/Makefile.am 2021-11-10 10:13:10.452346589 +0100 +@@ -16,19 +16,19 @@ install-exec-local: rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` @@ -23,4 +20,8 @@ diff -u -r ../lrzsz-0.12.20/src/Makefile.in ./src/Makefile.in + ln -s $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` # rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'` - # ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \ +-# ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \ ++# ln -s $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \ + # $(bindir)/`echo lrzszbug |sed -e '$(transform)'` + + uninstall-local: