Merge ~liushuyu-011/ubuntu/+source/x11vnc:ubuntu/devel into ubuntu/+source/x11vnc:ubuntu/devel

[Zixing Liu]

This MP adds a patch to fix 64-bit time_t compatibility issues on 32-bit systems by replacing gettimeofday calls with clock_gettime calls.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15868485/+listing-archive-extra

[Benjamin Drung (bdrung)]

Sponsored with the spaces fixed to tabs.

review: Approve

Unmerged commits

a0c54ea... by Zixing Liu on 2024-03-21

d/p/0007-use-clock_gettime-to-replace-gettimeofday.patch: Add a patch to fix ...

... time_t compatibility issues

b772ad5... by Steve Langasek on 2024-03-05

0.9.16-9build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 180aafb..e4f79ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11vnc (0.9.16-9ubuntu1) noble; urgency=medium
+
+  * debian/patches/0007-use-clock_gettime-to-replace-gettimeofday.patch:
+    Use clock_gettime to replace gettimeofday.
+
+ -- Zixing Liu <[e-mail]>  Wed, 20 Mar 2024 20:26:54 -0600
+
 x11vnc (0.9.16-9build1) noble; urgency=medium
 
   * No-change rebuild against libssl3t64
diff --git a/debian/patches/0007-use-clock_gettime-to-replace-gettimeofday.patch b/debian/patches/0007-use-clock_gettime-to-replace-gettimeofday.patch
new file mode 100644
index 0000000..65f6adb
--- /dev/null
+++ b/debian/patches/0007-use-clock_gettime-to-replace-gettimeofday.patch
@@ -0,0 +1,86 @@
+Description: Use clock_gettime to replace gettimeofday
+ So that the program is compatible with 64-bit time_t types on 32-bit systems
+Author: Zixing Liu <[e-mail]>
+Forwarded: no
+Last-Update: 2024-03-21
+
+Index: x11vnc/src/uinput.c
+===================================================================
+--- x11vnc.orig/src/uinput.c
++++ x11vnc/src/uinput.c
+@@ -710,6 +710,7 @@ void parse_uinput_str(char *in) {
+ static void ptr_move(int dx, int dy) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timespec tv;
+ 	int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
+ 
+ 	if (injectable && strchr(injectable, 'M') == NULL) {
+@@ -720,7 +721,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);
++	clock_gettime(CLOCK_REALTIME, &tv);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_nsec / 1000;
+ 	ev.type = EV_REL;
+ 	ev.code = REL_Y;
+ 	ev.value = dy;
+@@ -755,6 +758,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 timespec tv;
+ 	int x0, y0;
+ 	int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
+ 
+@@ -773,7 +777,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);
++	clock_gettime(CLOCK_REALTIME, &tv);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_nsec / 1000;
+ 	ev.type = EV_ABS;
+ 	ev.code = ABS_Y;
+ 	ev.value = y;
+@@ -950,6 +956,7 @@ if (0) {usleep(100*1000) ;}
+ static void button_click(int down, int btn) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timespec tv;
+ 	int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
+ 
+ 	if (injectable && strchr(injectable, 'B') == NULL) {
+@@ -959,7 +966,9 @@ static void button_click(int down, int b
+ 	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);
++	clock_gettime(CLOCK_REALTIME, &tv);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_nsec / 1000;
+ 	ev.type = EV_KEY;
+ 	ev.value = down;
+ 
+@@ -1230,6 +1239,7 @@ void uinput_pointer_command(int mask, in
+ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timespec tv;
+ 	int scancode;
+ 	allowed_input_t input;
+ 	int d = direct_key_fd < 0 ? fd : direct_key_fd;
+@@ -1253,7 +1263,9 @@ void uinput_key_command(int down, int ke
+ 	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);
++        clock_gettime(CLOCK_REALTIME, &tv);
++        ev.input_event_sec = tv.tv_sec;
++        ev.input_event_usec = tv.tv_nsec / 1000;
+ 	ev.type = EV_KEY;
+ 	ev.code = (unsigned char) scancode;
+ 	ev.value = down;
diff --git a/debian/patches/series b/debian/patches/series
index e623b2c..3284f17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0004-x11vnc.ftbfs-gcc10.patch
 0005-scan-limit-access-to-shared-memory-segments-to-curre.patch
 0006-fix-manpage-acute-accents.patch
+0007-use-clock_gettime-to-replace-gettimeofday.patch