diff --git a/packages/findutils/build.sh b/packages/findutils/build.sh index 134dbe8e1..5e6eef2c0 100644 --- a/packages/findutils/build.sh +++ b/packages/findutils/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/findutils/ TERMUX_PKG_DESCRIPTION="Utilities to find files meeting specified criteria and perform various actions on the files which are found" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=4.6.0 -TERMUX_PKG_REVISION=4 -TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/findutils/findutils-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d +TERMUX_PKG_VERSION=4.7.0 +TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/findutils/findutils-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_ESSENTIAL=true diff --git a/packages/findutils/configure.patch b/packages/findutils/configure.patch index 0c90bf4ac..160e87b24 100644 --- a/packages/findutils/configure.patch +++ b/packages/findutils/configure.patch @@ -10,12 +10,3 @@ diff -uNr findutils-4.6.0/configure findutils-4.6.0.mod/configure LIBTHREAD= LTLIBTHREAD= -@@ -31716,7 +31716,7 @@ - - - # Determine how to get the list of mounted file systems. --ac_list_mounted_fs= -+ac_list_mounted_fs=found - - # If the getmntent function is available but not in the standard library, - # make sure LIBS contains the appropriate -l option. diff --git a/packages/findutils/find-parser.c.patch b/packages/findutils/find-parser.c.patch new file mode 100644 index 000000000..567d10ab9 --- /dev/null +++ b/packages/findutils/find-parser.c.patch @@ -0,0 +1,16 @@ +diff -u -r ../findutils-4.7.0/find/parser.c ./find/parser.c +--- ../findutils-4.7.0/find/parser.c 2019-08-29 19:10:57.000000000 +0000 ++++ ./find/parser.c 2019-09-08 08:27:46.805564375 +0000 +@@ -69,10 +69,10 @@ + + + #ifndef HAVE_ENDGRENT +-# define endgrent () ++# define endgrent() + #endif + #ifndef HAVE_ENDPWENT +-# define endpwent () ++# define endpwent() + #endif + + static bool parse_accesscheck (const struct parser_table*, char *argv[], int *arg_ptr); diff --git a/packages/findutils/parser.c.patch b/packages/findutils/parser.c.patch deleted file mode 100644 index 03a8d0ecb..000000000 --- a/packages/findutils/parser.c.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r ../findutils-4.5.14/find/parser.c ./find/parser.c ---- ../findutils-4.5.14/find/parser.c 2014-07-19 12:12:59.000000000 +0200 -+++ ./find/parser.c 2014-08-11 22:58:04.839140727 +0200 -@@ -75,10 +75,10 @@ - #endif - - #ifndef HAVE_ENDGRENT --#define endgrent () -+#define endgrent() - #endif - #ifndef HAVE_ENDPWENT --#define endpwent () -+#define endpwent() - #endif - - static bool parse_accesscheck (const struct parser_table*, char *argv[], int *arg_ptr);