From fe7d5b555dafd6f366ec46b7ece0ea24f4c68287 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 25 Jan 2017 01:24:01 +0100 Subject: [PATCH] lrzsz&minicom: Some tweaks --- packages/lrzsz/build.sh | 8 +++----- packages/lrzsz/src-Makefile.in.patch | 26 ++++++++++++++++++++++++++ packages/minicom/build.sh | 8 ++++---- packages/minicom/getdir.h.patch | 3 ++- 4 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 packages/lrzsz/src-Makefile.in.patch diff --git a/packages/lrzsz/build.sh b/packages/lrzsz/build.sh index edad836ff..4a8d2721b 100644 --- a/packages/lrzsz/build.sh +++ b/packages/lrzsz/build.sh @@ -1,8 +1,6 @@ TERMUX_PKG_HOMEPAGE=https://ohse.de/uwe/software/lrzsz.html -TERMUX_PKG_DESCRIPTION="z modem file transfer over serial terminal" +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_BUILD_IN_SRC=yes -TERMUX_PKG_DEPENDS="libandroid-support" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog" - +TERMUX_PKG_SHA256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --mandir=$TERMUX_PREFIX/share/man" diff --git a/packages/lrzsz/src-Makefile.in.patch b/packages/lrzsz/src-Makefile.in.patch new file mode 100644 index 000000000..4f1dee0ff --- /dev/null +++ b/packages/lrzsz/src-Makefile.in.patch @@ -0,0 +1,26 @@ +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 @@ + + install-exec-local: + rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` +- ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ ++ ln -s $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` + rm -f $(bindir)/`echo lsx | sed -e '$(transform)'` +- ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ ++ ln -s $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` + rm -f $(bindir)/`echo lrb | sed -e '$(transform)'` +- ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ ++ ln -s $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` + rm -f $(bindir)/`echo lrx | sed -e '$(transform)'` +- ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ ++ 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)'` \ diff --git a/packages/minicom/build.sh b/packages/minicom/build.sh index 0e954e6e4..224ed2486 100644 --- a/packages/minicom/build.sh +++ b/packages/minicom/build.sh @@ -1,8 +1,8 @@ -TERMUX_PKG_HOMEPAGE=https://alioth.debian.org/ -TERMUX_PKG_DESCRIPTION="minicom" +TERMUX_PKG_HOMEPAGE=https://alioth.debian.org/projects/minicom/ +TERMUX_PKG_DESCRIPTION="Friendly menu driven serial communication program" TERMUX_PKG_VERSION=2.7 TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=https://alioth.debian.org/frs/download.php/file/3977/minicom-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_DEPENDS="libandroid-support" +TERMUX_PKG_SHA256=9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 +TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-socket --disable-music" diff --git a/packages/minicom/getdir.h.patch b/packages/minicom/getdir.h.patch index f1d65b95c..c3fb2b2d3 100644 --- a/packages/minicom/getdir.h.patch +++ b/packages/minicom/getdir.h.patch @@ -1,11 +1,12 @@ --- ../minicom-2.7/src/getsdir.h 2009-12-13 02:47:47.000000000 +1100 +++ ./src/getsdir.h 2016-04-19 15:59:00.459999674 +1000 -@@ -23,12 +23,12 @@ +@@ -23,12 +23,13 @@ */ #include - +#include ++#include typedef struct dirEntry { /* structure of data item */ - char fname[MAXNAMLEN + 1]; /* filename + terminating null */ + char fname[NAME_MAX + 1]; /* filename + terminating null */