Make xrdp-selinux a weak dependency on versions that support them.

Drop xrdp-selinux dependency completely.
This commit is contained in:
Bojan Smojver 2019-09-23 21:15:38 +10:00
parent 97fedc358a
commit 97b0b912df
2 changed files with 11 additions and 3 deletions

View File

@ -37,7 +37,8 @@ SELinux
Please note that you may need to install xrdp-selinux package in order to get
the required SELinux policy that will allow xrdp and associated processes to
run successfully if SELinux is enabled.
run successfully if SELinux is enabled. On versions of Fedora and RHEL that
support weak dependencies, xrdp-selinux will be a recommended package.
WARNING: The policy module contains a rule that permits unconfined_service_t
processes to transition into unconfined_t. If xrdp is not the only service

View File

@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.11
Release: 3%{?dist}
Release: 5%{?dist}
License: ASL 2.0
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
@ -50,7 +50,10 @@ BuildRequires: %{_hardlink}
Requires: tigervnc-server-minimal
Requires: xorg-x11-xinit
Requires: util-linux
Requires: %{name}-selinux = %{epoch}:%{version}-%{release}
%if 0%{?fedora} || %{?rhel} >= 8
Recommends: %{name}-selinux = %{epoch}:%{version}-%{release}
%endif
Requires(post): systemd
Requires(post): systemd-sysv
@ -266,6 +269,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
* Mon Sep 23 2019 Bojan Smojver <bojan@rexurive.com> - 1:0.9.11-5
- Make xrdp-selinux a weak dependency on versions that support them.
- Drop xrdp-selinux dependency completely.
* Sun Sep 15 2019 Bojan Smojver <bojan@rexurive.com> - 1:0.9.11-3
- Decouple xrdp from xorgxrdp, causing repeated installation issues in RHEL.