format patches

debian/patches/CVE-2020-5291.patch

@@ -1,10 +1,9 @@
-From 5404a15d34301a5a0dd5930203e03c76b80ebf21 Mon Sep 17 00:00:00 2001
 From: Alexander Larsson <alexl@redhat.com>
 Date: Thu, 26 Mar 2020 15:36:44 +0100
 Subject: [PATCH 1/3] Don't rely on geteuid() to know when to switch back from
  setuid root
 MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 As pointed out by Stephen Röttger <sroettger@google.com>, in
@@ -24,9 +23,11 @@ We fix this by not relying on the geteuid() call to know when we need
 to drop root uid, but rather keep track of whether we already switched
 from it.
 ---
- bubblewrap.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
+ bubblewrap.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
+diff --git a/bubblewrap.c b/bubblewrap.c
+index 8d0c5f7..87000e8 100644
 --- a/bubblewrap.c
 +++ b/bubblewrap.c
 @@ -834,11 +834,13 @@ switch_to_user_with_privs (void)

debian/patches/debian/Use-Python-3-for-test-demo-code.patch

@@ -19,10 +19,10 @@ index 4c68242..2ef2fd6 100755
  import os, select, subprocess, sys, json
  
 diff --git a/tests/test-run.sh b/tests/test-run.sh
-index a404c4e..1d2ffbc 100755
+index a01f41c..535e9b6 100755
 --- a/tests/test-run.sh
 +++ b/tests/test-run.sh
-@@ -215,7 +215,7 @@ fi
+@@ -226,7 +226,7 @@ fi
  # Test --die-with-parent
  
  cat >lockf-n.py <<EOF

debian/patches/series

@@ -1,4 +1,3 @@
 debian/Use-Python-3-for-test-demo-code.patch
-# Temporary before this gets applied upstream
 update-output-patterns-libcap-2.29.patch
 CVE-2020-5291.patch

debian/patches/update-output-patterns-libcap-2.29.patch

@@ -1,4 +1,3 @@
-From 8b170a9a91ffaa0611f68b1fef64f881f2dadf8d Mon Sep 17 00:00:00 2001
 From: Christian Kastner <ckk@kvr.at>
 Date: Wed, 19 Feb 2020 10:03:05 +0100
 Subject: [PATCH] tests: Update output patterns for libcap >= 2.29
@@ -8,7 +7,7 @@ Subject: [PATCH] tests: Update output patterns for libcap >= 2.29
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/tests/test-run.sh b/tests/test-run.sh
-index a01f41c..702c480 100755
+index 535e9b6..95c77d8 100755
 --- a/tests/test-run.sh
 +++ b/tests/test-run.sh
 @@ -215,11 +215,18 @@ else