gentoo auto-resync : 10:08:2024 - 11:05:14

4 files changed, 109 insertions, 2 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 86260f61457c..9a7b8af47737 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 2046a81e048a..c2038698bd7b 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,11 +1,12 @@
 AUX x11vnc-0.9.16-CVE-2020-29074.patch 774 BLAKE2B 5a8fcb123f1698e78f76eb1828f935ad1a228990975b5ef42bf1599b46b4d88b7fb90d7d986c3189c2ac8fea305a3040a10c94741068b1d4393ebb7030fc27e2 SHA512 c021115fef4290f41d8df3a1231066d4efd1ca46ad59f0892329f32876e1dec47c000136e5fcbf53c32d8216ee89043b5857c8a873f9cc34c3e4bc543e8b85c1
 AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
+AUX x11vnc-0.9.16-fix-build-on-32bit.patch 3482 BLAKE2B 37c413d59161f726fe5dde24139a8eedc432b7285f13e557ff3a3501eda625a19e16ad260636f6066f4e1c67c1a0a358c6af48b45a1b5d096ae5b353d9870cdf SHA512 f49026859383fe9ffdf187bd5b6dcfaaf82a099b016948cd588d9f44b4fe2300838175a3bda844ccf75cd2271c85c17ea1370fb32a651053524076fd17e9ec57
 AUX x11vnc-0.9.16-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2b9a18261a279b05fa54dff1240674d51dc44ce4fff9ea64a6644e532c80499287bbb1025b06b47d3b2546eb76f32fbce SHA512 3acaa4e57921673aef14ce2e9931880bcbc8c3d73708124599b8ffc79be6c4fa43713184f01983f4f432e29137c3628902681aed275ca98c7a6f32cb10bc54ca
 AUX x11vnc-0.9.16-implicit-function-declaration.patch 633 BLAKE2B 54f24f5f46f91c2c9b9aaec2b0446b0a48772ebfae7ac479f500ceec45d46c7c5f025ce9daa1094052ec5a1c3a81ebc8a04fc89c60d634b4acbaea4c6f0b0214 SHA512 a95fad04879bcfcd2660acb22006f35042d3a2be0a7013c35ab2cc38103c1e9ced283cb6a1c5e46d28dcae2c7da55c92e4f2e6309c52b8b879e0257c8c65cc29
 AUX x11vnc-0.9.16-libressl.patch 1721 BLAKE2B a2565c9b9d6cb778846197ba1258a94b57c9f5a854da35aaa1cbf561752a4667c1ea164dbe1297160e5d410fbc6cc72da6fa6336dd237e3145fe48df3b986dbc SHA512 53279b391d567849d9e26248cd20b14f8d181752ceca0ec10142fdea486ccd3cb273c7e31c3b0ab023e722c93f1a4d4af27a6f50306744b29ac0093d89fc1c14
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d-r1 1740 BLAKE2B 85f5c40a47287eb648d49c5e6211ea950abcad1378690ee7f45313378d49f4cc826a08d15f36dc49fc76dc4cc763fd6182c4324de053c5ba40cea97001546c74 SHA512 def0edac62b35b231354fb24372b48ac346730af2e507522e7a598c9661a78252ee31dab7c3635d85ec128873d0261913a35482c8dc0be744806e8db5af222aa
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r8.ebuild 2053 BLAKE2B 5f5b236385eacf7db3d57acb52a3926d33cf9fdbdee457fcd3074756043acc94120c662f0e9b9f1991fec4953cd6d1e90c879d55e0f2df112ae28224d02fb961 SHA512 30aca4da4c22b8134e374c60b33a6cc8acb5211b8feb71d2e9d186b4fd100901c0ddfc0077fe86e107b4100484dac17183650b867149cbd927464fc92cedaa44
+EBUILD x11vnc-0.9.16-r8.ebuild 2098 BLAKE2B fea0bea1f230f75a18ad7642114d0c29951e8b8c59b3f24f2511f23b08ba797a2034f74db2ac8676defe14420d86550112aa8a44f0213b45e6377146b48f2d6d SHA512 51da80501f0245065a51d08d6555b54a5eee68c278bd74400d3a79a59c3db44c0b9d6cd168c3242549f33c632f8b6248d1ea573782f3ef07f3470a02c6d276f6
 MISC metadata.xml 953 BLAKE2B 716b40da30ae65560d74a2dc7ea528180e0d8da048355dfc7557df06704ccde01cba1a3fa24a3f5f53bc6349482d430f180e0678bf6d032be8966d971a612445 SHA512 a9de2facb44bc2eeab0fda61de359b191d7c1243560a3cfa21e1566cad6c113ed126dd117befc8666d4dfa8080cb291ac9fed75b9fcc4f6986ed6bebd89ab710
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch
new file mode 100644
index 000000000000..6239e0877923
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch
@@ -0,0 +1,105 @@
+From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 11:43:32 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+---
+ src/uinput.c | 25 +++++++++++++++++++++----
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/src/uinput.c b/src/uinput.c
+index 28fbad39..d71bcde7 100644
+--- a/src/uinput.c
++++ b/src/uinput.c
+@@ -54,6 +54,11 @@ so, delete this exception statement from your version.
+ #include <linux/input.h>
+ #include <linux/uinput.h>
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #if !defined(EV_SYN) || !defined(SYN_REPORT)
+ #undef UINPUT_OK
+ #endif
+@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) {
+ static void ptr_move(int dx, int dy) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
+ 
+ 	if (injectable && strchr(injectable, 'M') == NULL) {
+@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) {
+ 
+ 	if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
+ 
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_REL;
+ 	ev.code = REL_Y;
+ 	ev.value = dy;
+@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) {
+ static void ptr_abs(int x, int y, int p) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int x0, y0;
+ 	int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
+ 
+@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) {
+ 
+ 	if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
+ 
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_ABS;
+ 	ev.code = ABS_Y;
+ 	ev.value = y;
+@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;}
+ static void button_click(int down, int btn) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
+ 
+ 	if (injectable && strchr(injectable, 'B') == NULL) {
+@@ -959,7 +971,9 @@ static void button_click(int down, int btn) {
+ 	if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
+ 
+ 	memset(&ev, 0, sizeof(ev));
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_KEY;
+ 	ev.value = down;
+ 
+@@ -1230,6 +1244,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) {
+ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tval;
+ 	int scancode;
+ 	allowed_input_t input;
+ 	int d = direct_key_fd < 0 ? fd : direct_key_fd;
+@@ -1253,7 +1268,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ 	if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
+ 
+ 	memset(&ev, 0, sizeof(ev));
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tval, NULL);
++	ev.input_event_sec = tval.tv_sec;
++	ev.input_event_usec = tval.tv_usec;
+ 	ev.type = EV_KEY;
+ 	ev.code = (unsigned char) scancode;
+ 	ev.value = down;
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
index 62b802f2bb43..214d2bf12b72 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-CVE-2020-29074.patch
 	"${FILESDIR}"/${P}-implicit-function-declaration.patch
 	"${FILESDIR}"/${P}-libressl.patch # 903001
+	"${FILESDIR}"/${P}-fix-build-on-32bit.patch
 )
 
 src_prepare() {