From 1332e5c9261149edcb3cf6c597d51c4a07ea9a4d Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sun, 2 Jan 2022 11:44:08 +0100
Subject: [PATCH] valgrind: update to 3.18.1

---
 packages/valgrind/build.sh       |  4 ++--
 packages/valgrind/no-statx.patch | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh
index b2af000b9..8c0f5ad7d 100644
--- a/packages/valgrind/build.sh
+++ b/packages/valgrind/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://valgrind.org/
 TERMUX_PKG_DESCRIPTION="Instrumentation framework for building dynamic analysis tools"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.17.0
+TERMUX_PKG_VERSION=3.18.1
 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2
+TERMUX_PKG_SHA256=00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5
 TERMUX_PKG_BREAKS="valgrind-dev"
 TERMUX_PKG_REPLACES="valgrind-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-tmpdir=$TERMUX_PREFIX/tmp"
diff --git a/packages/valgrind/no-statx.patch b/packages/valgrind/no-statx.patch
index 5ff852d70..1ab97c43f 100644
--- a/packages/valgrind/no-statx.patch
+++ b/packages/valgrind/no-statx.patch
@@ -1,7 +1,7 @@
 diff -uNr valgrind-3.16.1/coregrind/m_aspacemgr/aspacemgr-common.c valgrind-3.16.1.mod/coregrind/m_aspacemgr/aspacemgr-common.c
---- valgrind-3.16.1/coregrind/m_aspacemgr/aspacemgr-common.c	2019-12-27 16:51:44.000000000 +0200
-+++ valgrind-3.16.1.mod/coregrind/m_aspacemgr/aspacemgr-common.c	2020-10-01 18:18:17.072570786 +0300
-@@ -319,6 +319,7 @@
+--- ./coregrind/m_aspacemgr/aspacemgr-common.c.orig	2021-10-10 16:17:32.000000000 +0200
++++ ./coregrind/m_aspacemgr/aspacemgr-common.c	2022-01-02 11:31:30.967514202 +0100
+@@ -330,6 +330,7 @@
  #  if defined(VGO_linux) || defined(VGO_darwin)
     SysRes          res;
  #  if defined(VGO_linux)
@@ -9,14 +9,15 @@ diff -uNr valgrind-3.16.1/coregrind/m_aspacemgr/aspacemgr-common.c valgrind-3.16
     /* First try with statx. */
     struct vki_statx bufx;
     const char* file_name = "";
-@@ -330,6 +331,7 @@
+@@ -341,6 +342,7 @@
        *mode = (UInt)bufx.stx_mode;
        return True;
     }
 +#endif
- #  endif
+ #  endif // VGO_linux only
+ 
  #  if defined(VGO_linux) && defined(__NR_fstat64)
-    /* fstat64 is second candidate as it can cope with minor and major device
+
 diff -uNr valgrind-3.16.1/coregrind/m_libcfile.c valgrind-3.16.1.mod/coregrind/m_libcfile.c
 --- valgrind-3.16.1/coregrind/m_libcfile.c	2019-12-27 16:51:44.000000000 +0200
 +++ valgrind-3.16.1.mod/coregrind/m_libcfile.c	2020-10-01 18:20:40.369886417 +0300