diff --git a/packages/sharutils/build.sh b/packages/sharutils/build.sh index bc77167b1..3e5214572 100644 --- a/packages/sharutils/build.sh +++ b/packages/sharutils/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utilities for packaging and unpackaging shell archives" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.15.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/sharutils/sharutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=2b05cff7de5d7b646dc1669bc36c35fdac02ac6ae4b6c19cb3340d87ec553a9a TERMUX_PKG_DEPENDS="libandroid-support" diff --git a/packages/sharutils/fix-duplicate-symbols.patch b/packages/sharutils/fix-duplicate-symbols.patch new file mode 100644 index 000000000..548b9c20d --- /dev/null +++ b/packages/sharutils/fix-duplicate-symbols.patch @@ -0,0 +1,44 @@ +--- ./src/shar-opts.h 2015-05-30 21:04:12.000000000 +0530 ++++ ./src/shar-opts.h.mod 2021-10-30 17:17:40.099631929 +0530 +@@ -352,7 +352,7 @@ + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + extern bool initialization_done; + extern int optidx; +--- ./src/unshar-opts.h 2015-05-30 21:04:18.000000000 +0530 ++++ ./src/unshar-opts.h.mod 2021-10-30 17:17:01.289631943 +0530 +@@ -192,7 +192,7 @@ + extern size_t separator_str_len; + + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +--- ./src/uudecode-opts.h 2015-05-30 21:04:21.000000000 +0530 ++++ ./src/uudecode-opts.h.mod 2021-10-30 17:18:33.319631908 +0530 +@@ -170,7 +170,7 @@ + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +--- ./src/uuencode-opts.h 2015-05-30 21:04:25.000000000 +0530 ++++ ./src/uuencode-opts.h.mod 2021-10-30 17:18:04.149631919 +0530 +@@ -166,7 +166,7 @@ + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * diff --git a/packages/sharutils/lib-stdio-impl.h.patch b/packages/sharutils/lib-stdio-impl.h.patch new file mode 100644 index 000000000..a47b82eb3 --- /dev/null +++ b/packages/sharutils/lib-stdio-impl.h.patch @@ -0,0 +1,13 @@ +--- ./lib/stdio-impl.h 2021-10-30 16:01:14.636375086 +0530 ++++ ./lib/stdio-impl.h.mod 2021-10-30 16:01:32.306375079 +0530 +@@ -26,6 +26,10 @@ + # include + #endif + ++#if defined __ANDROID__ ++#include ++#endif ++ + #include /* For detecting Plan9. */ + + #if defined __sferror || defined __DragonFly__ || defined __ANDROID__