termux-packages/x11-packages/xrdp/fix-tmpdir.patch

70 lines
2.6 KiB
Diff
Raw Normal View History

2021-05-05 22:21:26 +02:00
diff -uNr xrdp-0.9.16/sesman/sesman.c xrdp-0.9.16.mod/sesman/sesman.c
--- xrdp-0.9.16/sesman/sesman.c 2021-04-30 12:12:07.000000000 +0000
+++ xrdp-0.9.16.mod/sesman/sesman.c 2021-05-05 22:56:39.013384734 +0000
2021-02-09 21:33:01 +01:00
@@ -573,14 +573,14 @@
g_mk_socket_path("xrdp-sesman");
/* make sure the /tmp/.X11-unix directory exists */
- if (!g_directory_exist("/tmp/.X11-unix"))
+ if (!g_directory_exist("@TERMUX_PREFIX@/tmp/.X11-unix"))
{
- if (!g_create_dir("/tmp/.X11-unix"))
+ if (!g_create_dir("@TERMUX_PREFIX@/tmp/.X11-unix"))
{
2021-02-09 21:33:01 +01:00
LOG(LOG_LEVEL_ERROR,
- "sesman.c: error creating dir /tmp/.X11-unix");
+ "sesman.c: error creating dir @TERMUX_PREFIX@/tmp/.X11-unix");
}
- g_chmod_hex("/tmp/.X11-unix", 0x1777);
+ g_chmod_hex("@TERMUX_PREFIX@/tmp/.X11-unix", 0x1777);
}
g_snprintf(text, 255, "xrdp_sesman_%8.8x_main_term", g_pid);
2021-05-05 22:21:26 +02:00
diff -uNr xrdp-0.9.16/sesman/session.c xrdp-0.9.16.mod/sesman/session.c
--- xrdp-0.9.16/sesman/session.c 2021-04-30 12:12:07.000000000 +0000
+++ xrdp-0.9.16.mod/sesman/session.c 2021-05-05 22:57:32.057384094 +0000
@@ -164,13 +164,13 @@
int x_running;
int sck;
- g_sprintf(text, "/tmp/.X11-unix/X%d", display);
+ g_sprintf(text, "@TERMUX_PREFIX@/tmp/.X11-unix/X%d", display);
x_running = g_file_exist(text);
if (!x_running)
{
2021-05-05 22:21:26 +02:00
LOG(LOG_LEVEL_DEBUG, "Did not find a running X server at %s", text);
- g_sprintf(text, "/tmp/.X%d-lock", display);
+ g_sprintf(text, "@TERMUX_PREFIX@/tmp/.X%d-lock", display);
x_running = g_file_exist(text);
}
2021-05-05 22:21:26 +02:00
@@ -264,13 +264,13 @@
char text[256];
int x_running;
- g_sprintf(text, "/tmp/.X11-unix/X%d", display);
+ g_sprintf(text, "@TERMUX_PREFIX@/tmp/.X11-unix/X%d", display);
x_running = g_file_exist(text);
if (!x_running)
{
2021-05-05 22:21:26 +02:00
LOG(LOG_LEVEL_DEBUG, "Did not find a running X server at %s", text);
- g_sprintf(text, "/tmp/.X%d-lock", display);
+ g_sprintf(text, "@TERMUX_PREFIX@/tmp/.X%d-lock", display);
x_running = g_file_exist(text);
}
2021-05-05 22:21:26 +02:00
diff -uNr xrdp-0.9.16/xrdp/xrdp_mm.c xrdp-0.9.16.mod/xrdp/xrdp_mm.c
--- xrdp-0.9.16/xrdp/xrdp_mm.c 2021-04-30 12:12:07.000000000 +0000
+++ xrdp-0.9.16.mod/xrdp/xrdp_mm.c 2021-05-05 22:56:39.013384734 +0000
@@ -2705,7 +2705,7 @@
header.bytes_follow = enc_done->comp_bytes - (2 + pheader_bytes[0]);
if (ii == 0)
{
- ii = g_file_open("/tmp/jpeg.beef.bin");
+ ii = g_file_open("@TERMUX_PREFIX@/tmp/jpeg.beef.bin");
if (ii == -1)
{
ii = 0;