From b315afe19a540222289a8fd84e9d4f841b5800ac0b33f37fb6da7795aaba4098 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 27 Feb 2024 11:24:27 +0000
Subject: [PATCH] Accepting request 1152125 from
 home:simonlm:branches:devel:tools:building

Update to version 4.9.1

OBS-URL: https://build.opensuse.org/request/show/1152125
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ccache?expand=0&rev=142
---
 ccache-4.9.1.tar.xz     |  3 +++
 ccache-4.9.1.tar.xz.asc | 16 ++++++++++++++++
 ccache-4.9.tar.xz       |  3 ---
 ccache-4.9.tar.xz.asc   | 16 ----------------
 ccache.changes          | 11 +++++++++++
 ccache.spec             |  3 +--
 fix2038.patch           | 13 -------------
 7 files changed, 31 insertions(+), 34 deletions(-)
 create mode 100644 ccache-4.9.1.tar.xz
 create mode 100644 ccache-4.9.1.tar.xz.asc
 delete mode 100644 ccache-4.9.tar.xz
 delete mode 100644 ccache-4.9.tar.xz.asc
 delete mode 100644 fix2038.patch

diff --git a/ccache-4.9.1.tar.xz b/ccache-4.9.1.tar.xz
new file mode 100644
index 0000000..1e73e7e
--- /dev/null
+++ b/ccache-4.9.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25
+size 583764
diff --git a/ccache-4.9.1.tar.xz.asc b/ccache-4.9.1.tar.xz.asc
new file mode 100644
index 0000000..e914f37
--- /dev/null
+++ b/ccache-4.9.1.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEWpOacaRnks9XhmpRmW3aB1WUrbgFAmXBN0kACgkQmW3aB1WU
+rbjfIhAAlatbm435cmnWgPgK0zs2HUGjOoOTtvlYaD4t/CD5tiIYpoo4B5dvAWJw
+K2cACDGV6Hx1suWH8kTSDHFchAvnhooM6G5y5HBWE4dsgSFDGLyYmxwvIJ9TWrk6
+w+mdH73Ka9LwI/y5v2NBV0tNRFzIU8scdYzDe1hjDLda4zjNn96gdcUaFE13cZkK
+xPlhJKBD7M/eongdzOe71ctViCoYcJliQ2tlK87KKcjDd2QZAQaWMsPmERVbzSYf
+pXDmd0nmtemATcy/MOCSWpVP1BTqQBSeUxQd/lkp7Eb7w2LEaeQT/k3Wp3/HGd90
+1ZI9m0oTSg/V52FhLfnphqbLqE9i9DXcxZ8pNURMI/GBOHdflPMJPxfXoPXVfDPA
+eOKzhQjcIh9vO4A0BKR8ncVU4o3kcCTqrT8UKGG1IbzGAl/tdPPLbKQS4cVpI3QE
+b7F5Y5YqMZruKiZYTyPl1dzMggZKX8XAvQbkx/aRV0rFI6Z0nwp2G8QtiwfNuLPA
+v8MIqRT+HZyQjfmmjyc46gOXFUuCk8ruZOc7GqBfqawJCf4lT5bmQWsh4gIgSefQ
+8I0+alEy+hKgYl15LKuJivJfQ9sw40M3tuZV6gRco3UIBJQ1oCJORXwG9ybyFwOY
+qoDLMIlIxmuZ0H9uSwJmpH3llR4QbJyiNCXb7hO7kCRzfHQOq7E=
+=E9T4
+-----END PGP SIGNATURE-----
diff --git a/ccache-4.9.tar.xz b/ccache-4.9.tar.xz
deleted file mode 100644
index d01a52a..0000000
--- a/ccache-4.9.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ebc72324e3ab52af0b562bf54189d108e85eef6478d6304a345a3c2dc4018e0
-size 583744
diff --git a/ccache-4.9.tar.xz.asc b/ccache-4.9.tar.xz.asc
deleted file mode 100644
index 9624cc0..0000000
--- a/ccache-4.9.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEWpOacaRnks9XhmpRmW3aB1WUrbgFAmWQMmMACgkQmW3aB1WU
-rbg/KBAAr26w835t//cNuA0c2yippHIImOYjyTYgZhZ8PUnhKZdfzsXmbKRHNar5
-6tAuLao6mwUprdODYuhJVf5MjC5xnPXzVWcOMZ89Gn5sIAOgFOxySi3xftCRdCoT
-opz6bsO0lgKy1BeuiGzIWlwstgmpcBQRgBH+h7Y0dn4TIGioQJH/RMMOhGsN+d9+
-FaMc04H8lnfoLXZ1V0LZEuaQJQpqJlXGlCWEwp3wVaZx98X6vGMEZEFHUCsPKEMf
-LYPzF8HBARz0WkARiUwBiY9DOmPcIpTI/yzPCMqMUYRxAk+VCR7FlnCFP1gGGJlf
-KmNt2/pCzFE2mYM+QHzWeayzuNF56LwBvWGdAXRH+X0wcWLcWHiILTQgn4RcrScB
-lPli9NffW2W5lYj/VBa6UkFlGXpnvBFQp6TbBBnRxnH7+wiEc6RJz8YpRal+0cGT
-E2LbSAnhSYYPkYJkRFZvbs8ZzRh4miUKXakCvPVNTG0KZy0ToLIhx4tI1LDIzId2
-3THi+8ZC64jsLT0GDBBU0S3K3j/UrCUrwq4r92WbvMJyLP0lbMAn8CPezvX8NGX1
-Bx3UFFfyNUWuLeSBj+WGAYVLzC59pwfre/X6zNvip/s0vZg/XkK15+NFssP7CNnL
-K8C/rCocA2/GVf/bLnpC/xJCzYPSSBzr3Oq6vB1OJbUov9CdFJ8=
-=3eSQ
------END PGP SIGNATURE-----
diff --git a/ccache.changes b/ccache.changes
index b5788ae..b5466da 100644
--- a/ccache.changes
+++ b/ccache.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 27 10:33:09 UTC 2024 - ming li <mli@suse.com>
+
+- Update to 4.9.1:
+  * Improved detection of bad remote storage URLs gracefully. This also fixes
+    crashes seen in ccache’s own test suite.
+  * Made caching completely disabled when modification of a source or include
+    file is detected during ccache invocation. Previously this was only done for the direct mode.
+  * Fixed an MSVC crash when using /Zi with many concurrent compilations.
+  * Fixed a crash when -arch is the last compiler option.
+
 -------------------------------------------------------------------
 Thu Jan 18 10:54:53 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/ccache.spec b/ccache.spec
