qemu-user: Don't pass flags to faccessat2() (#18571)

termux · Nov 25, 2023 · ef193c0 · ef193c0
1 parent 4458142
commit ef193c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/qemu-system-x86-64-headless/0007-fix-syscalls.patch b/packages/qemu-system-x86-64-headless/0007-fix-syscalls.patch
@@ -209,6 +209,15 @@ diff -uNr qemu-5.1.0/linux-user/syscall.c qemu-5.1.0.mod/linux-user/syscall.c
      case TARGET_NR_futimesat:
          {
              struct timeval *tvp, tv[2];
+@@ -9247,7 +9323,7 @@
+         if (!(p = lock_user_string(arg2))) {
+             return -TARGET_EFAULT;
+         }
+-        ret = get_errno(faccessat(arg1, p, arg3, arg4));
++        ret = get_errno(faccessat(arg1, p, arg3, 0)); // https://github.com/termux/proot/discussions/291
+         unlock_user(p, arg2, 0);
+         return ret;
+ #endif
 @@ -12008,7 +12084,7 @@
      /* Not implemented for now... */
  /*     case TARGET_NR_mq_notify: */

diff --git a/packages/qemu-system-x86-64-headless/build.sh b/packages/qemu-system-x86-64-headless/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualiz
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1:8.0.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION:2}.tar.xz
 TERMUX_PKG_SHA256=f060abd435fbe6794125e2c398568ffc3cfa540042596907a8b18edca34cf6a5
 TERMUX_PKG_DEPENDS="glib, libbz2, libcurl, libgmp, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libslirp, libspice-server, libssh, libusb, libusbredir, ncurses, pulseaudio, qemu-common, resolv-conf, zlib, zstd"