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

Accepting request 844211 from X11:RemoteDesktop

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/844211
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrdp?expand=0&rev=39
This commit is contained in:
Dominique Leuenberger 2020-10-27 18:00:28 +00:00 committed by Git OBS Bridge
commit 9112dc2f44
4 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xrdp-bsc965647-allow-admin-choose-desktop.patch
View File

@ -1,8 +1,8 @@
diff --git a/sesman/startwm.sh b/sesman/startwm.sh
index ad06010..2330775 100755
--- a/sesman/startwm.sh
+++ b/sesman/startwm.sh
@@ -7,34 +7,66 @@
Index: xrdp-0.9.14/sesman/startwm.sh
===================================================================
--- xrdp-0.9.14.orig/sesman/startwm.sh
+++ xrdp-0.9.14/sesman/startwm.sh
@@ -7,34 +7,81 @@
# exec xterm
@ -25,8 +25,11 @@ index ad06010..2330775 100755
+#start the window manager
+wm_start()
+{
+ #Customize your preferred session mode here
+ #The default session is gnome(GNOME Session)
+ #To customize system-wise session, edit this file.
+ #To customize user specific session, copy this file to $HOME and edit it.
+ #Please refer to DefaultWindowManager and UserWindowManager in /etc/xrdp/sesman.ini for more details.
+
+ #The default session is gnome (GNOME Session)
+ #sle means SLE-Classic Session
+ SESSION="gnome"
+
@ -36,12 +39,24 @@ index ad06010..2330775 100755
+ export XDG_SESSION_TYPE=x11
+ export GNOME_SHELL_SESSION_MODE=sle-classic
+ /usr/bin/gnome-session --session gnome-classic
+ elif [ -r /usr/bin/icewm-session ]; then
+ /usr/bin/icewm-session
+ fi
+ ;;
+ gnome)
+ if [ -r /usr/bin/gnome-session ]; then
+ export XDG_SESSION_TYPE=x11
+ /usr/bin/gnome-session
+ elif [ -r /usr/bin/icewm-session ]; then
+ /usr/bin/icewm-session
+ fi
+ ;;
+ plasma)
+ if [ -r /usr/bin/startplasma-x11 ]; then
+ export XDG_SESSION_TYPE=x11
+ /usr/bin/startplasma-x11
+ elif [ -r /usr/bin/icewm-session ]; then
+ /usr/bin/icewm-session
+ fi
+ ;;
+ icewm)
@ -89,7 +104,7 @@ index ad06010..2330775 100755
. ~/.profile
fi
fi
@@ -42,56 +74,20 @@ pre_start()
@@ -42,11 +89,11 @@ pre_start()
return 0
}
@ -105,11 +120,8 @@ index ad06010..2330775 100755
+#END IF
post_start()
{
- if [ -r ~/.bash_logout ]; then
+ if [ -f ~/.bash_logout ]
+ then
. ~/.bash_logout
fi
if [ -r ~/.bash_logout ]; then
@@ -55,46 +102,6 @@ post_start()
return 0
}
@ -143,6 +155,9 @@ index ad06010..2330775 100755
- # do not execute the pseudo login shell scripts
- . /etc/X11/xdm/Xsession
- exit 0
- elif [ -r /usr/etc/X11/xdm/Xsession ]; then
- . /usr/etc/X11/xdm/Xsession
- exit 0
- fi
-
- pre_start
@ -153,7 +168,7 @@ index ad06010..2330775 100755
#. /etc/environment
#export PATH=$PATH
#export LANG=$LANG
@@ -106,6 +102,8 @@ wm_start()
@@ -109,6 +116,8 @@ wm_start()
# includes
# auth required pam_env.so readenv=1

14
xrdp-usr-etc-support.patch Normal file
View File

@ -0,0 +1,14 @@
Index: xrdp-0.9.14/sesman/startwm.sh
===================================================================
--- xrdp-0.9.14.orig/sesman/startwm.sh
+++ xrdp-0.9.14/sesman/startwm.sh
@@ -85,6 +85,9 @@ wm_start()
# do not execute the pseudo login shell scripts
. /etc/X11/xdm/Xsession
exit 0
+ elif [ -r /usr/etc/X11/xdm/Xsession ]; then
+ . /usr/etc/X11/xdm/Xsession
+ exit 0
fi
pre_start

24
xrdp.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Oct 19 02:32:24 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
- Use %license to pack up COPYING in spec
-------------------------------------------------------------------
Mon Oct 19 02:18:15 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
- Add xrdp-usr-etc-support.patch: Additionally support
/usr/etc/X11/Xsession in startwm.sh (bsc#1177779)
Author: Stefan Dirsch <sndirsch@suse.com>
- Rebase Update xrdp-bsc965647-allow-admin-choose-desktop.patch
-------------------------------------------------------------------
Fri Sep 18 04:21:28 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>
@ -33,6 +47,16 @@ Mon Sep 14 04:04:20 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>
- Rebase xrdp-disable-8-bpp-vnc-support.patch
- Rebase xrdp-fate318398-change-expired-password.patch
-------------------------------------------------------------------
Tue Aug 11 09:10:17 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
- Update xrdp-bsc965647-allow-admin-choose-desktop.patch:
+ Fallback the session to icewm when a selected desktop
environment is not found (bsc#1171415)
+ Support plasma session for Leap 15.2
+ Give more informative comments in start_wm.sh
-------------------------------------------------------------------
Fri Jul 10 02:27:32 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
- Update xrdp.keyring according to:

7
xrdp.spec
View File

@ -44,6 +44,8 @@ Patch4: xrdp-disable-8-bpp-vnc-support.patch
Patch5: xrdp-support-KillDisconnected-for-Xvnc.patch
# PATCH-FIX-OPENSUSE xrdp-systemd-services.patch boo#1138954 boo#1144327 - fezhang@suse.com -- Let systemd handle the daemons
Patch6: xrdp-systemd-services.patch
# PATCH-FEATURE-UPSTREAM xrdp-usr-etc-support.patch bsc#1177779 - yfjiang@suse.com gh#neutrinolabs/xrdp!1702 -- Support /usr/etc configuration change
Patch7: xrdp-usr-etc-support.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
@ -53,6 +55,7 @@ Patch13: xrdp-bsc965647-allow-admin-choose-desktop.patch
# PATCH-FEATURE-SLE xrdp-fate318398-change-expired-password.patch fate#318398 - fezhang@suse.com -- enable user to update expired password via PAM
Patch14: xrdp-fate318398-change-expired-password.patch
Patch16: xrdp-buildfix.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@ -104,6 +107,7 @@ This package contains libraries for the JPEG2000 codec for RDP.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch11 -p1
%if 0%{?sle_version}
%patch12 -p1
@ -185,7 +189,8 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
%doc COPYING *.txt
%license COPYING
%doc *.txt
%{_bindir}/xrdp*
%{_datadir}/xrdp/*
%{_libdir}/xrdp/*