Accepting request 638375 from home:zhangxiaofei:branches:X11:RemoteDesktop

- Update to version 0.9.8

- Update xrdp-fate318398-change-expired-password.patch: Use
  configured values instead of hardcoded ones in login_wnd inputs

- Add xrdp-support-KillDisconnected-for-Xvnc.patch: Support the
  KillDisconnected option for TigerVNC Xvnc sessions (boo#1101506)

OBS-URL: https://build.opensuse.org/request/show/638375
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=48

xrdp-0.9.7.tar.gz

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

xrdp-0.9.7.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAls17BUACgkQn3LNvAG/
-EOve+hAA2Nwg1MdCbeLJwOUjxDgHT2ih6ALE6OIObpwzGzqd0U95Xxxn58BtBSGg
-SiyRzn6HvqC4zgP21CwfTFt/XbZDKOHrwdzs0iQew7XBQL1e6VOXGfmx60U1V+P6
-L2Y3WVmaHH61lMJMZW8TQf39WLe80A3K9NRNdiKIRKyKDVAeaYU3IcpUXkrbfo0C
-TLxqnbxEyg4yJsDDeVBaUi9xP9+sACsgHxaPBtNfPLCWWk1sU2BmaAkXBNJFxBwe
-uTXqBfnn+y9bmDWxqGi1muMvgIHWo0vNUCYq1GhhDSXdpj9CDN6xQorTrbAtNYDe
-6YwVN/sZKFx5SIQhDT7QcEkpzj392z2wA3rl6NijnTIUo6zRZVFwo2TSAcnlSL9k
-+43V2j22+PIH4TRXVfP3pOh7L0bZpjsivloJiOHFWst+7pHIv9XBI1InBt9AptTO
-kv+e6mzlgDZJjTIMDJS8IU8uTj/Cl2vPk5e/ymnMvg7Uh7Gl+QfnqpLcMoH24qom
-CXYvJD4ZwjxPQo5VvHMDPo1RvUHH5uueBMard81FUIqsllQsLwZgXvhmL8XGOhVb
-l21Qwq0BWWcEXt7nGe0vm408yyvtut58jBIqdZEVs2ThuqAVveMID41UBMpf0Xua
-8XJgQovzwsT0ltzcv8e1ltfkwiD1DIOdZlxtkUkSGQjEeGMBh9M=
-=b2H3
------END PGP SIGNATURE-----

xrdp-0.9.8.tar.gz

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

xrdp-0.9.8.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAlup07oACgkQn3LNvAG/
+EOvXsg/9HcbcF6HZ6BcRygt/W3zEAB2yxRUci6vQdf5zJHinlW1U7dliOYP8jxMo
+zYCx7P+JiimkwfVG4DgFYmZh7GMO9SAcpFTdY71JIfF3Kh23G4uVNpFhrTypHDTY
+6A1v4ARs3Lj6YiNSHDWchPvW7GDj7l2+XemShH7N87xADtozJk8b8yGqZkiGs93o
+4zG6L/B1L6UNaXnUXJV9pLRGZZZU+inPLQf+iLK48h5kmdd06S/m3s7qxg1gS1/N
+3jx6Cr1go8Td3bTrDhqI5OdaUxrElKIaiGl6uZpn8tGKba4SRpL1CWo/8fNPhc5B
+3Qb6XQE4N1VUlzq7oBEGIpm4kwZ0/Gdenz2RJVERTNbgY0iOrl0SN5LJxstQKvxI
+7/aQwRbm5ydEEK8ngjSlOR45oEMSlKq9gqRRDmlzcpeuFZwuYHSKmP3nWndNkhI0
+tZUO6GQ2722JqbUkC7UiGcxrcTjLsDDDB9IyhXgZhqVGcf9OGuAhwCDKvxKaE7k2
+2WO+ZgsRFW4NxUV0CQiLGeTN5y2aSMY9yBcGcsTRhEMwNsjSkvysoEFCBi+MpKtb
+HW1MXAimOPaJ6IJi1DKex/SdnBuqXujGSaSgLVo4+o79UM5tSLpKPAMkSNcYpiGX
+RIe+UlBag4V1VzLHXYOLj3x4mDKkV1Z2M0PgMQX6D9lQgh5wUws=
+=ugV6
+-----END PGP SIGNATURE-----

xrdp-fate318398-change-expired-password.patch

@@ -466,7 +466,7 @@ Index: b/xrdp/xrdp_login_wnd.c
 +    char captions [][256] = {"New Pass", "Confirm"};
 +    for (i = 0; i < 2; i++)
 +    {
-+        but = xrdp_bitmap_create(95, DEFAULT_EDIT_H, self->screen->bpp,
++        but = xrdp_bitmap_create(globals->ls_label_width, DEFAULT_EDIT_H, self->screen->bpp,
 +                                 WND_TYPE_LABEL, self);
 +        list_add_item(self->newpass_window->child_list, (long)but);
 +        but->parent = self->newpass_window;
@@ -476,7 +476,7 @@ Index: b/xrdp/xrdp_login_wnd.c
 +        but->id = 200 + 2 * i;
 +        set_string(&but->caption1, captions[i]);
 +
-+        but = xrdp_bitmap_create(DEFAULT_EDIT_W, DEFAULT_EDIT_H, self->screen->bpp,
++        but = xrdp_bitmap_create(globals->ls_input_width, DEFAULT_EDIT_H, self->screen->bpp,
 +                                 WND_TYPE_EDIT, self);
 +        list_add_item(self->newpass_window->child_list, (long)but);
 +        but->parent = self->newpass_window;

xrdp-support-KillDisconnected-for-Xvnc.patch

@@ -0,0 +1,21 @@
+Index: b/sesman/session.c
+===================================================================
+--- a/sesman/session.c	2018-08-10 20:47:37.977842303 +0800
++++ b/sesman/session.c	2018-08-10 20:50:06.203134988 +0800
+@@ -732,6 +729,16 @@ session_start_fork(tbus data, tui8 type,
+ 
+                     g_free(passwd_file);
+ 
++                    /* translate sesman.ini options KillDisconnected and DisconnectedTimeLimit
++                     * into TigerVNC Xvnc parameteres */
++                    if (g_cfg->sess.kill_disconnected != 0 ||
++                        g_cfg->sess.max_disc_time != 0)
++                    {
++                        list_add_item(xserver_params, (tintptr)g_strdup("-MaxDisconnectionTime"));
++                        g_snprintf(text, 255, "%d", g_cfg->sess.max_disc_time < 60 ? 60 : g_cfg->sess.max_disc_time);
++                        list_add_item(xserver_params, (tintptr)g_strdup(text));
++                    }
++
+                     /* additional parameters from sesman.ini file */
+                     //config_read_xserver_params(SESMAN_SESSION_TYPE_XVNC,
+                     //                           xserver_params);

xrdp.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Sep 26 09:10:35 UTC 2018 - Felix Zhang <fezhang@suse.com>
+
+- Update to version 0.9.8
+  + New features
+    - Add TLSv1.3 support #1193
+  + Deprecation notice
+    - TLSv1 and TLSv1.1 are removed from the default config.
+      Current default is TLSv1.2 and TLSv1.3
+  + Bug fixes
+    - Ensure unmount redirected drive on fatal X error #1140
+  + Other changes
+    - Pulseaudio modules has been removed from xrdp source tree
+    - Pass pulse socket name via environment variable #1198
+- Update xrdp-fate318398-change-expired-password.patch: Use
+  configured values instead of hardcoded ones in login_wnd inputs
+
+-------------------------------------------------------------------
+Fri Aug 10 10:25:46 UTC 2018 - fezhang@suse.com
+
+- Add xrdp-support-KillDisconnected-for-Xvnc.patch: Support the
+  KillDisconnected option for TigerVNC Xvnc sessions (boo#1101506)
+
 -------------------------------------------------------------------
 Thu Aug  2 14:28:28 UTC 2018 - bwiedemann@suse.com
 

xrdp.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,7 +23,7 @@
 
 %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 Name:           xrdp
-Version:        0.9.7
+Version:        0.9.8
 Release:        0
 Summary:        Remote desktop protocol (RDP) server
 License:        Apache-2.0 AND GPL-2.0-or-later
@@ -42,6 +42,8 @@ Patch1:         xrdp-pam.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
 Patch4:         xrdp-disable-8-bpp-vnc-support.patch
+# PATCH-FIX-OPENSUSE xrdp-support-KillDisconnected-for-Xvnc.patch boo#1101506 - fezhang@suse.com -- Support the KillDisconnected option for TigerVNC Xvnc sessions
+Patch5:         xrdp-support-KillDisconnected-for-Xvnc.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
@@ -101,6 +103,7 @@ This package contains libraries for the JPEG2000 codec for RDP.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %if ! 0%{?is_opensuse}
 %patch11 -p1
 %patch12 -p1