commit xrdp for openSUSE:Factory

Hello community, here is the log from the commit of package xrdp for openSUSE:Factory checked in at 2017-02-21 13:50:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdp (Old) and /work/SRC/openSUSE:Factory/.xrdp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xrdp" Changes: -------- --- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2016-10-13 11:32:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xrdp.new/xrdp.changes 2017-02-21 13:50:53.535777746 +0100 @@ -1,0 +2,8 @@ +Wed Feb 1 12:14:29 CET 2017 - vliaskovitis@suse.com + +- Backport upstream patches for 32bpp support (bsc#1022098) + - Add xrdp-Allow-sessions-with-32-bpp.patch.patch + - Add xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch + - Add xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch + +------------------------------------------------------------------- New: ---- xrdp-Allow-sessions-with-32-bpp.patch.patch xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdp.spec ++++++ --- /var/tmp/diff_new_pack.9dIv3Y/_old 2017-02-21 13:50:54.143692186 +0100 +++ /var/tmp/diff_new_pack.9dIv3Y/_new 2017-02-21 13:50:54.147691623 +0100 @@ -1,7 +1,7 @@ # # spec file for package xrdp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,12 @@ 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-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 @@ -74,6 +80,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %if ! 0%{?is_opensuse} %patch11 -p1 %patch12 -p1 ++++++ xrdp-Allow-sessions-with-32-bpp.patch.patch ++++++ 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 ++++++ xrdp-Fix-support-for-32-bpp-clients-connecting-to-16-bpp-.patch ++++++ 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 ++++++ xrdp-vnc-enable-32-bpp-support-for-Xvnc-it-actually-works.patch ++++++ 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; }
participants (1)
-
root@hilbertn.suse.de