version 0.8.0.r485.gf49e205-1

3 files changed, 27 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 529d7d77f7bd..0e47dd096fcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Dec  4 13:30:56 UTC 2015
 pkgbase = xrdp-git
 	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.8.0.r464.gc0ef543
+	pkgver = 0.8.0.r485.gf49e205
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/neutrinolabs/xrdp
@@ -23,7 +25,7 @@ pkgbase = xrdp-git
 	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git
 	source = arch-config.diff
 	md5sums = SKIP
-	md5sums = b27f96f733825fed0d589a377a717dce
+	md5sums = 1c1fa55fc542a45865ada72b91aa2c46
 
 pkgname = xrdp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d0399cf956e2..1ad73db02d9f 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.r464.gc0ef543
+pkgver=0.8.0.r485.gf49e205
 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'
-         'b27f96f733825fed0d589a377a717dce')
+         '1c1fa55fc542a45865ada72b91aa2c46')
 
 pkgver() {
   cd $pkgname
diff --git a/arch-config.diff b/arch-config.diff
index dee4a2165570..067928d53fd2 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-22 16:01:32.000000000 -0600
-+++ src/xrdp-git/instfiles/pam.d/xrdp-sesman	2015-07-22 16:01:35.000000000 -0600
+--- src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig	2015-12-04 06:23:08.000000000 -0700
++++ src/xrdp-git/instfiles/pam.d/xrdp-sesman	2015-12-04 06:23:12.000000000 -0700
 @@ -1,5 +1,5 @@
  #%PAM-1.0
 -@include common-auth
@@ -12,14 +12,15 @@ 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-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-
+--- src/xrdp-git/instfiles/xrdp.service.orig	2015-12-04 06:23:12.000000000 -0700
++++ src/xrdp-git/instfiles/xrdp.service	2015-12-04 06:28:25.000000000 -0700
+@@ -6,10 +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 --nodaemon
+-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
@@ -27,24 +28,24 @@ diff -up src/xrdp-git/instfiles/xrdp.service.orig src/xrdp-git/instfiles/xrdp.se
  [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-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
+--- src/xrdp-git/instfiles/xrdp-sesman.service.orig	2015-12-04 06:23:12.000000000 -0700
++++ src/xrdp-git/instfiles/xrdp-sesman.service	2015-12-04 06:28:19.000000000 -0700
+@@ -7,10 +7,8 @@ BindTo=xrdp.service
  [Service]
  Type=forking
  PIDFile=/var/run/xrdp-sesman.pid
--EnvironmentFile=/etc/sysconfig/xrdp
+-EnvironmentFile=-/etc/sysconfig/xrdp
+-EnvironmentFile=-/etc/default/xrdp
 -ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
 -ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
-+EnvironmentFile=/etc/xrdp/xrdp.ini
-+ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS
-+ExecStop=/usr/bin/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-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
---- 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
+--- src/xrdp-git/instfiles/xrdp.sh.orig	2015-12-04 06:23:08.000000000 -0700
++++ src/xrdp-git/instfiles/xrdp.sh	2015-12-04 06:23:12.000000000 -0700
 @@ -17,7 +17,7 @@
  # Description: starts xrdp
  ### END INIT INFO
@@ -55,8 +56,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-22 16:01:33.000000000 -0600
-+++ src/xrdp-git/sesman/startwm.sh	2015-07-22 16:01:35.000000000 -0600
+--- src/xrdp-git/sesman/startwm.sh.orig	2015-12-04 06:23:09.000000000 -0700
++++ src/xrdp-git/sesman/startwm.sh	2015-12-04 06:23:12.000000000 -0700
 @@ -8,6 +8,17 @@ wm_start()
      export LANG LANGUAGE
    fi
@@ -76,8 +77,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-22 16:01:35.000000000 -0600
-+++ src/xrdp-git/xrdp/xrdp.ini	2015-07-22 16:01:35.000000000 -0600
+--- src/xrdp-git/xrdp/xrdp.ini.orig	2015-12-04 06:23:11.000000000 -0700
++++ src/xrdp-git/xrdp/xrdp.ini	2015-12-04 06:23:12.000000000 -0700
 @@ -51,7 +51,7 @@ grey=dedede
  # require_credentials=yes