Restore sesman patch, one part of it is still needed
If bash is run as /bin/sh, it may choke on bashisms from the user initialization files.
This commit is contained in:
parent
5c6b1d1cf9
commit
0b31773f88
@ -1,52 +0,0 @@
|
|||||||
diff -ruN xrdp-0.9.0-vanilla/sesman/sesman.ini xrdp-0.9.0/sesman/sesman.ini
|
|
||||||
--- xrdp-0.9.0-vanilla/sesman/sesman.ini 2015-07-15 07:17:49.000000000 +1000
|
|
||||||
+++ xrdp-0.9.0/sesman/sesman.ini 2015-07-17 10:25:13.449024694 +1000
|
|
||||||
@@ -3,7 +3,7 @@
|
|
||||||
ListenPort=3350
|
|
||||||
EnableUserWindowManager=1
|
|
||||||
UserWindowManager=startwm.sh
|
|
||||||
-DefaultWindowManager=startwm.sh
|
|
||||||
+DefaultWindowManager=startwm-bash.sh
|
|
||||||
|
|
||||||
[Security]
|
|
||||||
AllowRootLogin=1
|
|
||||||
@@ -64,19 +64,17 @@
|
|
||||||
|
|
||||||
[X11rdp]
|
|
||||||
param1=-bs
|
|
||||||
-param2=-ac
|
|
||||||
-param3=-nolisten
|
|
||||||
-param4=tcp
|
|
||||||
-param5=-uds
|
|
||||||
+param2=-nolisten
|
|
||||||
+param3=tcp
|
|
||||||
+param4=-uds
|
|
||||||
|
|
||||||
[Xvnc]
|
|
||||||
param1=-bs
|
|
||||||
-param2=-ac
|
|
||||||
-param3=-nolisten
|
|
||||||
-param4=tcp
|
|
||||||
-param5=-localhost
|
|
||||||
-param6=-dpi
|
|
||||||
-param7=96
|
|
||||||
+param2=-nolisten
|
|
||||||
+param3=tcp
|
|
||||||
+param4=-localhost
|
|
||||||
+param5=-dpi
|
|
||||||
+param6=96
|
|
||||||
|
|
||||||
[Xorg]
|
|
||||||
param1=-config
|
|
||||||
@@ -84,9 +82,8 @@
|
|
||||||
param3=-logfile
|
|
||||||
param4=/dev/null
|
|
||||||
param5=-noreset
|
|
||||||
-param6=-ac
|
|
||||||
-param7=-nolisten
|
|
||||||
-param8=tcp
|
|
||||||
+param6=-nolisten
|
|
||||||
+param7=tcp
|
|
||||||
|
|
||||||
[Chansrv]
|
|
||||||
# drive redirection, defaults to xrdp_client if not set
|
|
12
xrdp-0.9.1-sesman.patch
Normal file
12
xrdp-0.9.1-sesman.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini
|
||||||
|
--- xrdp-0.9.1/sesman/sesman.ini 2016-12-22 09:02:47.000000000 -0800
|
||||||
|
+++ xrdp-0.9.1.sesman/sesman/sesman.ini 2016-12-26 00:59:43.698228315 -0800
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
ListenPort=3350
|
||||||
|
EnableUserWindowManager=true
|
||||||
|
UserWindowManager=startwm.sh
|
||||||
|
-DefaultWindowManager=startwm.sh
|
||||||
|
+DefaultWindowManager=startwm-bash.sh
|
||||||
|
|
||||||
|
[Security]
|
||||||
|
AllowRootLogin=true
|
@ -10,6 +10,7 @@ Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xr
|
|||||||
Source1: xrdp-sesman.pamd
|
Source1: xrdp-sesman.pamd
|
||||||
Source2: xrdp.sysconfig
|
Source2: xrdp.sysconfig
|
||||||
Source3: xrdp.logrotate
|
Source3: xrdp.logrotate
|
||||||
|
Patch0: xrdp-0.9.1-sesman.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -40,6 +41,7 @@ terminal server / remote desktop clients.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
|
%patch0 -p1 -b .sesman
|
||||||
|
|
||||||
# never hardcode rpaths
|
# never hardcode rpaths
|
||||||
# %{__sed} -i -e 's/^\(AM_CONDITIONAL(GOT_PREFIX,\).*$/\1 false)/' configure.ac
|
# %{__sed} -i -e 's/^\(AM_CONDITIONAL(GOT_PREFIX,\).*$/\1 false)/' configure.ac
|
||||||
|
Loading…
Reference in New Issue
Block a user