include patches from Bojan Smojver <bojan@rexursive.com>

This commit is contained in:
Itamar Reis Peixoto 2012-05-23 22:45:59 -03:00
parent 1880550ff3
commit d37d9732a5

View File

@ -3,14 +3,15 @@
Summary: Open source remote desktop protocol (RDP) server Summary: Open source remote desktop protocol (RDP) server
Name: xrdp Name: xrdp
Version: 0.6.0 Version: 0.6.0
Release: 1.0%{?dist} Release: 0.1%{?dist}
License: GPLv2+ with exceptions License: GPLv2+ with exceptions
Group: Applications/Internet Group: Applications/Internet
URL: http://xrdp.sourceforge.net/ URL: http://xrdp.sourceforge.net/
Source0: http://server1.xrdp.org/xrdp/xrdp-%{version}.tar.gz Source0: http://server1.xrdp.org/xrdp/xrdp-HEAD-a9cfc23.tar.gz
Patch0: xrdp-pam-auth.patch Patch0: xrdp-pam-auth.patch
Patch1: xrdp-use-xinitrc-in-startm-sh.patch Patch1: xrdp-use-xinitrc-in-startm-sh.patch
Patch2: xrdp-pam_session.patch
Source1: xrdp.init Source1: xrdp.init
Source2: xrdp.sysconfig Source2: xrdp.sysconfig
@ -39,10 +40,11 @@ server, capable of accepting connections from rdesktop and Microsoft's own
terminal server / remote desktop clients. terminal server / remote desktop clients.
%prep %prep
%setup -q -n %{name}-%{version} #%setup -q -n %{name}-%{version}
%setup -q -n xrdp-HEAD-a9cfc23
%patch0 -p2 %patch0 -p2
%patch1 -p2 %patch1 -p2
%patch2 -p1
# remove unused modules from xrdp login combobox # remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@ -54,6 +56,13 @@ terminal server / remote desktop clients.
# increase encryption to 128 bit's # increase encryption to 128 bit's
%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
# create 'bash -l' based startwm, to pick up PATH etc.
echo '#!/bin/bash -l
. %{_sysconfdir}/xrdp/startwm.sh' > sesman/startwm-bash.sh
# set 'bash -l' based startwm script as default
%{__sed} -i -e 's/DefaultWindowManager=startwm.sh/DefaultWindowManager=startwm-bash.sh/' sesman/sesman.ini
%build %build
./bootstrap ./bootstrap
@ -88,6 +97,9 @@ touch %{buildroot}%{_localstatedir}/log/xrdp-sesman.log
touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
%{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini %{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
#install 'bash -l' startwm script
%{__install} -Dp -m 755 sesman/startwm-bash.sh %{buildroot}%{_sysconfdir}/xrdp/startwm-bash.sh
%post %post
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
@ -167,8 +179,8 @@ fi
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
%changelog %changelog
* Sat Feb 04 2012 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.5.0-0.16 * Wed May 23 2012 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.6.0-0.1
- add support for systemd - include patch's from Bojan Smojver bz#821569 , bz#611669
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-0.15 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-0.15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild