Hello community, here is the log from the commit of package xrdp for openSUSE:Factory checked in at 2019-09-11 10:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdp (Old) and /work/SRC/openSUSE:Factory/.xrdp.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp" Wed Sep 11 10:37:11 2019 rev:26 rq:729870 version:0.9.10 Changes: -------- --- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2019-08-06 15:11:52.267741131 +0200 +++ /work/SRC/openSUSE:Factory/.xrdp.new.7948/xrdp.changes 2019-09-11 10:37:13.275264381 +0200 @@ -1,0 +2,6 @@ +Tue Sep 10 10:19:14 UTC 2019 - Felix Zhang <[email protected]> + +- Add xrdp-systemd-services.patch: Let systemd handle the daemons, + fix daemon start failures (boo#1138954, boo#1144327). + +------------------------------------------------------------------- New: ---- xrdp-systemd-services.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdp.spec ++++++ --- /var/tmp/diff_new_pack.HQXGYB/_old 2019-09-11 10:37:14.139264130 +0200 +++ /var/tmp/diff_new_pack.HQXGYB/_new 2019-09-11 10:37:14.143264130 +0200 @@ -42,6 +42,8 @@ Patch4: xrdp-disable-8-bpp-vnc-support.patch # PATCH-FIX-OPENSUSE xrdp-support-KillDisconnected-for-Xvnc.patch boo#1101506 - [email protected] -- Support the KillDisconnected option for TigerVNC Xvnc sessions Patch5: xrdp-support-KillDisconnected-for-Xvnc.patch +# PATCH-FIX-OPENSUSE xrdp-systemd-services.patch boo#1138954 boo#1144327 - [email protected] -- Let systemd handle the daemons +Patch6: xrdp-systemd-services.patch # PATCH-FEATURE-SLE xrdp-avahi.diff bnc#586785 - [email protected] -- Add Avahi support Patch11: xrdp-avahi.diff # PATCH-FIX-SLE xrdp-filter-tab-from-mstsc-on-focus-change.patch bnc#601996 bnc#623534 - [email protected] -- filter the fake tab key which is used to notify the session @@ -102,6 +104,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %if ! 0%{?is_opensuse} %patch11 -p1 %patch12 -p1 ++++++ xrdp-systemd-services.patch ++++++ Index: b/instfiles/xrdp-sesman.service.in =================================================================== --- a/instfiles/xrdp-sesman.service.in 2019-04-18 13:38:26.000000000 +0800 +++ b/instfiles/xrdp-sesman.service.in 2019-09-10 18:16:37.077484890 +0800 @@ -6,12 +6,9 @@ StopWhenUnneeded=true BindsTo=xrdp.service [Service] -Type=forking -PIDFile=@localstatedir@/run/xrdp-sesman.pid EnvironmentFile=-@sysconfdir@/sysconfig/xrdp EnvironmentFile=-@sysconfdir@/default/xrdp -ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS -ExecStop=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --kill +ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --nodaemon [Install] WantedBy=multi-user.target Index: b/instfiles/xrdp.service.in =================================================================== --- a/instfiles/xrdp.service.in 2019-04-18 13:38:26.000000000 +0800 +++ b/instfiles/xrdp.service.in 2019-09-10 18:16:24.737376128 +0800 @@ -5,12 +5,9 @@ Requires=xrdp-sesman.service After=network.target xrdp-sesman.service [Service] -Type=forking -PIDFile=@localstatedir@/run/xrdp.pid EnvironmentFile=-@sysconfdir@/sysconfig/xrdp EnvironmentFile=-@sysconfdir@/default/xrdp -ExecStart=@sbindir@/xrdp $XRDP_OPTIONS -ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill +ExecStart=@sbindir@/xrdp $XRDP_OPTIONS --nodaemon [Install] WantedBy=multi-user.target
