version 1:0.8.0.r439.gdbf959f

3 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 582fef628e00..af8d5ecf410a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp-git
 	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.8.0.r432.g2ed8108
+	pkgver = 0.8.0.r439.gdbf959f
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/neutrinolabs/xrdp
@@ -23,7 +23,7 @@ pkgbase = xrdp-git
 	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git
 	source = arch-config.diff
 	md5sums = SKIP
-	md5sums = d08f0984fc543e2478eaa79337726da7
+	md5sums = b27f96f733825fed0d589a377a717dce
 
 pkgname = xrdp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5e78c5ccb122..966c4ca601b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Tau Tsao <realturner at gmail.com>
 pkgname=xrdp-git
-pkgver=0.8.0.r432.g2ed8108
+pkgver=0.8.0.r439.gdbf959f
 pkgrel=1
 epoch=1
 pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
@@ -19,7 +19,7 @@ install=xrdp-git.install
 source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git"
         "arch-config.diff")
 md5sums=('SKIP'
-         'd08f0984fc543e2478eaa79337726da7')
+         'b27f96f733825fed0d589a377a717dce')
 
 pkgver() {
   cd $pkgname
diff --git a/arch-config.diff b/arch-config.diff
index 9be6651d65d4..dee4a2165570 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,6 +1,6 @@
 diff -up src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig src/xrdp-git/instfiles/pam.d/xrdp-sesman
---- src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig	2015-07-13 18:05:56.000000000 -0600
-+++ src/xrdp-git/instfiles/pam.d/xrdp-sesman	2015-07-13 18:06:11.000000000 -0600
+--- src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig	2015-07-22 16:01:32.000000000 -0600
++++ src/xrdp-git/instfiles/pam.d/xrdp-sesman	2015-07-22 16:01:35.000000000 -0600
 @@ -1,5 +1,5 @@
  #%PAM-1.0
 -@include common-auth
@@ -12,25 +12,24 @@ diff -up src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig src/xrdp-git/instfiles/pa
 +password include system-auth
 +session include system-auth
 diff -up src/xrdp-git/instfiles/xrdp.service.orig src/xrdp-git/instfiles/xrdp.service
---- src/xrdp-git/instfiles/xrdp.service.orig	2015-07-13 18:04:27.000000000 -0600
-+++ src/xrdp-git/instfiles/xrdp.service	2015-07-13 18:04:30.000000000 -0600
-@@ -6,9 +6,9 @@ After=syslog.target network.target xrdp-
+--- src/xrdp-git/instfiles/xrdp.service.orig	2015-07-22 16:01:32.000000000 -0600
++++ src/xrdp-git/instfiles/xrdp.service	2015-07-22 16:10:39.000000000 -0600
+@@ -6,9 +6,8 @@ After=syslog.target network.target xrdp-
  [Service]
  Type=forking
  PIDFile=/var/run/xrdp.pid
 -EnvironmentFile=/etc/sysconfig/xrdp
--ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
+-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
 -ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
-+EnvironmentFile=/etc/xrdp/xrdp.ini
-+ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
-+ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
++ExecStart=/usr/bin/xrdp
++ExecStop=/usr/bin/xrdp --kill
  
  [Install]
  WantedBy=multi-user.target
 diff -up src/xrdp-git/instfiles/xrdp-sesman.service.orig src/xrdp-git/instfiles/xrdp-sesman.service
---- src/xrdp-git/instfiles/xrdp-sesman.service.orig	2015-07-13 18:04:27.000000000 -0600
-+++ src/xrdp-git/instfiles/xrdp-sesman.service	2015-07-13 18:04:30.000000000 -0600
-@@ -6,9 +6,9 @@ StopWhenUnneeded=true
+--- src/xrdp-git/instfiles/xrdp-sesman.service.orig	2015-07-22 16:01:32.000000000 -0600
++++ src/xrdp-git/instfiles/xrdp-sesman.service	2015-07-22 16:01:35.000000000 -0600
+@@ -7,9 +7,9 @@ BindTo=xrdp.service
  [Service]
  Type=forking
  PIDFile=/var/run/xrdp-sesman.pid
@@ -44,8 +43,8 @@ diff -up src/xrdp-git/instfiles/xrdp-sesman.service.orig src/xrdp-git/instfiles/
  [Install]
  WantedBy=multi-user.target
 diff -up src/xrdp-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
---- src/xrdp-git/instfiles/xrdp.sh.orig	2015-07-13 18:04:27.000000000 -0600
-+++ src/xrdp-git/instfiles/xrdp.sh	2015-07-13 18:04:30.000000000 -0600
+--- src/xrdp-git/instfiles/xrdp.sh.orig	2015-07-22 16:01:32.000000000 -0600
++++ src/xrdp-git/instfiles/xrdp.sh	2015-07-22 16:01:35.000000000 -0600
 @@ -17,7 +17,7 @@
  # Description: starts xrdp
  ### END INIT INFO
@@ -56,8 +55,8 @@ diff -up src/xrdp-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
  CFGDIR=/etc/xrdp
  
 diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
---- src/xrdp-git/sesman/startwm.sh.orig	2015-07-13 18:09:26.000000000 -0600
-+++ src/xrdp-git/sesman/startwm.sh	2015-07-13 18:09:45.000000000 -0600
+--- src/xrdp-git/sesman/startwm.sh.orig	2015-07-22 16:01:33.000000000 -0600
++++ src/xrdp-git/sesman/startwm.sh	2015-07-22 16:01:35.000000000 -0600
 @@ -8,6 +8,17 @@ wm_start()
      export LANG LANGUAGE
    fi
@@ -77,8 +76,8 @@ diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
    if [ -r /etc/X11/Xsession ]; then
      . /etc/X11/Xsession
 diff -up src/xrdp-git/xrdp/xrdp.ini.orig src/xrdp-git/xrdp/xrdp.ini
---- src/xrdp-git/xrdp/xrdp.ini.orig	2015-07-13 18:12:33.000000000 -0600
-+++ src/xrdp-git/xrdp/xrdp.ini	2015-07-13 18:12:42.000000000 -0600
+--- src/xrdp-git/xrdp/xrdp.ini.orig	2015-07-22 16:01:35.000000000 -0600
++++ src/xrdp-git/xrdp/xrdp.ini	2015-07-22 16:01:35.000000000 -0600
 @@ -51,7 +51,7 @@ grey=dedede
  # require_credentials=yes