From f5708ae118115a64880f2a11feeb13cbc647bd43 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Aug 10 2017 00:42:06 +0000 Subject: Bump up to 0.9.3. --- diff --git a/.gitignore b/.gitignore index 507c07c..0df20b0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xrdp-cvs-03-17-2010.tar.gz /xrdp-0.9.0.tar.gz /xrdp-0.9.1.tar.gz /xrdp-0.9.2.tar.gz +/xrdp-0.9.3.tar.gz diff --git a/README.Fedora b/README.Fedora index 8da3687..8ce52b1 100644 --- a/README.Fedora +++ b/README.Fedora @@ -53,3 +53,14 @@ param=-SendPrimary=0 param=-SetPrimary=0 Of course, cut and paste support will not work with these set. + +Runlevel +======== + +If the system is configured to boot into graphical target, you may experience +problems with xrdp Gnome sessions. In order to avoid this, put the system into +multi user target. Like this: + +systemctl set-default multi-user.target + +Then reboot. diff --git a/sources b/sources index 1fd2dd1..42fb178 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrdp-0.9.2.tar.gz) = 49626a75b0cf432436d3ac39a91d10224a264e8603523baf441e1f95f44c7cca02c0824ca48406aacfe1d9b2475abfc5703ce44254c95fd49382a57b62ee636e +SHA512 (xrdp-0.9.3.tar.gz) = 8f7d2f8bb992e00c4c88441c504574c5de6592382a6c3139b5c9499b0b61795c740a4570e6aff912c79a67f4ee9b08ce190b07dcddbef8e9b8fc81ff07297690 diff --git a/xrdp-0.9.2-service.patch b/xrdp-0.9.2-service.patch deleted file mode 100644 index bcda3f0..0000000 --- a/xrdp-0.9.2-service.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.service ---- xrdp-0.9.1/instfiles/xrdp.service 2016-12-22 09:02:47.000000000 -0800 -+++ xrdp-0.9.1.service/instfiles/xrdp.service 2017-01-19 23:35:06.000000000 -0800 -@@ -1,15 +1,11 @@ - Description=xrdp daemon - Documentation=man:xrdp(8) man:xrdp.ini(5) - Requires=xrdp-sesman.service --After=network.target xrdp-sesman.service -+After=xrdp-sesman.service - - [Service] --Type=forking --PIDFile=/var/run/xrdp.pid --EnvironmentFile=-/etc/sysconfig/xrdp --EnvironmentFile=-/etc/default/xrdp --ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill -+EnvironmentFile=/etc/sysconfig/xrdp -+ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon - - [Install] - WantedBy=multi-user.target -diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/xrdp-sesman.service ---- xrdp-0.9.1/instfiles/xrdp-sesman.service 2016-12-22 09:02:47.000000000 -0800 -+++ xrdp-0.9.1.service/instfiles/xrdp-sesman.service 2017-01-22 11:39:23.000000000 -0800 -@@ -2,16 +2,13 @@ - Description=xrdp session manager - Documentation=man:xrdp-sesman(8) man:sesman.ini(5) --After=network.target -+Wants=network-online.target nss-lookup.target nss-user-lookup.target -+After=network-online.target nss-lookup.target nss-user-lookup.target - StopWhenUnneeded=true - BindsTo=xrdp.service - - [Service] --Type=forking --PIDFile=/var/run/xrdp-sesman.pid --EnvironmentFile=-/etc/sysconfig/xrdp --EnvironmentFile=-/etc/default/xrdp --ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill -+EnvironmentFile=/etc/sysconfig/xrdp -+ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon - - [Install] - WantedBy=multi-user.target diff --git a/xrdp-0.9.3-service.patch b/xrdp-0.9.3-service.patch new file mode 100644 index 0000000..e64968d --- /dev/null +++ b/xrdp-0.9.3-service.patch @@ -0,0 +1,46 @@ +diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.service +--- xrdp-0.9.1/instfiles/xrdp.service 2016-12-22 09:02:47.000000000 -0800 ++++ xrdp-0.9.1.service/instfiles/xrdp.service 2017-01-19 23:35:06.000000000 -0800 +@@ -1,15 +1,11 @@ + Description=xrdp daemon + Documentation=man:xrdp(8) man:xrdp.ini(5) + Requires=xrdp-sesman.service +-After=network.target xrdp-sesman.service ++After=xrdp-sesman.service + + [Service] +-Type=forking +-PIDFile=/var/run/xrdp.pid +-EnvironmentFile=-/etc/sysconfig/xrdp +-EnvironmentFile=-/etc/default/xrdp +-ExecStart=/usr/local/sbin/xrdp $XRDP_OPTIONS +-ExecStop=/usr/local/sbin/xrdp $XRDP_OPTIONS --kill ++EnvironmentFile=/etc/sysconfig/xrdp ++ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon + + [Install] + WantedBy=multi-user.target +diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/xrdp-sesman.service +--- xrdp-0.9.1/instfiles/xrdp-sesman.service 2016-12-22 09:02:47.000000000 -0800 ++++ xrdp-0.9.1.service/instfiles/xrdp-sesman.service 2017-01-22 11:39:23.000000000 -0800 +@@ -2,16 +2,13 @@ + Description=xrdp session manager + Documentation=man:xrdp-sesman(8) man:sesman.ini(5) +-After=network.target ++Wants=network-online.target nss-lookup.target nss-user-lookup.target ++After=network-online.target nss-lookup.target nss-user-lookup.target + StopWhenUnneeded=true + BindsTo=xrdp.service + + [Service] +-Type=forking +-PIDFile=/var/run/xrdp-sesman.pid +-EnvironmentFile=-/etc/sysconfig/xrdp +-EnvironmentFile=-/etc/default/xrdp +-ExecStart=/usr/local/sbin/xrdp-sesman $SESMAN_OPTIONS +-ExecStop=/usr/local/sbin/xrdp-sesman $SESMAN_OPTIONS --kill ++EnvironmentFile=/etc/sysconfig/xrdp ++ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon + + [Install] + WantedBy=multi-user.target diff --git a/xrdp.spec b/xrdp.spec index 45655c1..43279ca 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -6,8 +6,8 @@ Summary: Open source remote desktop protocol (RDP) server Name: xrdp Epoch: 1 -Version: 0.9.2 -Release: 14%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://www.xrdp.org/ @@ -20,7 +20,7 @@ Source5: README.Fedora Source6: xrdp.te Patch0: xrdp-0.9.2-sesman.patch Patch1: xrdp-0.9.2-xrdp-ini.patch -Patch2: xrdp-0.9.2-service.patch +Patch2: xrdp-0.9.3-service.patch Patch3: xrdp-0.9.2-setpriv.patch Patch4: xrdp-0.9.2-scripts-libexec.patch Patch5: xrdp-0.9.2-split-line.patch @@ -119,8 +119,9 @@ cd - #install 'bash -l' startwm script %{__install} -Dp -m 755 sesman/startwm-bash.sh %{buildroot}%{_libexecdir}/xrdp/startwm-bash.sh -#move startwm script to libexec +#move startwm and reconnectwm scripts to libexec %{__mv} -f %{buildroot}%{_sysconfdir}/xrdp/startwm.sh %{buildroot}%{_libexecdir}/xrdp/ +%{__mv} -f %{buildroot}%{_sysconfdir}/xrdp/reconnectwm.sh %{buildroot}%{_libexecdir}/xrdp/ # SELinux policy module for selinuxvariant in %{selinux_variants} @@ -204,6 +205,7 @@ fi %{_sysconfdir}/xrdp/openssl.conf %{_sysconfdir}/xrdp/xrdp_keyboard.ini %{_libexecdir}/xrdp/startwm*.sh +%{_libexecdir}/xrdp/reconnectwm.sh %{_bindir}/xrdp-genkeymap %{_bindir}/xrdp-sesadmin %{_bindir}/xrdp-keygen @@ -257,6 +259,9 @@ fi %{_datadir}/selinux/*/%{name}.pp %changelog +* Thu Aug 10 2017 Bojan Smojver - 1:0.9.3-1 +- Bump up to 0.9.3 + * Thu Aug 03 2017 Fedora Release Engineering - 1:0.9.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild