Hello community,
here is the log from the commit of package xrdp for openSUSE:Factory checked in
at 2020-10-27 19:00:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xrdp (Old)
and /work/SRC/openSUSE:Factory/.xrdp.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp"
Tue Oct 27 19:00:28 2020 rev:39 rq:844211 version:0.9.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2020-09-21
17:24:39.687986134 +0200
+++ /work/SRC/openSUSE:Factory/.xrdp.new.3463/xrdp.changes 2020-10-27
19:01:18.878846690 +0100
@@ -1,0 +2,14 @@
+Mon Oct 19 02:32:24 UTC 2020 - Yifan Jiang <yfji...@suse.com>
+
+- Use %license to pack up COPYING in spec
+
+-------------------------------------------------------------------
+Mon Oct 19 02:18:15 UTC 2020 - Yifan Jiang <yfji...@suse.com>
+
+- Add xrdp-usr-etc-support.patch: Additionally support
+ /usr/etc/X11/Xsession in startwm.sh (bsc#1177779)
+ Author: Stefan Dirsch <sndir...@suse.com>
+
+- Rebase Update xrdp-bsc965647-allow-admin-choose-desktop.patch
+
+-------------------------------------------------------------------
@@ -35,0 +50,10 @@
+-------------------------------------------------------------------
+Tue Aug 11 09:10:17 UTC 2020 - Yifan Jiang <yfji...@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
+
+-------------------------------------------------------------------
New:
----
xrdp-usr-etc-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.bONFOK/_old 2020-10-27 19:01:19.626847234 +0100
+++ /var/tmp/diff_new_pack.bONFOK/_new 2020-10-27 19:01:19.630847237 +0100
@@ -44,6 +44,8 @@
Patch5: xrdp-support-KillDisconnected-for-Xvnc.patch
# PATCH-FIX-OPENSUSE xrdp-systemd-services.patch boo#1138954 boo#1144327 -
fezh...@suse.com -- Let systemd handle the daemons
Patch6: xrdp-systemd-services.patch
+# PATCH-FEATURE-UPSTREAM xrdp-usr-etc-support.patch bsc#1177779 -
yfji...@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 - hfigui...@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 - dli...@novell.com -- filter the fake tab key which is used to
notify the session
@@ -53,6 +55,7 @@
# PATCH-FEATURE-SLE xrdp-fate318398-change-expired-password.patch fate#318398
- fezh...@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 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%patch11 -p1
%if 0%{?sle_version}
%patch12 -p1
@@ -185,7 +189,8 @@
%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/*
++++++ xrdp-bsc965647-allow-admin-choose-desktop.patch ++++++
--- /var/tmp/diff_new_pack.bONFOK/_old 2020-10-27 19:01:19.698847286 +0100
+++ /var/tmp/diff_new_pack.bONFOK/_new 2020-10-27 19:01:19.702847289 +0100
@@ -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 @@
+#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 @@
+ 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 @@
. ~/.profile
fi
fi
-@@ -42,56 +74,20 @@ pre_start()
+@@ -42,11 +89,11 @@ pre_start()
return 0
}
@@ -105,11 +120,8 @@
+#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 @@
- # 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 @@
#. /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
++++++ xrdp-usr-etc-support.patch ++++++
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
