From 99572b3223d8023cde58cb162b65e20f1481e417 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 23 Jan 2020 21:12:14 +0000
Subject: [PATCH] Bug 1606007 - Upgrade valgrind to current git trunk.
 r=froydnj

The added hacks are derived from what was used in bug 1479055.

Differential Revision: https://phabricator.services.mozilla.com/D60806

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/packages/kind.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/taskcluster/ci/packages/kind.yml b/taskcluster/ci/packages/kind.yml
index 808b642267bc..87e8daa2ae70 100644
--- a/taskcluster/ci/packages/kind.yml
+++ b/taskcluster/ci/packages/kind.yml
@@ -189,12 +189,26 @@ jobs:
         description: "Valgrind for Debian Wheezy"
         treeherder:
             symbol: Deb7(valgrind)
+        worker:
+            env:
+                VERSION: 3.15.99.git20200122
+                COMMIT: 16eb4436e2b2c2e6e4fc51520b1ef16607204313
         run:
             using: debian-package
             dsc:
                 url: http://snapshot.debian.org/archive/debian/20190714T155055Z/pool/main/v/valgrind/valgrind_3.15.0-1.dsc
                 sha256: 2bd467ec486302060ed4e91452231b2c0a09afcd51c25d4ba8d3028218328681
+            packages:
+                - deb7-git
             patch: valgrind-wheezy.diff
+            pre-build-command: >-
+                git clone -n git://sourceware.org/git/valgrind.git ../valgrind-git &&
+                git -C ../valgrind-git archive --format=tar --prefix=valgrind-$VERSION/ $COMMIT | bzip2 > ../valgrind_$VERSION.orig.tar.bz2 &&
+                tar -C .. -jxf ../valgrind_$VERSION.orig.tar.bz2 &&
+                cp -r debian ../valgrind-$VERSION &&
+                cd ../valgrind-$VERSION &&
+                sed -i '/08_fix-spelling-in-manpage.patch/d;/11_arm64-cache-flush.patch/d' debian/patches/series &&
+                debchange -v 1:$VERSION-1.deb7moz1 --distribution wheezy "Mozilla backport of git master as of 2020-01-22." < /dev/null
 
     deb7-dh-python:
         description: "dh-python for Debian wheezy"