From ef6f0e7beb68300efb51a69369ec65260cbad23b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 18 May 2019 10:24:17 +0200 Subject: [PATCH 1/2] mlocate: avoid using setgid Fixes https://github.com/termux/termux-packages/issues/3824 --- packages/mlocate/build.sh | 2 +- packages/mlocate/no_getid.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/mlocate/no_getid.patch diff --git a/packages/mlocate/build.sh b/packages/mlocate/build.sh index cca455391e..a62fcba5ce 100644 --- a/packages/mlocate/build.sh +++ b/packages/mlocate/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" # like in '*.deb'. TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_VERSION=0.26 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://releases.pagure.org/mlocate/mlocate-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e diff --git a/packages/mlocate/no_getid.patch b/packages/mlocate/no_getid.patch new file mode 100644 index 0000000000..aad9980327 --- /dev/null +++ b/packages/mlocate/no_getid.patch @@ -0,0 +1,13 @@ +--- src/locate.c.orig ++++ src/locate.c +@@ -945,8 +945,10 @@ + static void + drop_setgid (void) + { ++#if !defined(__ANDROID__) + if (setgid (getgid ()) != 0) + error (EXIT_FAILURE, errno, _("can not drop privileges")); ++#endif + } + + /* Handle a conf_dbpath ENTRY, drop privileges when they are no longer From d3d3bfc24f75da5e36749a7692d6d91d45d88573 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 18 May 2019 10:31:22 +0200 Subject: [PATCH 2/2] mlocate: fix getid patch --- packages/mlocate/no_getid.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mlocate/no_getid.patch b/packages/mlocate/no_getid.patch index aad9980327..64899f5e86 100644 --- a/packages/mlocate/no_getid.patch +++ b/packages/mlocate/no_getid.patch @@ -1,5 +1,5 @@ ---- src/locate.c.orig -+++ src/locate.c +--- ../locate.c.orig ++++ ./src/locate.c @@ -945,8 +945,10 @@ static void drop_setgid (void)