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

- Refresh xrdp-bsc965647-allow-admin-choose-desktop.patch

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

xrdp-bsc965647-allow-admin-choose-desktop.patch

@@ -1,9 +1,10 @@
-diff --git a/sesman/startwm.sh b/sesman/startwm.sh
+Index: b/sesman/startwm.sh
-index 452917a..ace62a0 100755
+===================================================================
---- a/sesman/startwm.sh
+--- a/sesman/startwm.sh	2018-03-28 12:58:02.408758661 +0800
-+++ b/sesman/startwm.sh
++++ b/sesman/startwm.sh	2018-03-28 12:59:03.058439975 +0800
-@@ -1,33 +1,62 @@
+@@ -7,34 +7,63 @@
- #!/bin/sh
+ # exec xterm
+ 
  
 -# Execution sequence for interactive login shell - pseudocode
 -#
@@ -85,7 +86,7 @@ index 452917a..ace62a0 100755
          . ~/.profile
        fi
      fi
-@@ -35,56 +64,20 @@ pre_start()
+@@ -42,56 +71,20 @@
    return 0
  }
  
@@ -149,7 +150,7 @@ index 452917a..ace62a0 100755
  #. /etc/environment
  #export PATH=$PATH
  #export LANG=$LANG
-@@ -99,6 +92,8 @@ wm_start()
+@@ -106,6 +99,8 @@
  # includes
  # auth       required     pam_env.so readenv=1
  

xrdp.changes

@@ -17,6 +17,7 @@ Tue Mar 27 03:05:52 UTC 2018 - fezhang@suse.com
       #1024 #1052 #1063
     - Lots of leak fixes, cleanups and refactoring
 - Enable IPv6 (boo#1083105)
+- Refresh xrdp-bsc965647-allow-admin-choose-desktop.patch
 
 -------------------------------------------------------------------
 Thu Mar 22 10:21:51 UTC 2018 - fezhang@suse.com