diff --git a/0001-Ignore-some-env-vars.patch b/0001-Ignore-some-env-vars.patch deleted file mode 100644 index fa36fe5..0000000 --- a/0001-Ignore-some-env-vars.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b1af4f10aa3ec94b2f16d092cfd9f0025a1c5f58 Mon Sep 17 00:00:00 2001 -From: William Brown -Date: Sun, 27 Mar 2022 11:19:09 +1000 -Subject: [PATCH] Ignore some env vars - ---- - src/cmdline.rs | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/cmdline.rs b/src/cmdline.rs -index 13773c7..bd89cb3 100644 ---- a/src/cmdline.rs -+++ b/src/cmdline.rs -@@ -208,7 +208,19 @@ pub fn parse() -> Result { - // - // FIXME: Maybe we should strip out `LD_PRELOAD` always? - if env::var_os("RUNNING_UNDER_RR").is_some() { -- env_vars.retain(|(k, _v)| k != "LD_PRELOAD" && k != "RUNNING_UNDER_RR"); -+ env_vars.retain(|(k, _v)| -+ k != "LD_PRELOAD" && -+ k != "RUNNING_UNDER_RR" && -+ k != "HOSTNAME" && -+ k != "PWD" && -+ k != "HOST" && -+ k != "RPM_BUILD_ROOT" && -+ k != "SOURCE_DATE_EPOCH" && -+ k != "RPM_PACKAGE_RELEASE" && -+ k != "MINICOM" && -+ k != "DESTDIR" && -+ k != "RPM_PACKAGE_VERSION" -+ ); - } - - Ok(Command::Compile { --- -2.32.0 (Apple Git-132) - diff --git a/_service b/_service index 1fd6070..b221719 100644 --- a/_service +++ b/_service @@ -1,9 +1,11 @@ - https://github.com/mozilla/sccache.git + + https://github.com/Firstyear/sccache.git @PARENT_TAG@~git@TAG_OFFSET@.%h git - v0.3.0 + + 20220520-suse-maint-1 * v(\d+\.\d+\.\d+) \1 diff --git a/cargo_config b/cargo_config index 6fb4ff4..9081d97 100644 --- a/cargo_config +++ b/cargo_config @@ -1,5 +1,9 @@ [source.crates-io] replace-with = "vendored-sources" +[source."https://github.com/Firstyear/opensuse-proxy-cache.git"] +git = "https://github.com/Firstyear/opensuse-proxy-cache.git" +replace-with = "vendored-sources" + [source.vendored-sources] directory = "vendor" \ No newline at end of file diff --git a/sccache-0.3.0~git0.f6e36e6.tar.xz b/sccache-0.3.0~git0.f6e36e6.tar.xz deleted file mode 100644 index 0672367..0000000 --- a/sccache-0.3.0~git0.f6e36e6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d781ae4a4fc9e1bff6945711258a87b85742a0cf65f7688158ffc574c11daee4 -size 208944 diff --git a/sccache-0.3.0~git4.a372a20.tar.xz b/sccache-0.3.0~git4.a372a20.tar.xz new file mode 100644 index 0000000..dc4d539 --- /dev/null +++ b/sccache-0.3.0~git4.a372a20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc9896f29f36e62e35d3b15f561259d9d17f8ca2094827e44824ce4149911724 +size 211080 diff --git a/sccache.changes b/sccache.changes index d6583fc..a5fa712 100644 --- a/sccache.changes +++ b/sccache.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue May 24 06:28:56 UTC 2022 - William Brown + +- Automatic update of vendored dependencies + +------------------------------------------------------------------- +Mon May 23 02:11:35 UTC 2022 - william.brown@suse.com + +- Update to version 0.3.0~git4.e5e233f: + * Force concurrent disk cache by default + * Ignore some env vars + * Add experimental concurrent cache support + * Increase the MSRV and bump dependencies (#1137) +- Remove 0001-Ignore-some-env-vars.patch as it is on the maint branch + ------------------------------------------------------------------- Wed May 04 23:39:03 UTC 2022 - william.brown@suse.com diff --git a/sccache.spec b/sccache.spec index fbf6b07..8134593 100644 --- a/sccache.spec +++ b/sccache.spec @@ -19,7 +19,7 @@ %define configdir %{_sysconfdir}/%{name} Name: sccache -Version: 0.3.0~git0.f6e36e6 +Version: 0.3.0~git4.a372a20 Release: 0 Summary: A compiler caching tool for Rust, C and C++ with optional cloud storage License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR CC0-1.0) AND ((Apache-2.0 AND BSD-2-Clause) OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT @@ -33,7 +33,6 @@ Source11: sccache-dist-scheduler.service Source12: builder.conf Source13: scheduler.conf Source14: client.example -Patch1: 0001-Ignore-some-env-vars.patch BuildRequires: cargo-packaging BuildRequires: pkgconfig(openssl) Requires: bubblewrap @@ -47,7 +46,6 @@ the Google Cloud Storage (GCS) API. %prep %setup -q %setup -qa1 -%patch1 -p1 mkdir .cargo cp %{SOURCE2} .cargo/config @@ -57,13 +55,13 @@ find vendor -type f -name \*.rs -exec chmod -x '{}' \; %build %ifarch x86_64 # 'dist-server' available only on x86_64 so far - https://github.com/mozilla/sccache/issues/656 -features="azure,s3,redis,dist-server,dist-client" +features="azure,s3,redis,dist-server,dist-client,concurrent-cache" %else %ifarch aarch64 -features="azure,s3,redis" +features="azure,s3,redis,concurrent-cache" %else # Most other arches have issues (especially with ring). Use FS cache only -features="" +features="concurrent-cache" %endif %endif diff --git a/vendor.tar.xz b/vendor.tar.xz index c20084c..8768e92 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:446267888b602db9dd25425bf22d9b6f12d05b5967df5906a42c720ba807ef97 -size 20400416 +oid sha256:dddbe9ed02391a3dfc8d953b33fb3a2c50e1eda7bd2063c3033ba23521905969 +size 25339892