index 9ad3b07..793b7e9 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -23,7 +23,7 @@
 %bcond_with hiredis
 %endif
 Name:           ccache
-Version:        4.9
+Version:        4.9.1
 Release:        0
 Summary:        A Fast C/C++ Compiler Cache
 License:        GPL-3.0-or-later
@@ -45,7 +45,6 @@ BuildRequires:  pkgconfig(libzstd) >= 1.1.2
 BuildRequires:  rubygem(asciidoctor)
 Provides:       distcc:%{_bindir}/ccache
 %ifnarch %{ix86} %{arm}
-Patch0:         fix2038.patch
 %endif
 %if %{with hiredis}
 BuildRequires:  pkgconfig(hiredis) >= 0.13.3
diff --git a/fix2038.patch b/fix2038.patch
deleted file mode 100644
index adf2dc3..0000000
--- a/fix2038.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ccache-4.6.1/test/suites/direct.bash
-===================================================================
---- ccache-4.6.1.orig/test/suites/direct.bash
-+++ ccache-4.6.1/test/suites/direct.bash
-@@ -883,7 +883,7 @@ EOF
-     cat <<EOF >new.h
- int test;
- EOF
--    touch -t 203801010000 new.h
-+    touch -t 999901010000 new.h
- 
-     $CCACHE_COMPILE -c new.c
-     expect_stat direct_cache_hit 0