From 9e9b3f53a38c34e3295eb9dc0054093d571dab55 Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Mon, 1 Nov 2021 01:41:21 -0600
Subject: [PATCH] package/valgrind: bump to version 3.18.1

Drop Suppression file for musl libc patch which is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 ...Patch-Suppression-file-for-musl-libc.patch | 69 -------------------
 package/valgrind/valgrind.hash                |  4 +-
 package/valgrind/valgrind.mk                  |  2 +-
 3 files changed, 3 insertions(+), 72 deletions(-)
 delete mode 100644 package/valgrind/0003-Bug-408663-Patch-Suppression-file-for-musl-libc.patch

diff --git a/package/valgrind/0003-Bug-408663-Patch-Suppression-file-for-musl-libc.patch b/package/valgrind/0003-Bug-408663-Patch-Suppression-file-for-musl-libc.patch
deleted file mode 100644
index b7e075e9fd..0000000000
--- a/package/valgrind/0003-Bug-408663-Patch-Suppression-file-for-musl-libc.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c5a5190ec7936e53bcd2082fb0151bc48a804b8b Mon Sep 17 00:00:00 2001
-From: Paul Floyd <pjfloyd@wanadoo.fr>
-Date: Tue, 8 Dec 2020 15:07:29 +0100
-Subject: [PATCH] Bug 408663 - Patch: Suppression file for musl libc
-
-[Upstream https://sourceware.org/git/?p=valgrind.git;a=patch;h=f4d98ff79d5a79102b777ea7e23002d9f7326489
- reduced to the missing musl.supp file download source file
- Reported https://bugs.kde.org/show_bug.cgi?id=435438]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- musl.supp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
- create mode 100644 musl.supp
-
-diff --git a/musl.supp b/musl.supp
-new file mode 100644
-index 0000000..864172a
---- /dev/null
-+++ b/musl.supp
-@@ -0,0 +1,46 @@
-+# Suppressions for musl libc
-+# See: https://www.openwall.com/lists/musl/2017/06/15/4
-+
-+{
-+   musl-dynlink-false-positive1
-+   Memcheck:Leak
-+   fun:calloc
-+   fun:load_direct_deps
-+   fun:load_deps
-+   fun:load_deps
-+   fun:__dls3
-+   fun:__dls2b
-+   fun:__dls2
-+}
-+
-+{
-+   musl-dynlink-false-positive2
-+   Memcheck:Leak
-+   fun:calloc
-+   fun:load_direct_deps
-+   fun:load_deps
-+   fun:load_deps
-+   fun:__dls3
-+   fun:__dls2
-+}
-+
-+{
-+   musl-dynlink-false-positive3
-+   Memcheck:Leak
-+   fun:calloc
-+   fun:load_library
-+   fun:load_preload
-+   fun:__dls3
-+   fun:__dls2b
-+   fun:__dls2
-+}
-+
-+{
-+   musl-dynlink-false-positive4
-+   Memcheck:Leak
-+   fun:calloc
-+   fun:load_library
-+   fun:load_preload
-+   fun:__dls3
-+   fun:__dls2
-+}
--- 
-2.30.2
-
diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash
index 648a590ca3..748fc3eb82 100644
--- a/package/valgrind/valgrind.hash
+++ b/package/valgrind/valgrind.hash
@@ -1,7 +1,7 @@
 # From https://valgrind.org/downloads/current.html
-md5  afe11b5572c3121a781433b7c0ab741b  valgrind-3.17.0.tar.bz2
+md5  de56a5532b0c81781db677ca712c585a  valgrind-3.18.1.tar.bz2
 # locally computed
-sha256  ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2  valgrind-3.17.0.tar.bz2
+sha256  00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5  valgrind-3.18.1.tar.bz2
 
 # License files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index b87e1e518f..52f2a04ffa 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VALGRIND_VERSION = 3.17.0
+VALGRIND_VERSION = 3.18.1
 VALGRIND_SITE = https://sourceware.org/pub/valgrind
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2