[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

[Sam James]

commit:     9767f9723c5c168a772653541283cb9065090c1e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 11:26:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 11:26:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9767f972

dev-util/ccache: restore /run-skip patch

I still can't hit this but let's rebase the old patch
given it makes sense for now.

Closes: https://bugs.gentoo.org/837362
Bug: https://bugs.gentoo.org/837380
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/ccache/ccache-4.6.ebuild                  |  1 +
 .../ccache/files/ccache-4.6-avoid-run-user.patch   | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/dev-util/ccache/ccache-4.6.ebuild b/dev-util/ccache/ccache-4.6.ebuild
index 9bff72bc83a7..d3c7ceee833f 100644
--- a/dev-util/ccache/ccache-4.6.ebuild
+++ b/dev-util/ccache/ccache-4.6.ebuild
@@ -37,6 +37,7 @@ DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
 	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.6-avoid-run-user.patch
 )
 
 src_prepare() {

diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
new file mode 100644
index 000000000000..cfdd09f79e66
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
@@ -0,0 +1,28 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-  static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+-    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+-    if (Util::create_dir(dir)) {
+-      return dir;
+-    }
+-#endif
+-    return std::string();
+-  }();
+-  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
++  return cache_dir + "/tmp";
+ }