gentoo resync : 05.12.2021

3 files changed, 39 insertions, 1 deletions

diff --git a/sys-libs/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index 2f2a14a3e683..2e43c0b382f9 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -1,5 +1,6 @@
+AUX libfaketime-0.9.8-Treat-unknown-clock_ids-like-CLOCK_REALTIME.patch 1166 BLAKE2B b7bcbeecc9e36f7b364d14b82cb32da033e98bb84f6212977f09fd43a79a78bd3b2784e02a40375c2e45423ee00d03cbeb3c2904d140af52ebc6fe63d78f80cb SHA512 d9d7b41cea6aba3f0083237641dbaa685072f428f97198b8925f4f56dda1f2d1f7730b5e4b7c3c7984c0db3406c35c8aefe666ce51f6eaaca05b2deae7b391b8
 DIST libfaketime-0.9.6.tar.gz 53540 BLAKE2B 5559e683d9d513fe60fe4b7f22a2ee794bccd8b1fe2a58735876fb9a0f05e1157d20485cfc2f0bcefa0b1f642f3b981de00471a36998867b0024dd8ac5a77466 SHA512 22cd796d4c6f7b327c664895df5b93b72a7243d886bf5241f932cc23fd54049c5fb6a8351078d036d78d12cb6f530ff66b98ef75df6eba5339ebfef1e7561225
 DIST libfaketime-0.9.9.tar.gz 78610 BLAKE2B 863e3aaf5f26a7b4d6104bdf5dd8fc0ac70547770d01cad302e476a7eeee63f0900ddc825aa75f6db7be08155d7ceb05f3b730fffb9e4928147fbdc097ee0df8 SHA512 b1aecf456753ccf771f0f80c92d57ffcd2c8349dde93a575862b4570a06812d4bce104f2efbcfd627a85a80fed99dbc37cb156dda0389892bfb4e71df816191f
-EBUILD libfaketime-0.9.6-r3.ebuild 1412 BLAKE2B bc345e1c106a7d8965bf8925082672760927259f7b03ae1d6695ee0afdce025711d383c5dc1e742276573b043826609cdad9b738daf7af23904219339fe1d5da SHA512 4ac78c91052aca7ea4197efd078c3fb5012f973601669b310f5643e96d86c00c8632755873598980c4ccf112882669ab7b815fe9bf6d5d578ac9de6b4697ea10
+EBUILD libfaketime-0.9.6-r4.ebuild 1501 BLAKE2B a7dff7e211244bf9d6d131572998ca57f57a0450dc4b5c260afaeef26475c44fb669b1a071c3649aa66761799040ec3b06d53817f1a651ae8ef15c8032748208 SHA512 623b40aec7945a7b6033b7544dbd333dcc4e8ec555f20130df69baf237937a80d5268771a0d014582b1499acf53e4ce9d58400a473bc99fb7a2f3e7a9d4cb149
 EBUILD libfaketime-0.9.9.ebuild 1782 BLAKE2B ec3bea54e1113a5f411ae8e375f1ee470a1ac5958a091d75588d6e6edbed0fb1179fb1fc40861f5555189928d4545d41d9a015e0a3b4e7cb84b63d5e6cfc423e SHA512 718bd709994ad62613ad6f96bbd1496fb21ee284b99430b01cc0c5c2df172286a4debb7212b9972329554143ce7fbad8c405e6747ee50858e33200918557cd5b
 MISC metadata.xml 845 BLAKE2B 9de860fb57dbce9f967b490013f86f697426b4d134d515649922512b0a0446753e4417520023913dd2379779125b20eb2854f06e02a764eee3c4c7a6322f5215 SHA512 ebba6366729d3a317664310ea7203d9ba16071c23cfbb8b3b9f1dbfaffc41268a498646e9c79d2086e7da52fdfa97fdd5cdecc3c472b7ca147aecc4873546205
diff --git a/sys-libs/libfaketime/files/libfaketime-0.9.8-Treat-unknown-clock_ids-like-CLOCK_REALTIME.patch b/sys-libs/libfaketime/files/libfaketime-0.9.8-Treat-unknown-clock_ids-like-CLOCK_REALTIME.patch
new file mode 100644
index 000000000000..13d7698ec1bd
--- /dev/null
+++ b/sys-libs/libfaketime/files/libfaketime-0.9.8-Treat-unknown-clock_ids-like-CLOCK_REALTIME.patch
@@ -0,0 +1,35 @@
+From bb635e4367adcac2c1517a698799a60a2bf86e83 Mon Sep 17 00:00:00 2001
+From: Wolfgang Hommel <wolf@code-wizards.com>
+Date: Thu, 30 Nov 2017 20:28:06 +0100
+Subject: [PATCH] Treat unknown clock_ids like CLOCK_REALTIME (experimental)
+
+---
+ src/libfaketime.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/libfaketime.c b/src/libfaketime.c
+index b59298c..b36c75b 100644
+--- a/src/libfaketime.c
++++ b/src/libfaketime.c
+@@ -2020,8 +2020,8 @@ int fake_clock_gettime(clockid_t clk_id, struct timespec *tp)
+         break;
+ #endif
+       default:
+-        printf("Invalid clock_id for clock_gettime: %d", clk_id);
+-        exit(EXIT_FAILURE);
++        timespecsub(tp, &ftpl_starttime.real, &tmp_ts);
++        break;
+     }
+ 
+     if (limited_faking)
+@@ -2171,8 +2171,8 @@ int fake_clock_gettime(clockid_t clk_id, struct timespec *tp)
+             break;
+ #endif
+           default:
+-            printf("Invalid clock_id for clock_gettime: %d", clk_id);
+-            exit(EXIT_FAILURE);
++            timespecsub(tp, &ftpl_starttime.real, &tdiff);
++            break;
+         } // end of switch (clk_id)
+         if (user_rate_set)
+         {
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6-r3.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
index b115280410ee..0d1e323682b4 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.6-r3.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
@@ -13,6 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 -riscv sparc x86"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.9.8-Treat-unknown-clock_ids-like-CLOCK_REALTIME.patch )
+
 src_prepare() {
 	default