version 0.9.1.r16.gedd8d5e6-1

1 files changed, 47 insertions, 48 deletions

diff --git a/arch-config.diff b/arch-config.diff
index d8957f065504..d55120226eb9 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,23 +1,50 @@
-diff -upr xrdp-git/instfiles/pam.d/xrdp-sesman xrdp-git-new/instfiles/pam.d/xrdp-sesman
---- xrdp-git/instfiles/pam.d/xrdp-sesman	2015-04-24 16:38:02.096121088 -0700
-+++ xrdp-git-new/instfiles/pam.d/xrdp-sesman	2015-04-24 16:44:57.272805802 -0700
-@@ -1,5 +1,9 @@
- #%PAM-1.0
--@include common-auth
--@include common-account
--@include common-session
--@include common-password
-+#@include common-auth
-+#@include common-account
-+#@include common-session
-+#@include common-password
-+auth include system-auth
-+account include system-auth
-+password include system-auth
-+session include system-auth
-diff -upr xrdp-git/sesman/startwm.sh xrdp-git-new/sesman/startwm.sh
---- xrdp-git/sesman/startwm.sh	2015-04-24 16:38:02.116121089 -0700
-+++ xrdp-git-new/sesman/startwm.sh	2015-04-24 16:43:36.872802307 -0700
+diff -up src/xrdp-devel-git/instfiles/xrdp.service.orig src/xrdp-devel-git/instfiles/xrdp.service
+--- src/xrdp-devel-git/instfiles/xrdp.service.orig	2017-01-04 17:08:45.000000000 -0700
++++ src/xrdp-devel-git/instfiles/xrdp.service	2017-01-04 17:08:48.000000000 -0700
+@@ -6,10 +6,8 @@ After=syslog.target network.target xrdp-
+ [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
++ExecStart=/usr/bin/xrdp
++ExecStop=/usr/bin/xrdp --kill
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.orig src/xrdp-devel-git/instfiles/xrdp-sesman.service
+--- src/xrdp-devel-git/instfiles/xrdp-sesman.service.orig	2017-01-04 17:08:45.000000000 -0700
++++ src/xrdp-devel-git/instfiles/xrdp-sesman.service	2017-01-04 17:08:48.000000000 -0700
+@@ -7,10 +7,8 @@ BindTo=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
++ExecStart=/usr/bin/xrdp-sesman
++ExecStop=/usr/bin/xrdp-sesman --kill
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff -up src/xrdp-devel-git/instfiles/xrdp.sh.orig src/xrdp-devel-git/instfiles/xrdp.sh
+--- src/xrdp-devel-git/instfiles/xrdp.sh.orig	2017-01-04 17:08:45.000000000 -0700
++++ src/xrdp-devel-git/instfiles/xrdp.sh	2017-01-04 17:10:02.000000000 -0700
+@@ -17,7 +17,7 @@
+ # Description: starts xrdp
+ ### END INIT INFO
+ 
+-SBINDIR=/usr/local/sbin
++SBINDIR=/usr/bin
+ LOG=/dev/null
+ CFGDIR=/etc/xrdp
+ 
+diff -up src/xrdp-devel-git/sesman/startwm.sh.orig src/xrdp-devel-git/sesman/startwm.sh
+--- src/xrdp-devel-git/sesman/startwm.sh.orig	2017-01-04 17:08:46.000000000 -0700
++++ src/xrdp-devel-git/sesman/startwm.sh	2017-01-04 17:08:48.000000000 -0700
 @@ -8,6 +8,17 @@ wm_start()
      export LANG LANGUAGE
    fi
@@ -36,31 +63,3 @@ diff -upr xrdp-git/sesman/startwm.sh xrdp-git-new/sesman/startwm.sh
    # debian
    if [ -r /etc/X11/Xsession ]; then
      . /etc/X11/Xsession
-diff -upr xrdp-git/xrdp/xrdp.ini xrdp-git-new/xrdp/xrdp.ini
---- xrdp-git/xrdp/xrdp.ini	2015-04-24 16:38:02.152787757 -0700
-+++ xrdp-git-new/xrdp/xrdp.ini	2015-04-24 16:46:19.786142723 -0700
-@@ -51,7 +51,7 @@ grey=dedede
- # require_credentials=yes
-
- # set a default entry for autorun if the client send login and pass directly
--autorun=xrdp1
-+autorun=xrdp2
-
- bulk_compression=yes
-
-@@ -139,6 +139,15 @@ tcutils=true
- # for debugging xrdp, add following line to section xrdp1
- # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210
-
-+[xrdp0]
-+name=sesman-Xvnc-delay
-+lib=libvnc.so
-+username=ask
-+password=ask
-+ip=127.0.0.1
-+port=-1
-+delay_ms=2000
-+
- [xrdp1]
- name=sesman-X11rdp
- lib=libxup.so