patches and low-level development discussion
 help / color / mirror / code / Atom feed
f5c5b8f36676a0d5dd8aaa20e1e77db4095adba4 blob 749 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
 
From 27381a5b01d14d3aca173cf66d3f13c8ea8f475c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Dec 2019 17:04:04 +0000
Subject: [PATCH 3/5] sommelier: don't leak source-absolute paths

---
 vm_tools/sommelier/wayland_protocol.gni | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm_tools/sommelier/wayland_protocol.gni b/vm_tools/sommelier/wayland_protocol.gni
index 4f18a0c10..b1bd5d659 100644
--- a/vm_tools/sommelier/wayland_protocol.gni
+++ b/vm_tools/sommelier/wayland_protocol.gni
@@ -44,7 +44,7 @@ template("wayland_protocol_library") {
         "wayland-scanner",
         g.subcommand,
         "{{source}}",
-        output_file,
+        rebase_path(output_file),
       ]
     }
   }
-- 
2.26.2

debug log:

solving f5c5b8f3667 ...
found f5c5b8f3667 in https://spectrum-os.org/lists/archives/spectrum-devel/20200530190028.6388-2-hi@alyssa.is/ ||
	https://spectrum-os.org/lists/archives/spectrum-devel/20200531030112.22029-1-hi@alyssa.is/
found 5d3ec4effe8 in https://spectrum-os.org/git/nixpkgs
preparing index
index prepared:
100644 5d3ec4effe8d02a4c8d21c0153be4cadfb3150a3	pkgs/os-specific/linux/chromium-os/sommelier/0004-sommelier-don-t-leak-source-absolute-paths.patch

applying [1/2] https://spectrum-os.org/lists/archives/spectrum-devel/20200530190028.6388-2-hi@alyssa.is/
diff --git a/pkgs/os-specific/linux/chromium-os/sommelier/0004-sommelier-don-t-leak-source-absolute-paths.patch b/pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch
similarity index 82%
rename from pkgs/os-specific/linux/chromium-os/sommelier/0004-sommelier-don-t-leak-source-absolute-paths.patch
rename to pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch
index 5d3ec4effe8..f5c5b8f3667 100644

Checking patch pkgs/os-specific/linux/chromium-os/sommelier/0004-sommelier-don-t-leak-source-absolute-paths.patch => pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch...
Applied patch pkgs/os-specific/linux/chromium-os/sommelier/0004-sommelier-don-t-leak-source-absolute-paths.patch => pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch cleanly.

skipping https://spectrum-os.org/lists/archives/spectrum-devel/20200531030112.22029-1-hi@alyssa.is/ for f5c5b8f3667
index at:
100644 f5c5b8f36676a0d5dd8aaa20e1e77db4095adba4	pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).