diff --git a/xrdp-0.9.0~git.1456906198.f422461.tar.gz b/xrdp-0.9.0~git.1456906198.f422461.tar.gz deleted file mode 100644 index 6d2b99b..0000000 --- a/xrdp-0.9.0~git.1456906198.f422461.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5e04b46d3568d6a1d034d0919208ac4e14ee30be1cb8cde26dd32ce779018ba -size 2184315 diff --git a/xrdp-0.9.2.tar.gz b/xrdp-0.9.2.tar.gz new file mode 100644 index 0000000..54e9ab7 --- /dev/null +++ b/xrdp-0.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2179c324d2223ad30011b53ad6c5d215fd5c917282476de17bbfcc56a5cd04f3 +size 3034364 diff --git a/xrdp-Allow-sessions-with-32-bpp.patch.patch b/xrdp-Allow-sessions-with-32-bpp.patch.patch deleted file mode 100644 index 957e0ca..0000000 --- a/xrdp-Allow-sessions-with-32-bpp.patch.patch +++ /dev/null @@ -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 diff --git a/xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch b/xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch deleted file mode 100644 index 0c1c578..0000000 --- a/xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch +++ /dev/null @@ -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 diff --git a/xrdp-default-config.patch b/xrdp-default-config.patch index f279e97..d03e2cc 100644 --- a/xrdp-default-config.patch +++ b/xrdp-default-config.patch @@ -1,153 +1,105 @@ -From 9359e6228d702dc4d3cc8057c05e2b3bae267406 Mon Sep 17 00:00:00 2001 -From: Felix Zhang -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 -index a58af38..e60aaa9 100644 +index 8225ee44..37c78169 100644 --- a/sesman/sesman.ini +++ b/sesman/sesman.ini -@@ -15,11 +15,10 @@ TerminalServerAdmins=tsadmins - AlwaysGroupCheck = false - - [Sessions] -- - ## X11DisplayOffset - x11 display number offset - # Type: integer --# Default: 10 +@@ -18,7 +18,7 @@ AlwaysGroupCheck=false + ;; X11DisplayOffset - x11 display number offset + ; Type: integer + ; Default: 10 -X11DisplayOffset=10 -+# Default: 200 +X11DisplayOffset=200 - ## MaxSessions - maximum number of connections to an xrdp server - # Type: integer -@@ -58,16 +57,9 @@ Policy=Default + ;; MaxSessions - maximum number of connections to an xrdp server + ; Type: integer +@@ -50,9 +50,9 @@ Policy=Default [Logging] LogFile=xrdp-sesman.log -LogLevel=DEBUG -EnableSyslog=1 -SyslogLevel=DEBUG -- --[X11rdp] --param1=-bs --param2=-ac --param3=-nolisten --param4=tcp --param5=-uds +LogLevel=ERROR +EnableSyslog=0 +SyslogLevel=ERROR - [Xvnc] - param1=-bs + [X11rdp] + param=X11rdp diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini -index 34adb07..a48ec48 100644 +index cb6d7c36..f4c75c88 100644 --- a/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 - # 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=000000 - # width and height of login screen + ; width and height of login screen ls_width=350 -@@ -113,9 +113,9 @@ ls_btn_cancel_height=30 +@@ -117,9 +117,9 @@ ls_btn_cancel_height=30 [Logging] LogFile=xrdp.log -LogLevel=DEBUG --EnableSyslog=1 +-EnableSyslog=true -SyslogLevel=DEBUG +LogLevel=ERROR -+EnableSyslog=0 ++EnableSyslog=false +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] -@@ -140,67 +140,25 @@ tcutils=true - # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 + [Channels] +@@ -148,34 +148,24 @@ tcutils=true + ; Session types + ; - [xrdp1] --name=sesman-X11rdp +-[Xorg] +-name=Xorg -lib=libxup.so --username=ask --password=ask --ip=127.0.0.1 --port=-1 --xserverbpp=24 --code=10 -- --[xrdp2] - name=sesman-Xvnc - lib=libvnc.so ++[Xvnc] ++name=Xvnc ++lib=libvnc.so username=ask password=ask ip=127.0.0.1 port=-1 --#delay_ms=2000 -+# delay in milliseconds before connecting to Xvnc -+# to avoid race condition: -+# https://github.com/neutrinolabs/xrdp/issues/182 +-code=20 ++#xserverbpp=24 +delay_ms=2000 --[xrdp3] -+[xrdp2] - name=console - lib=libvnc.so +-[X11rdp] +-name=X11rdp ++[Xorg] ++name=Xorg + lib=libxup.so + username=ask + password=ask 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 username=na password=ask -#delay_ms=2000 - --[xrdp4] +-[vnc-any] -name=vnc-any -lib=libvnc.so -ip=ask @@ -159,7 +111,7 @@ index 34adb07..a48ec48 100644 -#pamsessionmng=127.0.0.1 -#delay_ms=2000 - --[xrdp5] +-[sesman-any] -name=sesman-any -lib=libvnc.so -ip=ask @@ -167,24 +119,7 @@ index 34adb07..a48ec48 100644 -username=ask -password=ask -#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 - [Session manager] - name=Session manager --- -2.6.6 - + [neutrinordp-any] + name=neutrinordp-any diff --git a/xrdp-disable-8-bpp-vnc-support.patch b/xrdp-disable-8-bpp-vnc-support.patch index 741c1ba..9d5bd85 100644 --- a/xrdp-disable-8-bpp-vnc-support.patch +++ b/xrdp-disable-8-bpp-vnc-support.patch @@ -1,44 +1,38 @@ -From a0c6305f00fa61e48b79c1edd6de83fb8107e386 Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Tue, 30 Aug 2016 20:03:35 +0800 +From: Fuminobu TAKEYAMA +Date: Mon, 01 May 2017 08:13:41 +0000 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 8 bpp will cause it to dump core (bsc#991059). --- - vnc/vnc.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + vnc/vnc.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vnc/vnc.c b/vnc/vnc.c -index bb04726..c3ee3bf 100644 +index b0eb29b3..db593da0 100644 --- a/vnc/vnc.c +++ b/vnc/vnc.c -@@ -950,11 +950,14 @@ lib_mod_connect(struct vnc *v) - check_sec_result = 1; - - /* 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)) +@@ -1011,15 +1011,19 @@ lib_mod_connect(struct vnc *v) + /* check if bpp is supported for rdp connection */ + switch (v->server_bpp) { -- v->server_msg(v, "VNC error - only supporting 8, 15, 16 and 24 bpp rdp " -+ v->server_msg(v, "VNC error - only supporting 15, 16 and 24 bpp " - "connections", 0); -+ if (v->server_bpp == 8) -+ v->server_msg(v, "VNC error - 8 bpp support is dropped " -+ "since Xvnc 1.4.0", 0); +- case 8: + case 15: + case 16: + case 24: + case 32: + 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; } - -@@ -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 diff --git a/xrdp-do-not-execute-psuedo-login-shell.patch b/xrdp-do-not-execute-psuedo-login-shell.patch new file mode 100644 index 0000000..2d2ac67 --- /dev/null +++ b/xrdp-do-not-execute-psuedo-login-shell.patch @@ -0,0 +1,102 @@ +commit 97b6b8c2f2988eb570d04c6d7929d0090f887798 +Author: Fuminobu TAKEYAMA +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 diff --git a/xrdp-fix-buildtime-warnings.patch b/xrdp-fix-buildtime-warnings.patch deleted file mode 100644 index 5970af9..0000000 --- a/xrdp-fix-buildtime-warnings.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit ded462ab8eb4e8bd3e275961854a77dc9adb6537 -Author: Jay Sorg -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); - diff --git a/xrdp-openSUSE-logo.patch b/xrdp-openSUSE-logo.patch index d36693d..6a0db45 100644 --- a/xrdp-openSUSE-logo.patch +++ b/xrdp-openSUSE-logo.patch @@ -1,25 +1,23 @@ -From f90a6e8ec3f15adca3af5716f550412dc0f56fc8 Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Fri, 5 Aug 2016 17:03:50 +0800 +From: Fuminobu TAKEYAMA +Date: Mon, 01 May 2017 08:19:06 +0000 Subject: [PATCH] change logo in login dialog for openSUSE +refresh the patch from Felix Zhang + --- xrdp/xrdp.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini -index df3f97e..d49826a 100644 +index cb6d7c36..0f5b1def 100644 --- a/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini -@@ -84,7 +84,7 @@ ls_bg_color=dedede +@@ -88,7 +88,7 @@ ls_bg_color=dedede - # logo - # full path to bmp-file or file in shared folder + ; logo + ; full path to bmp-file or file in shared folder -ls_logo_filename= +ls_logo_filename=/usr/share/xrdp/openSUSE.bmp ls_logo_x_pos=55 ls_logo_y_pos=50 --- -2.6.6 - diff --git a/xrdp-pam.patch b/xrdp-pam.patch index cd468c2..2bb7f82 100644 --- a/xrdp-pam.patch +++ b/xrdp-pam.patch @@ -1,27 +1,9 @@ -From d744afa31f03fdc182343d483e54f7594a385478 Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Mon, 1 Aug 2016 17:08:04 +0800 -Subject: [PATCH] pam - ---- - instfiles/pam.d/xrdp-sesman | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -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 - +diff --git a/instfiles/pam.d/xrdp-sesman.suse b/instfiles/pam.d/xrdp-sesman.suse +index a7c7836c..8868613d 100644 +--- a/instfiles/pam.d/xrdp-sesman.suse ++++ b/instfiles/pam.d/xrdp-sesman.suse +@@ -3,3 +3,4 @@ auth include common-auth + account include common-account + session include common-session + password include common-password ++session required pam_loginuid.so diff --git a/xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch b/xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch deleted file mode 100644 index 0d499bd..0000000 --- a/xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch +++ /dev/null @@ -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; - } - diff --git a/xrdp.changes b/xrdp.changes index 003274b..95ea5e4 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -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 diff --git a/xrdp.spec b/xrdp.spec index 336d3da..f6ed975 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -18,32 +18,26 @@ %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services Name: xrdp -Version: 0.9.0~git.1456906198.f422461 +Version: 0.9.2 Release: 0 Summary: Remote desktop protocol (RDP) server License: Apache-2.0 and GPL-2.0+ Group: System/X11/Utilities 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 Source2: sysconfig.xrdp Source3: force_stop Source4: openSUSE.bmp 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 -# PATCH-FIX-UPSTREAM xrdp-fix-buildtime-warnings.patch - fezhang@suse.com -- fix warnings in build time, backported from upstream devel branch -Patch2: xrdp-fix-buildtime-warnings.patch -# PATCH-FIX-OPENSUSE xrdp-default-config.patch - cyberorg@opensuse.org -- Adjust default settings to openSUSE standards +# PATCH-FIX-OPENSUSE xrdp-default-config.patch - cyberorg@opensuse.org refreshed by ftake@geeko.jp -- Adjust default settings to openSUSE standards 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 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 -Patch5: xrdp-Allow-sessions-with-32-bpp.patch.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-FIX-UPSTREAM xrdp-do-not-execute-psuedo-login-shell.patch - ftake@geeko.jp +Patch5: xrdp-do-not-execute-psuedo-login-shell.patch # 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 @@ -64,11 +58,13 @@ BuildRequires: libXfixes-devel BuildRequires: libXrandr-devel BuildRequires: libavahi-devel BuildRequires: libtool +BuildRequires: nasm BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: pkgconfig(systemd) Requires: xorg-x11-Xvnc +Recommends: xorgxrdp BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,15 +72,35 @@ A fully functional Linux terminal server, capable of accepting connection from rdesktop and Microsoft's own terminal server / remote 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 %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 %if ! 0%{?is_opensuse} %patch11 -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-sesman -# remove init script that conflicts with systemd service -rm -rf %{buildroot}/%{_initddir} +# remove a certification file generated during make and +# use certification file created at the post phase +rm -rf %{buildroot}/%{_sysconfdir}/xrdp/cert.pem %fdupes -s %{buildroot} @@ -151,6 +168,14 @@ exit 0 %service_del_postun xrdp-sesman.service %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 %defattr(-,root,root) @@ -159,7 +184,6 @@ exit 0 %dir %{_sysconfdir}/xrdp %dir %{_sysconfdir}/xrdp/pulse %config %{_fwdefdir}/xrdp -%config(noreplace) %{_sysconfdir}/default/xrdp %config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman %config(noreplace) %{_sysconfdir}/xrdp/sesman.ini %config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini @@ -184,4 +208,21 @@ exit 0 %ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini %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