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

Accepting request 497080 from home:ftake:branches:X11:RemoteDesktop

Browse Source 
format changes

OBS-URL: https://build.opensuse.org/request/show/497080
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=13
This commit is contained in:
Felix Zhang 2017-05-27 18:13:35 +00:00 committed by Git OBS Bridge
parent 1c8420a047
commit 7beba0466d
13 changed files with 311 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xrdp-0.9.0~git.1456906198.f422461.tar.gz
View File

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

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

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

12
xrdp-Allow-sessions-with-32-bpp.patch.patch
View File

@ -1,12 +0,0 @@
diff -aur xrdp-0.9.0~git.1456906198.f422461-orig/sesman/libscp/libscp_session.c xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_session.c
--- xrdp-0.9.0~git.1456906198.f422461-orig/sesman/libscp/libscp_session.c 2017-02-01 11:53:04.000000000 +0100
+++ xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_session.c 2017-02-01 12:52:25.000000000 +0100
@@ -141,6 +141,7 @@
case 15:
case 16:
case 24:
+ case 32:
s->bpp = bpp;
default:
return 1;
Only in xrdp-0.9.0~git.1456906198.f422461/sesman/libscp: libscp_session.c.orig

13
xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch
View File

@ -1,13 +0,0 @@
diff -aur xrdp-0.9.0~git.1456906198.f422461-orig/vnc/vnc.c xrdp-0.9.0~git.1456906198.f422461/vnc/vnc.c
--- xrdp-0.9.0~git.1456906198.f422461-orig/vnc/vnc.c 2017-02-01 13:01:15.000000000 +0100
+++ xrdp-0.9.0~git.1456906198.f422461/vnc/vnc.c 2017-02-01 13:01:30.000000000 +0100
@@ -1214,7 +1214,7 @@
out_uint8(pixel_format, 0); /* blue shift */
out_uint8s(pixel_format, 3); /* pad */
}
- else if (v->mod_bpp == 24)
+ else if (v->mod_bpp == 24 || v->mod_bpp == 32)
{
out_uint8(pixel_format, 32); /* bits per pixel */
out_uint8(pixel_format, 24); /* depth */
Only in xrdp-0.9.0~git.1456906198.f422461/vnc: vnc.c.orig

181
xrdp-default-config.patch
View File

@ -1,153 +1,105 @@
From 9359e6228d702dc4d3cc8057c05e2b3bae267406 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Wed, 17 Aug 2016 17:07:32 +0800
Subject: [PATCH] default config
---
instfiles/xrdp.service | 7 +++---
instfiles/xrdp.sh | 4 ++--
sesman/sesman.ini | 18 ++++-----------
xrdp/xrdp.ini | 62 ++++++++------------------------------------------
4 files changed, 20 insertions(+), 71 deletions(-)
diff --git a/instfiles/xrdp.service b/instfiles/xrdp.service
index 7bb076d..93117d4 100644
--- a/instfiles/xrdp.service
+++ b/instfiles/xrdp.service
@@ -1,14 +1,13 @@
[Unit]
Description=xrdp daemon
-Requires=xrdp-sesman.service
-After=syslog.target network.target xrdp-sesman.service
+After=syslog.target network.target
[Service]
Type=forking
PIDFile=/var/run/xrdp.pid
EnvironmentFile=/etc/sysconfig/xrdp
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
+ExecStart=/etc/xrdp/xrdp.sh start
+ExecStop=/etc/xrdp/xrdp.sh stop
[Install]
WantedBy=multi-user.target
diff --git a/instfiles/xrdp.sh b/instfiles/xrdp.sh
index 3e72743..630fa5b 100755
--- a/instfiles/xrdp.sh
+++ b/instfiles/xrdp.sh
@@ -17,8 +17,8 @@
# Description: starts xrdp
### END INIT INFO
-SBINDIR=/usr/local/sbin
-LOG=/dev/null
+SBINDIR=/usr/sbin
+LOG=/var/log/xrdp.log
CFGDIR=/etc/xrdp
if ! test -x $SBINDIR/xrdp
diff --git a/sesman/sesman.ini b/sesman/sesman.ini diff --git a/sesman/sesman.ini b/sesman/sesman.ini
index a58af38..e60aaa9 100644 index 8225ee44..37c78169 100644
--- a/sesman/sesman.ini --- a/sesman/sesman.ini
+++ b/sesman/sesman.ini +++ b/sesman/sesman.ini
@@ -15,11 +15,10 @@ TerminalServerAdmins=tsadmins @@ -18,7 +18,7 @@ AlwaysGroupCheck=false
AlwaysGroupCheck = false ;; X11DisplayOffset - x11 display number offset
; Type: integer
[Sessions] ; Default: 10
-
## X11DisplayOffset - x11 display number offset
# Type: integer
-# Default: 10
-X11DisplayOffset=10 -X11DisplayOffset=10
+# Default: 200
+X11DisplayOffset=200 +X11DisplayOffset=200
## MaxSessions - maximum number of connections to an xrdp server ;; MaxSessions - maximum number of connections to an xrdp server
# Type: integer ; Type: integer
@@ -58,16 +57,9 @@ Policy=Default @@ -50,9 +50,9 @@ Policy=Default
[Logging] [Logging]
LogFile=xrdp-sesman.log LogFile=xrdp-sesman.log
-LogLevel=DEBUG -LogLevel=DEBUG
-EnableSyslog=1 -EnableSyslog=1
-SyslogLevel=DEBUG -SyslogLevel=DEBUG
-
-[X11rdp]
-param1=-bs
-param2=-ac
-param3=-nolisten
-param4=tcp
-param5=-uds
+LogLevel=ERROR +LogLevel=ERROR
+EnableSyslog=0 +EnableSyslog=0
+SyslogLevel=ERROR +SyslogLevel=ERROR
[Xvnc] [X11rdp]
param1=-bs param=X11rdp
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index 34adb07..a48ec48 100644 index cb6d7c36..f4c75c88 100644
--- a/xrdp/xrdp.ini --- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini
@@ -70,7 +70,7 @@ use_fastpath=both @@ -74,7 +74,7 @@ grey=dedede
#ls_title=My Login Title #ls_title=My Login Title
# top level window background color in RGB format ; top level window background color in RGB format
-ls_top_window_bg_color=009cb5 -ls_top_window_bg_color=009cb5
+ls_top_window_bg_color=000000 +ls_top_window_bg_color=000000
# width and height of login screen ; width and height of login screen
ls_width=350 ls_width=350
@@ -113,9 +113,9 @@ ls_btn_cancel_height=30 @@ -117,9 +117,9 @@ ls_btn_cancel_height=30
[Logging] [Logging]
LogFile=xrdp.log LogFile=xrdp.log
-LogLevel=DEBUG -LogLevel=DEBUG
-EnableSyslog=1 -EnableSyslog=true
-SyslogLevel=DEBUG -SyslogLevel=DEBUG
+LogLevel=ERROR +LogLevel=ERROR
+EnableSyslog=0 +EnableSyslog=false
+SyslogLevel=ERROR +SyslogLevel=ERROR
# LogLevel and SysLogLevel could by any of: core, error, warning, info or debug ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
[channels] [Channels]
@@ -140,67 +140,25 @@ tcutils=true @@ -148,34 +148,24 @@ tcutils=true
# chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 ; Session types
;
[xrdp1] -[Xorg]
-name=sesman-X11rdp -name=Xorg
-lib=libxup.so -lib=libxup.so
-username=ask +[Xvnc]
-password=ask +name=Xvnc
-ip=127.0.0.1 +lib=libvnc.so
-port=-1
-xserverbpp=24
-code=10
-
-[xrdp2]
name=sesman-Xvnc
lib=libvnc.so
username=ask username=ask
password=ask password=ask
ip=127.0.0.1 ip=127.0.0.1
port=-1 port=-1
-#delay_ms=2000 -code=20
+# delay in milliseconds before connecting to Xvnc +#xserverbpp=24
+# to avoid race condition:
+# https://github.com/neutrinolabs/xrdp/issues/182
+delay_ms=2000 +delay_ms=2000
-[xrdp3] -[X11rdp]
+[xrdp2] -name=X11rdp
name=console +[Xorg]
lib=libvnc.so +name=Xorg
lib=libxup.so
username=ask
password=ask
ip=127.0.0.1 ip=127.0.0.1
port=-1
-xserverbpp=24
-code=10
-
-[Xvnc]
-name=Xvnc
-lib=libvnc.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
-#xserverbpp=24
-#delay_ms=2000
+code=20
[console]
name=console
@@ -184,28 +174,7 @@ ip=127.0.0.1
port=5900 port=5900
username=na username=na
password=ask password=ask
-#delay_ms=2000 -#delay_ms=2000
- -
-[xrdp4] -[vnc-any]
-name=vnc-any -name=vnc-any
-lib=libvnc.so -lib=libvnc.so
-ip=ask -ip=ask
@ -159,7 +111,7 @@ index 34adb07..a48ec48 100644
-#pamsessionmng=127.0.0.1 -#pamsessionmng=127.0.0.1
-#delay_ms=2000 -#delay_ms=2000
- -
-[xrdp5] -[sesman-any]
-name=sesman-any -name=sesman-any
-lib=libvnc.so -lib=libvnc.so
-ip=ask -ip=ask
@ -167,24 +119,7 @@ index 34adb07..a48ec48 100644
-username=ask -username=ask
-password=ask -password=ask
-#delay_ms=2000 -#delay_ms=2000
-
-[xrdp6]
-name=rdp-any
-lib=librdp.so
-ip=ask
-port=ask3389
-
-[xrdp7]
-name=neutrinordp-any
-lib=libxrdpneutrinordp.so
-ip=ask
-port=ask3389
-username=ask
-password=ask
+delay_ms=2000 +delay_ms=2000
[Session manager] [neutrinordp-any]
name=Session manager name=neutrinordp-any
--
2.6.6

56
xrdp-disable-8-bpp-vnc-support.patch
View File

@ -1,44 +1,38 @@
From a0c6305f00fa61e48b79c1edd6de83fb8107e386 Mon Sep 17 00:00:00 2001 From: Fuminobu TAKEYAMA <ftake@geeko.jp>
From: Felix Zhang <fezhang@suse.com> Date: Mon, 01 May 2017 08:13:41 +0000
Date: Tue, 30 Aug 2016 20:03:35 +0800
Subject: [PATCH] disable 8 bpp vnc support Subject: [PATCH] disable 8 bpp vnc support
Refresh the patch from Felix Zhang
Xvnc drops support for 8 bpp since 1.4.0. Trying to launch Xvnc in Xvnc drops support for 8 bpp since 1.4.0. Trying to launch Xvnc in
8 bpp will cause it to dump core (bsc#991059). 8 bpp will cause it to dump core (bsc#991059).
--- ---
vnc/vnc.c | 9 ++++++--- vnc/vnc.c | 8 ++++++--
1 file changed, 6 insertions(+), 3 deletions(-) 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/vnc/vnc.c b/vnc/vnc.c diff --git a/vnc/vnc.c b/vnc/vnc.c
index bb04726..c3ee3bf 100644 index b0eb29b3..db593da0 100644
--- a/vnc/vnc.c --- a/vnc/vnc.c
+++ b/vnc/vnc.c +++ b/vnc/vnc.c
@@ -950,11 +950,14 @@ lib_mod_connect(struct vnc *v) @@ -1011,15 +1011,19 @@ lib_mod_connect(struct vnc *v)
check_sec_result = 1; /* check if bpp is supported for rdp connection */
switch (v->server_bpp)
/* only support 8 and 16 bpp connections from rdp client */
- if ((v->server_bpp != 8) && (v->server_bpp != 15) &&
+ if ((v->server_bpp != 15) &&
(v->server_bpp != 16) && (v->server_bpp != 24))
{ {
- v->server_msg(v, "VNC error - only supporting 8, 15, 16 and 24 bpp rdp " - case 8:
+ v->server_msg(v, "VNC error - only supporting 15, 16 and 24 bpp " case 15:
"connections", 0); case 16:
+ if (v->server_bpp == 8) case 24:
+ v->server_msg(v, "VNC error - 8 bpp support is dropped " case 32:
+ "since Xvnc 1.4.0", 0); break;
default:
- v->server_msg(v, "VNC error - only supporting 8, 15, 16, 24 and 32 "
+ v->server_msg(v, "VNC error - only supporting 15, 16, 24 and 32 "
"bpp rdp connections", 0);
+ if (v->server_bpp == 8)
+ {
+ v->server_msg(v, "VNC error - 8 bpp support is dropped "
+ "since Xvnc 1.4.0", 0);
+ }
return 1; return 1;
} }
@@ -985,7 +988,7 @@ lib_mod_connect(struct vnc *v)
v->server_msg(v, text, 0);
g_sleep(v->delay_ms);
}
-
+
g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port);
v->server_msg(v, text, 0);
error = g_tcp_connect(v->sck, v->ip, con_port);
--
2.6.6

102
xrdp-do-not-execute-psuedo-login-shell.patch Normal file
View File

@ -0,0 +1,102 @@
commit 97b6b8c2f2988eb570d04c6d7929d0090f887798
Author: Fuminobu TAKEYAMA <ftake@geeko.jp>
Date: Thu May 4 10:49:57 2017 +0900
startwm.sh: do not call psuedo shell for /etc/X11/xdm/Xsession
Since /etc/X11/xdm/Xsession calls user's login shell, startwm.sh
may not execute the psuedo code; It causes executing
~/.profile twice.
diff --git a/sesman/startwm.sh b/sesman/startwm.sh
index b81d3646..452917a4 100755
--- a/sesman/startwm.sh
+++ b/sesman/startwm.sh
@@ -1,34 +1,5 @@
#!/bin/sh
-#start the window manager
-wm_start()
-{
- if [ -r /etc/default/locale ]; then
- . /etc/default/locale
- export LANG LANGUAGE
- fi
-
- # debian
- if [ -r /etc/X11/Xsession ]; then
- . /etc/X11/Xsession
- exit 0
- fi
-
- # el
- if [ -r /etc/X11/xinit/Xsession ]; then
- . /etc/X11/xinit/Xsession
- exit 0
- fi
-
- # suse
- if [ -r /etc/X11/xdm/Xsession ]; then
- . /etc/X11/xdm/Xsession
- exit 0
- fi
-
- xterm
-}
-
# Execution sequence for interactive login shell - pseudocode
#
# IF /etc/profile is readable THEN
@@ -77,6 +48,43 @@ post_start()
return 0
}
+#start the window manager
+wm_start()
+{
+ if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+ export LANG LANGUAGE
+ fi
+
+ # debian
+ if [ -r /etc/X11/Xsession ]; then
+ pre_start
+ . /etc/X11/Xsession
+ post_start
+ exit 0
+ fi
+
+ # el
+ if [ -r /etc/X11/xinit/Xsession ]; then
+ pre_start
+ . /etc/X11/xinit/Xsession
+ post_start
+ exit 0
+ fi
+
+ # suse
+ if [ -r /etc/X11/xdm/Xsession ]; then
+ # since the following script run a user login shell,
+ # do not execute the pseudo login shell scripts
+ . /etc/X11/xdm/Xsession
+ exit 0
+ fi
+
+ pre_start
+ xterm
+ post_start
+}
+
#. /etc/environment
#export PATH=$PATH
#export LANG=$LANG
@@ -91,8 +99,6 @@ post_start()
# includes
# auth required pam_env.so readenv=1
-pre_start
wm_start
-post_start
exit 1

59
xrdp-fix-buildtime-warnings.patch
View File

@ -1,59 +0,0 @@
commit ded462ab8eb4e8bd3e275961854a77dc9adb6537
Author: Jay Sorg <jay.sorg@gmail.com>
Date: Tue Dec 29 13:28:15 2015 -0800
chansrv: fix some warnings
diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
index bf194a0..ed18045 100644
--- a/sesman/chansrv/chansrv_fuse.c
+++ b/sesman/chansrv/chansrv_fuse.c
@@ -62,8 +62,8 @@ char g_fuse_clipboard_path[256] = ""; /* for clipboard use */
#include "chansrv_fuse.h"
/* dummy calls when XRDP_FUSE is not defined */
-int xfuse_init() { return 0; }
-int xfuse_deinit() { return 0; }
+int xfuse_init(void) { return 0; }
+int xfuse_deinit(void) { return 0; }
int xfuse_check_wait_objs(void) { return 0; }
int xfuse_get_wait_objs(tbus *objs, int *count, int *timeout) { return 0; }
int xfuse_clear_clip_dir(void) { return 0; }
@@ -74,7 +74,7 @@ int xfuse_create_share(tui32 device_id, char *dirname) { r
void xfuse_devredir_cb_open_file(void *vp, tui32 IoStatus, tui32 DeviceId, tui32 FileId) {}
void xfuse_devredir_cb_write_file(void *vp, char *buf, size_t length) {}
void xfuse_devredir_cb_read_file(void *vp, char *buf, size_t length) {}
-int xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode) {}
+int xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode) { return 0; }
void xfuse_devredir_cb_enum_dir_done(void *vp, tui32 IoStatus) {}
void xfuse_devredir_cb_rmdir_or_file(void *vp, tui32 IoStatus) {}
void xfuse_devredir_cb_rename_file(void *vp, tui32 IoStatus) {}
@@ -253,8 +253,8 @@ static int g_fd = 0;
static tintptr g_bufsize = 0;
/* forward declarations for internal access */
-static int xfuse_init_xrdp_fs();
-static int xfuse_deinit_xrdp_fs();
+static int xfuse_init_xrdp_fs(void);
+static int xfuse_deinit_xrdp_fs(void);
static int xfuse_init_lib(struct fuse_args *args);
static int xfuse_is_inode_valid(int ino);
@@ -264,7 +264,7 @@ static void xfuse_create_file(fuse_req_t req, fuse_ino_t parent,
const char *name, mode_t mode, int type);
#endif
-static void xfuse_dump_fs();
+static void xfuse_dump_fs(void);
static void xfuse_dump_xrdp_inode(struct xrdp_inode *xino);
static tui32 xfuse_get_device_id_for_inode(tui32 ino, char *full_path);
static void fuse_reverse_pathname(char *full_path, char *reverse_path);
@@ -281,7 +281,7 @@ static int xfuse_delete_file(int parent, char *name);
static int xfuse_delete_file_with_xinode(XRDP_INODE *xinode);
static int xfuse_delete_dir_with_xinode(XRDP_INODE *xinode);
static int xfuse_recursive_delete_dir_with_xinode(XRDP_INODE *xinode);
-static void xfuse_update_xrdpfs_size();
+static void xfuse_update_xrdpfs_size(void);
static void xfuse_enum_dir(fuse_req_t req, fuse_ino_t ino, size_t size,
off_t off, struct fuse_file_info *fi);

18
xrdp-openSUSE-logo.patch
View File

@ -1,25 +1,23 @@
From f90a6e8ec3f15adca3af5716f550412dc0f56fc8 Mon Sep 17 00:00:00 2001 From: Fuminobu TAKEYAMA <ftake@geeko.jp>
From: Felix Zhang <fezhang@suse.com> Date: Mon, 01 May 2017 08:19:06 +0000
Date: Fri, 5 Aug 2016 17:03:50 +0800
Subject: [PATCH] change logo in login dialog for openSUSE Subject: [PATCH] change logo in login dialog for openSUSE
refresh the patch from Felix Zhang
--- ---
xrdp/xrdp.ini | 2 +- xrdp/xrdp.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index df3f97e..d49826a 100644 index cb6d7c36..0f5b1def 100644
--- a/xrdp/xrdp.ini --- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini
@@ -84,7 +84,7 @@ ls_bg_color=dedede @@ -88,7 +88,7 @@ ls_bg_color=dedede
# logo ; logo
# full path to bmp-file or file in shared folder ; full path to bmp-file or file in shared folder
-ls_logo_filename= -ls_logo_filename=
+ls_logo_filename=/usr/share/xrdp/openSUSE.bmp +ls_logo_filename=/usr/share/xrdp/openSUSE.bmp
ls_logo_x_pos=55 ls_logo_x_pos=55
ls_logo_y_pos=50 ls_logo_y_pos=50
--
2.6.6

36
xrdp-pam.patch
View File

@ -1,27 +1,9 @@
From d744afa31f03fdc182343d483e54f7594a385478 Mon Sep 17 00:00:00 2001 diff --git a/instfiles/pam.d/xrdp-sesman.suse b/instfiles/pam.d/xrdp-sesman.suse
From: Felix Zhang <fezhang@suse.com> index a7c7836c..8868613d 100644
Date: Mon, 1 Aug 2016 17:08:04 +0800 --- a/instfiles/pam.d/xrdp-sesman.suse
Subject: [PATCH] pam +++ b/instfiles/pam.d/xrdp-sesman.suse
@@ -3,3 +3,4 @@ auth include common-auth
--- account include common-account
instfiles/pam.d/xrdp-sesman | 9 +++++---- session include common-session
1 file changed, 5 insertions(+), 4 deletions(-) password include common-password
+session required pam_loginuid.so
diff --git a/instfiles/pam.d/xrdp-sesman b/instfiles/pam.d/xrdp-sesman
index 789ce8f..745f75c 100644
--- a/instfiles/pam.d/xrdp-sesman
+++ b/instfiles/pam.d/xrdp-sesman
@@ -1,5 +1,6 @@
#%PAM-1.0
-@include common-auth
-@include common-account
-@include common-session
-@include common-password
+auth include common-auth
+account include common-account
+password include common-password
+session include common-session
+session required pam_loginuid.so
--
2.6.6

31
xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch
View File

@ -1,31 +0,0 @@
diff -aur xrdp-0.9.0~git.1456906198.f422461-orig/vnc/vnc.c xrdp-0.9.0~git.1456906198.f422461/vnc/vnc.c
--- xrdp-0.9.0~git.1456906198.f422461-orig/vnc/vnc.c 2017-02-01 12:54:47.000000000 +0100
+++ xrdp-0.9.0~git.1456906198.f422461/vnc/vnc.c 2017-02-01 12:59:28.000000000 +0100
@@ -949,15 +949,21 @@
v->server_msg(v, "VNC started connecting", 0);
check_sec_result = 1;
- /* only support 8 and 16 bpp connections from rdp client */
- if ((v->server_bpp != 15) &&
- (v->server_bpp != 16) && (v->server_bpp != 24))
+ /* check if bpp is supported for rdp connection */
+ switch (v->server_bpp)
{
- v->server_msg(v, "VNC error - only supporting 15, 16 and 24 bpp "
- "connections", 0);
- if (v->server_bpp == 8)
+
+ case 15:
+ case 16:
+ case 24:
+ case 32:
+ break;
+ case 8:
v->server_msg(v, "VNC error - 8 bpp support is dropped "
"since Xvnc 1.4.0", 0);
+ default:
+ v->server_msg(v, "VNC error - only supporting 15, 16, 24 and 32 "
+ "bpp rdp connections", 0);
return 1;
}

47
xrdp.changes
View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Sat May 20 07:36:25 UTC 2017 - ftake@geeko.jp
- Update to version 0.9.2
+ RemoteFX codec and Bitmap updates support are enabled
+ TLS ciphers suites and version, and connected computer name is
now logged
+ Miscellaneous RemoteFX codec mode improvements
- Update to version 0.9.1
+ Support for TLS security layer (preferred over RDP layer
if supported by the client)
+ Support for disabling deprecated SSLv3 protocol and
selecting custom cipher suites in xrdp.ini
+ Support for bidirectional fastpath
(enabled in both directions by default)
+ More configurable login screen
+ Support for new virtual channels:
- rdpdr: device redirection
- rdpsnd: audio output
- cliprdr: clipboard
- xrdpvr: xrdp video redirection channel
(can be used along with NeutrinoRDP client)
+ Support for disabling virtual channels globally or
by session type
+ Allow to specify the path for backends (Xorg, X11rdp, Xvnc)
+ Multi-monitor support
+ xrdp-chansrv stroes logs in ${XDG_DATA_HOME}/xrdp now
- New sub packages for shared libraries and development files
+ libpainter0
+ librfxencode0
+ xrdp-devel
- Drop patches merged by the upstream
+ xrdp-fix-buildtime-warnings.patch
+ xrdp-Allow-sessions-with-32-bpp.patch.patch
+ xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch
+ xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch
- Refresh patches
+ xrdp-pam.patch
- its main part has been merged by the upstream
+ xrdp-default-config.patch
- keep to use Xvnc as a default backend instread of Xorg
(upstream default)
+ xrdp-disable-8-bpp-vnc-support.patch
+ xrdp-openSUSE-logo.patch
- Add xrdp-do-not-execute-psuedo-login-shell.patch
+ prevent ~/.profile from being executed twice
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 6 10:31:26 UTC 2017 - fezhang@suse.com Mon Feb 6 10:31:26 UTC 2017 - fezhang@suse.com

77
xrdp.spec
View File

@ -18,32 +18,26 @@
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
Name: xrdp Name: xrdp
Version: 0.9.0~git.1456906198.f422461 Version: 0.9.2
Release: 0 Release: 0
Summary: Remote desktop protocol (RDP) server Summary: Remote desktop protocol (RDP) server
License: Apache-2.0 and GPL-2.0+ License: Apache-2.0 and GPL-2.0+
Group: System/X11/Utilities Group: System/X11/Utilities
Url: https://github.com/neutrinolabs/xrdp Url: https://github.com/neutrinolabs/xrdp
Source0: xrdp-%{version}.tar.gz Source0: https://github.com/neutrinolabs/xrdp/releases/download/v0.9.2/xrdp-%{version}.tar.gz
Source1: xrdp.fw Source1: xrdp.fw
Source2: sysconfig.xrdp Source2: sysconfig.xrdp
Source3: force_stop Source3: force_stop
Source4: openSUSE.bmp Source4: openSUSE.bmp
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE xrdp-pam.patch bnc#441750 - hfiguiere@novell.com # PATCH-FIX-OPENSUSE xrdp-pam.patch - hfiguiere@novell.com refreshed by ftake@geeko.jp
Patch1: xrdp-pam.patch Patch1: xrdp-pam.patch
# PATCH-FIX-UPSTREAM xrdp-fix-buildtime-warnings.patch - fezhang@suse.com -- fix warnings in build time, backported from upstream devel branch # PATCH-FIX-OPENSUSE xrdp-default-config.patch - cyberorg@opensuse.org refreshed by ftake@geeko.jp -- Adjust default settings to openSUSE standards
Patch2: xrdp-fix-buildtime-warnings.patch
# PATCH-FIX-OPENSUSE xrdp-default-config.patch - cyberorg@opensuse.org -- Adjust default settings to openSUSE standards
Patch3: xrdp-default-config.patch Patch3: xrdp-default-config.patch
# PATCH-FIX-OPENSUSE xrdp-disable-8-bpp-vnc-support.patch bsc#991059 - fezhang@suse.com -- disable 8 bpp support for vnc connections # PATCH-FIX-OPENSUSE xrdp-disable-8-bpp-vnc-support.patch bsc#991059 - fezhang@suse.com -- disable 8 bpp support for vnc connections
Patch4: xrdp-disable-8-bpp-vnc-support.patch Patch4: xrdp-disable-8-bpp-vnc-support.patch
# PATCH-FIX-UPSTREAM xrdp-Allow-sessions-with-32-bpp.patch.patch bsc#1022098 - vliaskovitis@suse.com -- Allow sessions with 32 bpp # PATCH-FIX-UPSTREAM xrdp-do-not-execute-psuedo-login-shell.patch - ftake@geeko.jp
Patch5: xrdp-Allow-sessions-with-32-bpp.patch.patch Patch5: xrdp-do-not-execute-psuedo-login-shell.patch
# PATCH-FIX-UPSTREAM xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch bsc#1022098 - vliaskovitis@suse.com -- vnc: enable 32 bpp support for Xvnc, it actually works
Patch6: xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch
# PATCH-FIX-UPSTREAM xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch bsc#1022098 - vliaskovitis@suse.com -- Fix support for 32-bpp clients connecting to 16-bpp VNC
Patch7: xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.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 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 # 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
@ -64,11 +58,13 @@ BuildRequires: libXfixes-devel
BuildRequires: libXrandr-devel BuildRequires: libXrandr-devel
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: nasm
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Requires: xorg-x11-Xvnc Requires: xorg-x11-Xvnc
Recommends: xorgxrdp
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -76,15 +72,35 @@ A fully functional Linux terminal server, capable of accepting
connection from rdesktop and Microsoft's own terminal server / remote connection from rdesktop and Microsoft's own terminal server / remote
desktop clients. desktop clients.
%package devel
Summary: Development files for xrdp
Group: Development/Libraries/Other
Requires: libpainter0 = %{version}
Requires: librfxencode0 = %{version}
%description devel
This package contains the development headers for xrdp
%package -n libpainter0
Summary: Library for manipulating memory bitmaps
Group: Development/Libraries/Other
%description -n libpainter0
This package contains libraries for manipulating memory bitmaps
%package -n librfxencode0
Summary: Library for JPEG2000 codec for RDP
Group: Development/Libraries/Other
%description -n librfxencode0
This package contains libraries for JPEG2000 codec for RDP
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%patch7 -p1
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
@ -118,8 +134,9 @@ install %{SOURCE4} %{buildroot}%{_datadir}/%{name}/
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp-sesman ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp-sesman
# remove init script that conflicts with systemd service # remove a certification file generated during make and
rm -rf %{buildroot}/%{_initddir} # use certification file created at the post phase
rm -rf %{buildroot}/%{_sysconfdir}/xrdp/cert.pem
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
@ -151,6 +168,14 @@ exit 0
%service_del_postun xrdp-sesman.service %service_del_postun xrdp-sesman.service
%restart_on_update %restart_on_update
%post -n libpainter0 -p /sbin/ldconfig
%postun -n libpainter0 -p /sbin/ldconfig
%post -n librfxencode0 -p /sbin/ldconfig
%postun -n librfxencode0 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -159,7 +184,6 @@ exit 0
%dir %{_sysconfdir}/xrdp %dir %{_sysconfdir}/xrdp
%dir %{_sysconfdir}/xrdp/pulse %dir %{_sysconfdir}/xrdp/pulse
%config %{_fwdefdir}/xrdp %config %{_fwdefdir}/xrdp
%config(noreplace) %{_sysconfdir}/default/xrdp
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman %config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini %config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini %config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
@ -184,4 +208,21 @@ exit 0
%ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini %ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini
%config %{_localstatedir}/adm/fillup-templates/sysconfig.xrdp %config %{_localstatedir}/adm/fillup-templates/sysconfig.xrdp
%files devel
%defattr(-,root,root)
%{_includedir}/painter.h
%{_includedir}/rfxcodec_*
%{_includedir}/xrdp_*
%{_libdir}/libpainter.so
%{_libdir}/librfxencode.so
%{_libdir}/pkgconfig/libpainter.pc
%{_libdir}/pkgconfig/rfxcodec.pc
%{_libdir}/pkgconfig/xrdp.pc
%files -n libpainter0
%{_libdir}/libpainter.so.*
%files -n librfxencode0
%{_libdir}/librfxencode.so.*
%changelog %changelog