diff --git a/root-packages/chroot/build.sh b/root-packages/chroot/build.sh deleted file mode 100644 index 9757712ee..000000000 --- a/root-packages/chroot/build.sh +++ /dev/null @@ -1,48 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/ -TERMUX_PKG_DESCRIPTION="Chroot utility from the Coreutils" -TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=8.31 -TERMUX_PKG_SHA256=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd -TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz - -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -gl_cv_host_operating_system=Android -ac_cv_func_getpass=yes ---disable-xattr ---without-gmp -" - -termux_step_pre_configure() { - CPPFLAGS+=" -DDEFAULT_TMPDIR=\\\"$TERMUX_PREFIX/tmp\\\"" - CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0" -} - -termux_step_make() { - # deps for chroot. - make lib/configmake.h - make src/version.h - make lib/fcntl.h - make lib/time.h - make lib/sys/stat.h - make lib/selinux/context.h - make lib/selinux/selinux.h - make lib/unitypes.h - make lib/unistr.h - make lib/uniwidth.h - make lib/stdint.h - make lib/stdio.h - make lib/fnmatch.h - make lib/getopt.h - make lib/getopt-cdefs.h - - # build standalone chroot utility. - make src/chroot -} - -termux_step_make_install() { - mkdir -p $TERMUX_PREFIX/share/man/man1 - install -Dm700 $TERMUX_PKG_BUILDDIR/src/chroot \ - $TERMUX_PREFIX/bin/ - install -Dm600 $TERMUX_PKG_SRCDIR/man/chroot.1 \ - $TERMUX_PREFIX/share/man/man1/ -} diff --git a/root-packages/chroot/configure.patch b/root-packages/chroot/configure.patch deleted file mode 100644 index 779c6b227..000000000 --- a/root-packages/chroot/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../configure.orig 2019-04-04 22:05:58.910698449 +0200 -+++ ./configure 2019-04-04 22:08:58.330693037 +0200 -@@ -43326,7 +43326,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/root-packages/chroot/mktemp.patch b/root-packages/chroot/mktemp.patch deleted file mode 100644 index 58cdbd4c7..000000000 --- a/root-packages/chroot/mktemp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r ../coreutils-8.22/src/mktemp.c ./src/mktemp.c ---- ../coreutils-8.22/src/mktemp.c 2013-12-04 15:48:30.000000000 +0100 -+++ ./src/mktemp.c 2014-06-03 11:31:58.351787119 +0200 -@@ -269,7 +269,7 @@ - else if (dest_dir_arg && *dest_dir_arg) - dest_dir = dest_dir_arg; - else -- dest_dir = "/tmp"; -+ dest_dir = "@TERMUX_PREFIX@/tmp"; - - if (last_component (template) != template) - error (EXIT_FAILURE, 0, -@@ -283,7 +283,7 @@ - else - { - char *env = getenv ("TMPDIR"); -- dest_dir = (env && *env ? env : "/tmp"); -+ dest_dir = (env && *env ? env : "@TERMUX_PREFIX@/tmp"); - } - if (IS_ABSOLUTE_FILE_NAME (template)) - error (EXIT_FAILURE, 0, diff --git a/root-packages/chroot/nohup.c.patch b/root-packages/chroot/nohup.c.patch deleted file mode 100644 index b8b7b7b12..000000000 --- a/root-packages/chroot/nohup.c.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix - error: call to '__umask_invalid_mode' declared with - attribute error: umask called with invalid mode -on android-21 - -diff -u -r ../coreutils-8.23/src/nohup.c ./src/nohup.c ---- ../coreutils-8.23/src/nohup.c 2014-07-11 07:00:07.000000000 -0400 -+++ ./src/nohup.c 2014-12-14 15:22:47.939242789 -0500 -@@ -141,7 +141,7 @@ - char const *file = "nohup.out"; - int flags = O_CREAT | O_WRONLY | O_APPEND; - mode_t mode = S_IRUSR | S_IWUSR; -- mode_t umask_value = umask (~mode); -+ mode_t umask_value = umask (0777 & ~mode); - out_fd = (redirecting_stdout - ? fd_reopen (STDOUT_FILENO, file, flags, mode) - : open (file, flags, mode)); diff --git a/root-packages/chroot/pwd.c.patch b/root-packages/chroot/pwd.c.patch deleted file mode 100644 index a1503d170..000000000 --- a/root-packages/chroot/pwd.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../coreutils-8.23/src/pwd.c ./src/pwd.c ---- ../coreutils-8.23/src/pwd.c 2014-07-13 18:09:52.000000000 -0400 -+++ ./src/pwd.c 2015-05-17 19:58:20.692454980 -0400 -@@ -366,7 +366,7 @@ - if (optind < argc) - error (0, 0, _("ignoring non-option arguments")); - -- if (logical) -+ if (true) /* Termux: Always try logical, to avoid permission denied on /data/data */ - { - wd = logical_getcwd (); - if (wd) diff --git a/root-packages/chroot/src-ls.c.patch b/root-packages/chroot/src-ls.c.patch deleted file mode 100644 index 1109184d1..000000000 --- a/root-packages/chroot/src-ls.c.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -r ../coreutils-8.26/src/ls.c ./src/ls.c ---- ../coreutils-8.26/src/ls.c 2016-11-22 15:04:32.000000000 -0500 -+++ ./src/ls.c 2016-11-30 20:27:28.910732105 -0500 -@@ -1749,6 +1749,9 @@ - } - } - -+ /* Termux patch: Default to colors if terminal. The --color option may override this. */ -+ print_with_color = isatty(STDOUT_FILENO); -+ - while (true) - { - int oi = -1;