gentoo resync : 07.01.2022

3 files changed, 13 insertions, 13 deletions

diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 596d4042d1e2..303578bdeb02 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-2.2-musl.patch 9594 BLAKE2B bd05ee635f1213d202428260d5026e34bce319666f64ddd199efa981ab13e5d1eaff67eabeb435a9479970b27de52e77fed2ce2377b03675d629f4a6dcf40cb8 SHA512 0ad7dd21a9821567d9ea2a52582b54c1697c842b08eeb8f627410d24fc2e812e04e642a7355ba9a907720cecbdbc0d973e711f315b0e185a8f1046c448d067b1
-DIST rt-tests-2.2.tar.xz 115120 BLAKE2B 46db78d32b2d5830859757c21e42d4e21cb0da8b2ebcbf8ba738c8e3832a6ea597d686ee6c9cad23f269853ad188219f46a0e5326124f056b4822619076268ac SHA512 826dc8894dd8670e705566b5224f54bdee89e5b48f21ca00e6c4061f28c4fbe2dab14c1e1b1302fec7011dbf28f3eb88c1b8adc137fed7d17958ea972e3c08b1
-EBUILD rt-tests-2.2.ebuild 921 BLAKE2B 0dc4ba32df8d2b74077ba45e240a612eae58edf55d79b4ef17a2cd29c2c15a189c47cff27327d486da2250b71d1de00a4285b62d360c9d010138eb2ed7f931fe SHA512 bf4e3e11a31fdf28612b99d68b4fcf30dd77146fa7e2375c9ed780706a293fb28c9908b511bfb79213db336365224dbb2154f0802a92d603ac9463bf78a229af
+AUX rt-tests-2.3-musl.patch 9602 BLAKE2B 04b537cba7f1de60fa64683b313381304c5ca5b69c451097cf08c84c7dd18321e5b5bfa13a76ae5515bf194c808c017d92232a857725a197049a40b4e9ef7799 SHA512 9367dd015e9a6ee3ba054d89d28d4130fce94b26074434f781553bf5769069e12283d585a10e4777a6eeec39b829a4edcb7d9da7dede00c280eb643c7b3fec31
+DIST rt-tests-2.3.tar.xz 115000 BLAKE2B d5f6a31a31340873348b5ffa6c706deb080e9686944a759fa4e4d53f2041d3f27aa1e9512d7413438bce7c61e05e2495c96eeef0b976ee09377f89d847225aef SHA512 3bf6fe95c5ac9911fb51fba1d4a8e6ad3b96a6cdce464372917673862801353cbbb377c76d3a19325f0b5402f65daf5c605e496d7460949615069366a00a978a
+EBUILD rt-tests-2.3.ebuild 921 BLAKE2B 0dc4ba32df8d2b74077ba45e240a612eae58edf55d79b4ef17a2cd29c2c15a189c47cff27327d486da2250b71d1de00a4285b62d360c9d010138eb2ed7f931fe SHA512 bf4e3e11a31fdf28612b99d68b4fcf30dd77146fa7e2375c9ed780706a293fb28c9908b511bfb79213db336365224dbb2154f0802a92d603ac9463bf78a229af
 MISC metadata.xml 749 BLAKE2B b0072755603e59495f6a9cb82885dd8c882e394c90be750293026948b3f66010c6cd0ab77af16d41a552a1117dbb92886f3afa44b9c9b0b9a6bc7793ab6e7700 SHA512 edcbee69b86ff91ea64a1e60bf7a4329805eaf48337370dba6c3f737c2e459e3c7fa6b6365261a0cb8f5604f5b22d1a7b08f0b8cbba0f0fb44e9623865eff522
diff --git a/dev-util/rt-tests/files/rt-tests-2.2-musl.patch b/dev-util/rt-tests/files/rt-tests-2.3-musl.patch
index caa8d415aad5..6732521a07a6 100644
--- a/dev-util/rt-tests/files/rt-tests-2.2-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-2.3-musl.patch
@@ -77,14 +77,14 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  #include "rt_numa.h"
  
  #include "rt-utils.h"
-@@ -502,12 +503,8 @@ static void *timerthread(void *param)
+@@ -504,12 +505,8 @@ static void *timerthread(void *param)
  {
  	struct thread_param *par = param;
  	struct sched_param schedp;
 -	struct sigevent sigev;
  	sigset_t sigset;
 -	timer_t timer;
- 	struct timespec now, next, interval, stop;
+ 	struct timespec now, next, interval, stop = { 0 };
 -	struct itimerval itimer;
 -	struct itimerspec tspec;
  	struct thread_stat *stat = par->stats;
@@ -105,7 +105,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	memset(&schedp, 0, sizeof(schedp));
  	schedp.sched_priority = par->prio;
  	if (setscheduler(0, par->policy, &schedp))
-@@ -600,20 +589,6 @@ static void *timerthread(void *param)
+@@ -599,20 +588,6 @@ static void *timerthread(void *param)
  		stop = now;
  		stop.tv_sec += duration;
  	}
@@ -126,7 +126,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  
  	stat->threadstarted++;
  
-@@ -621,16 +596,10 @@ static void *timerthread(void *param)
+@@ -620,16 +595,10 @@ static void *timerthread(void *param)
  
  		uint64_t diff;
  		unsigned long diff_smi = 0;
@@ -144,7 +144,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		case MODE_CLOCK_NANOSLEEP:
  			if (par->timermode == TIMER_ABSTIME) {
  				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -751,11 +720,6 @@ static void *timerthread(void *param)
+@@ -750,11 +719,6 @@ static void *timerthread(void *param)
  
  		next.tv_sec += interval.tv_sec;
  		next.tv_nsec += interval.tv_nsec;
@@ -156,7 +156,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		tsnorm(&next);
  
  		while (tsgreater(&now, &next)) {
-@@ -780,17 +744,6 @@ out:
+@@ -779,17 +743,6 @@ out:
  		pthread_mutex_unlock(&refresh_on_max_lock);
  	}
  
@@ -174,7 +174,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	/* close msr file */
  	if (smi)
  		close(par->msr_fd);
-@@ -1174,7 +1127,8 @@ static void process_options(int argc, ch
+@@ -1183,7 +1136,8 @@ static void process_options(int argc, ch
  		case OPT_VERBOSE: verbose = 1; break;
  		case 'x':
  		case OPT_POSIX_TIMERS:
@@ -184,7 +184,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		case '?':
  		case OPT_HELP:
  			display_help(0); break;
-@@ -1207,13 +1161,6 @@ static void process_options(int argc, ch
+@@ -1216,13 +1170,6 @@ static void process_options(int argc, ch
  		}
  	}
  
@@ -198,7 +198,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	/* if smp wasn't requested, test for numa automatically */
  	if (!smp) {
  		numa = numa_initialize();
-@@ -1943,7 +1890,6 @@ int main(int argc, char **argv)
+@@ -1952,7 +1899,6 @@ int main(int argc, char **argv)
  
  	}
  
@@ -206,7 +206,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	mode = use_nanosleep + use_system;
  
  	sigemptyset(&sigset);
-@@ -1993,16 +1939,18 @@ int main(int argc, char **argv)
+@@ -2002,16 +1948,18 @@ int main(int argc, char **argv)
  			void *stack;
  			void *currstk;
  			size_t stksize;
diff --git a/dev-util/rt-tests/rt-tests-2.2.ebuild b/dev-util/rt-tests/rt-tests-2.3.ebuild
index 247753110450..247753110450 100644
--- a/dev-util/rt-tests/rt-tests-2.2.ebuild
+++ b/dev-util/rt-tests/rt-tests-2.3.ebuild