diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh index 35cd37156..fe8d19ae0 100644 --- a/packages/valgrind/build.sh +++ b/packages/valgrind/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://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.18.1 +TERMUX_PKG_VERSION=3.17.0 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5 +TERMUX_PKG_SHA256=ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2 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 663729f77..5ff852d70 100644 --- a/packages/valgrind/no-statx.patch +++ b/packages/valgrind/no-statx.patch @@ -1,7 +1,7 @@ -diff -uNr valgrind-3.18.1/coregrind/m_aspacemgr/aspacemgr-common.c valgrind-3.18.1.mod/coregrind/m_aspacemgr/aspacemgr-common.c ---- valgrind-3.18.1/coregrind/m_aspacemgr/aspacemgr-common.c 2021-10-10 15:17:32.000000000 +0100 -+++ valgrind-3.18.1.mod/coregrind/m_aspacemgr/aspacemgr-common.c 2021-12-07 17:12:30.102144500 +0000 -@@ -330,6 +330,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 @@ # if defined(VGO_linux) || defined(VGO_darwin) SysRes res; # if defined(VGO_linux) @@ -9,18 +9,18 @@ diff -uNr valgrind-3.18.1/coregrind/m_aspacemgr/aspacemgr-common.c valgrind-3.18 /* First try with statx. */ struct vki_statx bufx; const char* file_name = ""; -@@ -341,6 +342,7 @@ +@@ -330,6 +331,7 @@ *mode = (UInt)bufx.stx_mode; return True; } +#endif - # endif // VGO_linux only - + # endif # if defined(VGO_linux) && defined(__NR_fstat64) -diff -uNr valgrind-3.18.1/coregrind/m_libcfile.c valgrind-3.18.1.mod/coregrind/m_libcfile.c ---- valgrind-3.18.1/coregrind/m_libcfile.c 2021-10-10 15:17:32.000000000 +0100 -+++ valgrind-3.18.1.mod/coregrind/m_libcfile.c 2021-12-07 17:09:44.882144500 +0000 -@@ -419,7 +419,7 @@ + /* 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 +@@ -364,7 +364,7 @@ SysRes res; VG_(memset)(vgbuf, 0, sizeof(*vgbuf)); @@ -29,7 +29,7 @@ diff -uNr valgrind-3.18.1/coregrind/m_libcfile.c valgrind-3.18.1.mod/coregrind/m /* On Linux, first try with statx. If that doesn't work out, fall back to the stat64 or vanilla version. */ { struct vki_statx buf; -@@ -501,7 +501,7 @@ +@@ -434,7 +434,7 @@ SysRes res; VG_(memset)(vgbuf, 0, sizeof(*vgbuf));