diff --git a/xrdp-0.9.1-xrdp-ini.patch b/xrdp-0.9.1-xrdp-ini.patch new file mode 100644 index 0000000..ec0bdb3 --- /dev/null +++ b/xrdp-0.9.1-xrdp-ini.patch @@ -0,0 +1,112 @@ +diff -urN xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini +--- xrdp-0.9.1/xrdp/xrdp.ini 2016-12-22 09:02:47.000000000 -0800 ++++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini 2016-12-26 01:22:04.941401741 -0800 +@@ -147,15 +147,15 @@ + ; Session types + ; + +-[X11rdp] +-name=X11rdp +-lib=libxup.so +-username=ask +-password=ask +-ip=127.0.0.1 +-port=-1 +-xserverbpp=24 +-code=10 ++#[X11rdp] ++#name=X11rdp ++#lib=libxup.so ++#username=ask ++#password=ask ++#ip=127.0.0.1 ++#port=-1 ++#xserverbpp=24 ++#code=10 + + [Xorg] + name=Xorg +@@ -176,49 +176,49 @@ + #xserverbpp=24 + #delay_ms=2000 + +-[console] +-name=console +-lib=libvnc.so +-ip=127.0.0.1 +-port=5900 +-username=na +-password=ask ++#[console] ++#name=console ++#lib=libvnc.so ++#ip=127.0.0.1 ++#port=5900 ++#username=na ++#password=ask + #delay_ms=2000 + +-[vnc-any] +-name=vnc-any +-lib=libvnc.so +-ip=ask +-port=ask5900 +-username=na +-password=ask ++#[vnc-any] ++#name=vnc-any ++#lib=libvnc.so ++#ip=ask ++#port=ask5900 ++#username=na ++#password=ask + #pamusername=asksame + #pampassword=asksame + #pamsessionmng=127.0.0.1 + #delay_ms=2000 + +-[sesman-any] +-name=sesman-any +-lib=libvnc.so +-ip=ask +-port=-1 +-username=ask +-password=ask ++#[sesman-any] ++#name=sesman-any ++#lib=libvnc.so ++#ip=ask ++#port=-1 ++#username=ask ++#password=ask + #delay_ms=2000 + +-[rdp-any] +-name=rdp-any +-lib=librdp.so +-ip=ask +-port=ask3389 +- +-[neutrinordp-any] +-name=neutrinordp-any +-lib=libxrdpneutrinordp.so +-ip=ask +-port=ask3389 +-username=ask +-password=ask ++#[rdp-any] ++#name=rdp-any ++#lib=librdp.so ++#ip=ask ++#port=ask3389 ++ ++#[neutrinordp-any] ++#name=neutrinordp-any ++#lib=libxrdpneutrinordp.so ++#ip=ask ++#port=ask3389 ++#username=ask ++#password=ask + + ; You can override the common channel settings for each session type + #channel.rdpdr=true diff --git a/xrdp.spec b/xrdp.spec index 01e97a9..412c793 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -11,6 +11,7 @@ Source1: xrdp-sesman.pamd Source2: xrdp.sysconfig Source3: xrdp.logrotate Patch0: xrdp-0.9.1-sesman.patch +Patch1: xrdp-0.9.1-xrdp-ini.patch BuildRequires: autoconf BuildRequires: automake @@ -41,30 +42,7 @@ of RDP clients, including FreeRDP and Microsoft RDP client. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .sesman - -# never hardcode rpaths -# %{__sed} -i -e 's/^\(AM_CONDITIONAL(GOT_PREFIX,\).*$/\1 false)/' configure.ac - -# remove unused modules from xrdp login combobox -# %{__sed} -i -e '/\[xrdp1\]/,$d' xrdp/xrdp.ini - -echo " -[xrdp1] -name=sesman-Xvnc -lib=libvnc.so -username=ask -password=ask -ip=127.0.0.1 -port=-1 -delay_ms=2000 -" >> xrdp/xrdp.ini - -#Low is 40 bit key and everything from client to server is encrypted. -#Medium is 40 bit key, everything both ways is encrypted. -#High is 128 bit key everything both ways is encrypted. - -# increase encryption to 128 bit's -%{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini +%patch1 -p1 -b .xrdp-ini # create 'bash -l' based startwm, to pick up PATH etc. echo '#!/bin/bash -l