pool/xrdp
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 738170 from X11:RemoteDesktop

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/738170
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrdp?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2019-10-14 10:43:16 +00:00 committed by Git OBS Bridge
commit 5b8e4aa0d2
8 changed files with 210 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xrdp-0.9.10.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9222b6b0a6beac0e7d6842deb6598b4a2cbac6c3f570f74c11771dbee641c98
size 1860079

16
xrdp-0.9.10.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAly4Ex4ACgkQn3LNvAG/
EOvvrA//doaOgGzMDHKTP5/CGJtmekDX6ocVMffMazEsmGvG+w06LmWimGykWLak
OicguATkOtdwQc3kqSUy8djqQN4MHAxMNwEHdK866NQEE1DydZotLa2MdYQmPKhw
7mKg4SUiaLn9zrrilqzvatcY9FcdMQmJkAynn3KLAB3d2eX0EOQrieW7auPZc5tr
2JKHnDzbT75zgykYJV6Vy4um7U05Oo64ZRCLJQes2/lc7JPLVXXpKcFQgYGKDcia
jA7Ckw24KRqgf+Axs3C9q8Fdo7mybaUjs5n7ketl8CXips1iq9VM7m36AS+FWXy4
1KQIZy3VuLBrfPSUxOZ8VxNwh2v+rbQ6DOjm+vJgEWEkMcnHTIkn9361bl4iEMyk
voz/4aq+RFn1vNV7Ni6Qu3WPV6qWFOKx3vFbdCpZPWMwzOkQNE/+3CXjxNAWw19N
AICTHwMJBrvpQnWCm9jCkhFXTo4lNMdFrYLkexCWm+GXviMsGg0WBqHOmukMu1m1
xJNbX3DZ2mQOWvAITC0AFzcWxndSHNaD0V/RdUpspgz6M7QzFbKvwISeYbpx1llY
98RrVgWLJDHLdnhh07nRu7JziQaOJ/85ZAqYNLvkA/FOsqKY/kVn5p01wIZK0WXk
qQn0tYvhUJMsESCoUaCmmzxTH7t2l0Q6LC2FPhHJX5R8LMHtrtA=
=ecvu
-----END PGP SIGNATURE-----

3
xrdp-0.9.11.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3569a29402ee2f5f1c07fa2adda68d6bda30f9c49b2582391d5065fb01a1a83c
size 1864740

16
xrdp-0.9.11.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAl1aw3sACgkQn3LNvAG/
EOub1RAAqROGVZj0SPBEztJAY1GYq5e7AG6NB/IFWFOHAgoYhfYMXHsQJhp3a2Ap
LD89iF8yKTMQLArlygllhXKkiv/DOuFHn/3hr9gS9CVysMO23E9cJDTXta3K6OmQ
oSZ5pl9fSLOeGGmau61ne70d6TKNRjlFAEh59N5gbYgGaRy8cCv7ve/5AfjxZ83K
tKfoJt5V/MEKSVNf6FZdl5jonP54n0XtX8d2N1o6yxqQmaNro3VFRWxw7oqsCLav
KrdVER0jLZebCBUMMV8FRQCQdMWXIsLFMeUMpPopxTXrmtmm+qYsW9pcjw8L9xsa
r83zgtGwQ0b3px+DZxvI64WfL0pPhXGXAemasQ+8j+qSFXhbjrdRPIIwXbWNFpLy
LLrKgH6yTC5wB6NpV4bz1kfaZkv62OMrEVewliRM/wdBud8M47+/PypeWz20Qmit
QSvDztf4BOOx6naqOwZ0zbEeT+qIAqqBsdAokFS1GGGlcymp40Li6UV6zDEMUtY3
VXlP8chmK9thLZMoiwdfwvwml7YyfH1uFXPwNGc90qZ1jJ0XNvoHnh5mVZ+0TYDf
bPl+QQAF5Q4p8aPjvTOgeNlEIgtpAZLX/X1BWllLyLb82G4IFavaua6Jape+fqLA
v/pHOK4LJp50GzikK4iADPUEipRk8pxaJk9Jaw4tmY77+g5m5dI=
=gnC8
-----END PGP SIGNATURE-----

167
xrdp-avahi.diff
View File

@ -1,7 +1,7 @@
diff --git a/configure.ac b/configure.ac
index 47212ec..b011897 100644
--- a/configure.ac
+++ b/configure.ac
Index: b/configure.ac
===================================================================
--- a/configure.ac 2019-08-19 23:39:17.000000000 +0800
+++ b/configure.ac 2019-10-12 18:00:31.198468206 +0800
@@ -9,6 +9,7 @@ AC_PROG_CC
AC_C_CONST
AC_PROG_LIBTOOL
@ -10,10 +10,10 @@ index 47212ec..b011897 100644
PKG_PROG_PKG_CONFIG
if test "x$PKG_CONFIG" = "x"; then
AC_MSG_ERROR([please install pkg-config])
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index a259ef3..2cbb762 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
Index: b/xrdp/Makefile.am
===================================================================
--- a/xrdp/Makefile.am 2019-03-25 10:34:16.000000000 +0800
+++ b/xrdp/Makefile.am 2019-10-12 17:56:20.380230201 +0800
@@ -12,7 +12,9 @@ AM_CPPFLAGS = \
-DXRDP_SOCKET_PATH=\"${socketdir}\" \
-I$(top_builddir) \
@ -43,20 +43,11 @@ index a259ef3..2cbb762 100644
xrdpsysconfdir=$(sysconfdir)/xrdp
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index 82e8a57..ae70874 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -163,6 +163,8 @@ void
xrdp_listen_main_loop(struct xrdp_listen* self);
int
xrdp_listen_test(void);
+int
+xrdp_listen_get_port(char* port, int port_bytes);
/* xrdp_region.c */
struct xrdp_region*
@@ -514,3 +516,8 @@ server_add_char_alpha(struct xrdp_mod* mod, int font, int character,
Index: b/xrdp/xrdp.h
===================================================================
--- a/xrdp/xrdp.h 2019-08-19 23:39:17.000000000 +0800
+++ b/xrdp/xrdp.h 2019-10-12 17:56:20.380230201 +0800
@@ -527,3 +527,10 @@ server_add_char_alpha(struct xrdp_mod* m
int
server_session_info(struct xrdp_mod *mod, const char *data, int data_bytes);
@ -65,11 +56,13 @@ index 82e8a57..ae70874 100644
+xrdp_avahi_init(void);
+void
+xrdp_avahi_fini(void);
diff --git a/xrdp/xrdp_avahi.c b/xrdp/xrdp_avahi.c
index e69de29..642a333 100644
--- a/xrdp/xrdp_avahi.c
+++ b/xrdp/xrdp_avahi.c
@@ -0,0 +1,115 @@
+void
+xrdp_avahi_get_port(char *port);
Index: b/xrdp/xrdp_avahi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/xrdp/xrdp_avahi.c 2019-10-12 17:56:20.380230201 +0800
@@ -0,0 +1,173 @@
+/*
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
@ -92,12 +85,10 @@ index e69de29..642a333 100644
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <avahi-client/client.h>
+#include <avahi-client/publish.h>
+#include <avahi-common/thread-watch.h>
+#include <xrdp.h>
+
+static AvahiClient *client = NULL;
+static AvahiThreadedPoll *threaded_poll = NULL;
@ -118,18 +109,13 @@ index e69de29..642a333 100644
+ char hname[512];
+ char name[576];
+ char port[8];
+ /* dummy parameters */
+ char address[256];
+ struct xrdp_startup_params* startup_param = {(const char[]) {""}, 0, 0, 0, 0, 0, 0, 0};
+
+ if (gethostname (hname, sizeof (hname)))
+ break;
+
+ sprintf (name, _service_name, hname);
+
+ xrdp_listen_get_port_address (port, sizeof (port),
+ address, sizeof (address),
+ startup_param);
+ xrdp_avahi_get_port (port);
+
+ avahi_entry_group_add_service (avahi_group,
+ AVAHI_IF_UNSPEC,
@ -185,16 +171,101 @@ index e69de29..642a333 100644
+ avahi_client_free (client);
+ avahi_threaded_poll_free (threaded_poll);
+}
diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c
index 0fbe61f..ed0af63 100644
--- a/xrdp/xrdp_listen.c
+++ b/xrdp/xrdp_listen.c
@@ -149,7 +149,7 @@ xrdp_process_run(void *in_val)
}
+
+void
+xrdp_avahi_get_port(char *port)
+{
+ const int port_bytes = 8;
+ int fd;
+ char cfg_file[256];
+
+ /* default to port 3389 */
+ g_strncpy(port, "3389", port_bytes - 1);
+
+ /* see if port or address is in xrdp.ini file */
+ g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
+ fd = g_file_open(cfg_file);
+
+ if (fd != -1)
+ {
+ struct list *names;
+ struct list *values;
+
+ names = list_create();
+ names->auto_free = 1;
+ values = list_create();
+ values->auto_free = 1;
+
+ if (file_read_section(fd, "globals", names, values) == 0)
+ {
+ int index;
+ char *val;
+
+ for (index = 0; index < names->count; index++)
+ {
+ val = (char *)list_get_item(names, index);
+
+ if (val != 0)
+ {
+ if (g_strcasecmp(val, "port") == 0)
+ {
+ val = (char *)list_get_item(values, index);
+ if (val[0] == '/')
+ {
+ g_strncpy(port, val, port_bytes - 1);
+ }
+ else
+ {
+ int error;
+
+ error = g_atoi(val);
+ if ((error > 0) && (error < 65000))
+ {
+ g_strncpy(port, val, port_bytes - 1);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ list_delete(names);
+ list_delete(values);
+ }
+
+ if (fd != -1)
+ g_file_close(fd);
+}
Index: b/common/arch.h
===================================================================
--- a/common/arch.h 2019-10-12 18:00:48.462622251 +0800
+++ b/common/arch.h 2019-10-12 18:01:11.506827870 +0800
@@ -20,28 +20,7 @@
#define ARCH_H
#include <stdlib.h>
-
-#if defined(HAVE_STDINT_H)
#include <stdint.h>
-#else
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-#if defined(_WIN64)
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-typedef signed __int64 intptr_t;
-typedef unsigned __int64 uintptr_t;
-#else
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-typedef signed long intptr_t;
-typedef unsigned long uintptr_t;
-#endif
-#endif
typedef int bool_t;
/*****************************************************************************/
-static int
+int
xrdp_listen_get_port_address(char *port, int port_bytes,
char *address, int address_bytes,
int *tcp_nodelay, int *tcp_keepalive,

52
xrdp-fate319683-allow-vnc-resizing.patch
View File

@ -1,8 +1,8 @@
diff --git a/sesman/sesman.ini b/sesman/sesman.ini
index 37c7816..4a428ec 100644
--- a/sesman/sesman.ini
+++ b/sesman/sesman.ini
@@ -40,7 +40,7 @@ DisconnectedTimeLimit=0
Index: b/sesman/sesman.ini
===================================================================
--- a/sesman/sesman.ini 2019-10-12 17:45:30.594432280 +0800
+++ b/sesman/sesman.ini 2019-10-12 17:45:37.222491421 +0800
@@ -55,7 +55,7 @@ IdleTimeLimit=0
;; Policy - session allocation policy
; Type: enum [ "Default" | "UBD" | "UBI" | "UBC" | "UBDI" | "UBDC" ]
@ -11,11 +11,11 @@ index 37c7816..4a428ec 100644
; "UBD" session per <User,BitPerPixel,DisplaySize>
; "UBI" session per <User,BitPerPixel,IPAddr>
; "UBC" session per <User,BitPerPixel,Connection>
diff --git a/sesman/session.c b/sesman/session.c
index 0b8bb6a..3a0164b 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -105,9 +105,6 @@ session_get_bydata(const char *name, int width, int height, int bpp, int type,
Index: b/sesman/session.c
===================================================================
--- a/sesman/session.c 2019-10-12 17:45:30.598432316 +0800
+++ b/sesman/session.c 2019-10-12 17:45:37.222491421 +0800
@@ -105,9 +105,6 @@ session_get_bydata(const char *name, int
{
case SCP_SESSION_TYPE_XVNC: /* 0 */
type = SESMAN_SESSION_TYPE_XVNC; /* 2 */
@ -25,11 +25,11 @@ index 0b8bb6a..3a0164b 100644
break;
case SCP_SESSION_TYPE_XRDP: /* 1 */
type = SESMAN_SESSION_TYPE_XRDP; /* 1 */
diff --git a/vnc/vnc.c b/vnc/vnc.c
index db593da..0db68b9 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -383,7 +383,8 @@ lib_mod_event(struct vnc *v, int msg, long param1, long param2,
Index: b/vnc/vnc.c
===================================================================
--- a/vnc/vnc.c 2019-10-12 17:45:30.598432316 +0800
+++ b/vnc/vnc.c 2019-10-12 17:49:39.956657294 +0800
@@ -385,7 +385,8 @@ lib_mod_event(struct vnc *v, int msg, lo
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
@ -39,7 +39,7 @@ index db593da..0db68b9 100644
x = (param1 >> 16) & 0xffff;
out_uint16_be(s, x);
y = param1 & 0xffff;
@@ -724,7 +725,24 @@ lib_framebuffer_update(struct vnc *v)
@@ -727,7 +728,24 @@ lib_framebuffer_update(struct vnc *v)
{
v->mod_width = cx;
v->mod_height = cy;
@ -65,7 +65,7 @@ index db593da..0db68b9 100644
}
else
{
@@ -740,12 +758,22 @@ lib_framebuffer_update(struct vnc *v)
@@ -743,6 +761,15 @@ lib_framebuffer_update(struct vnc *v)
error = v->server_end_update(v);
}
@ -80,6 +80,8 @@ index db593da..0db68b9 100644
+
if (error == 0)
{
if (v->suppress_output == 0)
@@ -750,7 +777,8 @@ lib_framebuffer_update(struct vnc *v)
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
@ -89,7 +91,7 @@ index db593da..0db68b9 100644
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
@@ -1327,11 +1355,12 @@ lib_mod_connect(struct vnc *v)
@@ -1333,11 +1361,12 @@ lib_mod_connect(struct vnc *v)
init_stream(s, 8192);
out_uint8(s, 2);
out_uint8(s, 0);
@ -103,8 +105,8 @@ index db593da..0db68b9 100644
v->server_msg(v, "VNC sending encodings", 0);
s_mark_end(s);
error = trans_force_write_s(v->trans, s);
@@ -1347,7 +1376,8 @@ lib_mod_connect(struct vnc *v)
/* FramebufferUpdateRequest */
@@ -1530,7 +1559,8 @@ lib_mod_suppress_output(struct vnc* v, i
make_stream(s);
init_stream(s, 8192);
out_uint8(s, 3);
- out_uint8(s, 0);
@ -113,11 +115,11 @@ index db593da..0db68b9 100644
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
diff --git a/vnc/vnc.h b/vnc/vnc.h
index 3eee4e0..1990778 100644
--- a/vnc/vnc.h
+++ b/vnc/vnc.h
@@ -113,6 +113,7 @@ struct vnc
Index: b/vnc/vnc.h
===================================================================
--- a/vnc/vnc.h 2019-10-12 17:45:30.598432316 +0800
+++ b/vnc/vnc.h 2019-10-12 17:45:37.222491421 +0800
@@ -116,6 +116,7 @@ struct vnc
int clip_chanid;
struct stream *clip_data_s;
int delay_ms;

24
xrdp.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Mon Sep 16 03:34:10 UTC 2019 - Felix Zhang <fezhang@suse.com>
- Update to version 0.9.11 (jsc#9612)
+ New features
- Suppress output (do not draw screen when client window is
minimized) #1330
- Audio input (microphone) redirection compatible with
MS-RDPEAI #1369
- Now xrdp can listen on more than one port #1124 #1366
+ Bug fixes
- Fix the issue audio redirection sometimes sounds with long
delay #1363
- Check term event for more responsive shutdown #1372
+ Known issues
- FreeRDP 2.0.0-rc4 or later might not able to connect to xrdp
due to xrdp's bad-mannered behaviour, add +glyph-cache option
to FreeRDP to connect #1266
- Audio redirection by MP3 codec doesn't sound with some
client, use AAC instead #965
- Rebase xrdp-avahi.diff, worked around stdint.h definitions
- Rebase xrdp-fate319683-allow-vnc-resizing.patch
-------------------------------------------------------------------
Tue Sep 10 10:19:14 UTC 2019 - Felix Zhang <fezhang@suse.com>
@ -46,7 +69,6 @@ Mon Apr 29 17:25:19 UTC 2019 - Felix Zhang <fezhang@suse.com>
- Audio redirection by MP3 codec doesn't sound with some
client, use AAC instead #965
-------------------------------------------------------------------
Thu Dec 27 10:03:54 UTC 2018 - Felix Zhang <fezhang@suse.com>

8
xrdp.spec
View File

@ -22,7 +22,7 @@
%endif
Name: xrdp
Version: 0.9.10
Version: 0.9.11
Release: 0
Summary: Remote desktop protocol (RDP) server
License: Apache-2.0 AND GPL-2.0-or-later
@ -44,7 +44,7 @@ Patch4: xrdp-disable-8-bpp-vnc-support.patch
Patch5: xrdp-support-KillDisconnected-for-Xvnc.patch
# PATCH-FIX-OPENSUSE xrdp-systemd-services.patch boo#1138954 boo#1144327 - fezhang@suse.com -- Let systemd handle the daemons
Patch6: xrdp-systemd-services.patch
# PATCH-FEATURE-SLE xrdp-avahi.diff bnc#586785 - hfiguiere@novell.com -- Add Avahi support
# PATCH-FEATURE-SLE xrdp-avahi.diff bnc#586785 - hfiguiere@novell.com -- Add Avahi support.
Patch11: xrdp-avahi.diff
# PATCH-FIX-SLE xrdp-filter-tab-from-mstsc-on-focus-change.patch bnc#601996 bnc#623534 - dliang@novell.com -- filter the fake tab key which is used to notify the session
Patch12: xrdp-filter-tab-from-mstsc-on-focus-change.patch
@ -52,7 +52,7 @@ Patch12: xrdp-filter-tab-from-mstsc-on-focus-change.patch
Patch13: xrdp-bsc965647-allow-admin-choose-desktop.patch
# PATCH-FEATURE-SLE xrdp-fate318398-change-expired-password.patch fate#318398 - fezhang@suse.com -- enable user to update expired password via PAM
Patch14: xrdp-fate318398-change-expired-password.patch
# PATCH-FEATURE-SLE xrdp-fate319683-allow-vnc-resizing.patch fate#319683 bsc#948062 - fezhang@suse.com -- allow resizing in VNC sessions
# PATCH-FEATURE-SLE xrdp-fate319683-allow-vnc-resizing.patch fate#319683 bsc#948062 - fezhang@suse.com -- allow resizing in VNC sessions.
Patch15: xrdp-fate319683-allow-vnc-resizing.patch
BuildRequires: autoconf
BuildRequires: automake
@ -105,8 +105,8 @@ This package contains libraries for the JPEG2000 codec for RDP.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%if ! 0%{?is_opensuse}
%patch11 -p1
%if ! 0%{?is_opensuse}
%patch12 -p1
%patch13 -p1
%patch14 -p1