version 0.8.0-4

4 files changed, 54 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d81c929587c1..7f3837b253bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Dec  4 13:42:46 UTC 2015
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
 	pkgver = 0.8.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://xrdp.sourceforge.net/
 	install = xrdp.install
 	arch = i686
@@ -18,7 +20,7 @@ pkgbase = xrdp
 	source = https://github.com/neutrinolabs/xrdp/archive/v0.8.0.tar.gz
 	source = fixups.patch
 	md5sums = 2b0c3affc65ee77ad251514c62896757
-	md5sums = 07f35f8700cd9384f5d13117fd3a4e04
+	md5sums = e6985363c6f13e22272afdc6a7dddc96
 
 pkgname = xrdp
 
diff --git a/PKGBUILD b/PKGBUILD
index 657a62748274..c3952db4214f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Mathias R. <pu154r@overlinux.org>
 pkgname=xrdp
 pkgver=0.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source remote desktop protocol (RDP) server"
 url="http://xrdp.sourceforge.net/"
 arch=('i686' 'x86_64' 'armv6h')
@@ -17,20 +17,11 @@ install=xrdp.install
 source=(https://github.com/neutrinolabs/${pkgname}/archive/v${pkgver}.tar.gz
 	fixups.patch)
 md5sums=('2b0c3affc65ee77ad251514c62896757'
-         '07f35f8700cd9384f5d13117fd3a4e04')
+         'e6985363c6f13e22272afdc6a7dddc96')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-
-  sed -i 's|/etc/sysconfig/xrdp|/etc/xrdp/xrdp.ini|' instfiles/xrdp.service
-  sed -i 's|/etc/sysconfig/xrdp|/etc/xrdp/xrdp.ini|' instfiles/xrdp-sesman.service
-
-  sed -i 's|/usr/local/sbin|/usr/bin|' instfiles/xrdp.sh
-  sed -i 's|/usr/sbin|/usr/bin|' instfiles/xrdp.service
-  sed -i 's|/usr/sbin|/usr/bin|' instfiles/xrdp-sesman.service
-
   patch -p2 -b -z .orig <../fixups.patch
-
   ./bootstrap
 }
 
diff --git a/fixups.patch b/fixups.patch
index b555486c74d6..9b76682a8d90 100644
--- a/fixups.patch
+++ b/fixups.patch
@@ -1,6 +1,6 @@
 diff -up src/xrdp-0.8.0/instfiles/Makefile.am.orig src/xrdp-0.8.0/instfiles/Makefile.am
 --- src/xrdp-0.8.0/instfiles/Makefile.am.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/instfiles/Makefile.am	2015-05-26 17:22:39.000000000 -0600
++++ src/xrdp-0.8.0/instfiles/Makefile.am	2015-12-04 06:39:06.000000000 -0700
 @@ -28,5 +28,7 @@ startscript_DATA = \
  # must be tab below
  install-data-hook:
@@ -13,7 +13,7 @@ diff -up src/xrdp-0.8.0/instfiles/Makefile.am.orig src/xrdp-0.8.0/instfiles/Make
 +	fi
 diff -up src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman
 --- src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman	2015-05-26 17:22:39.000000000 -0600
++++ src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman	2015-12-04 06:39:06.000000000 -0700
 @@ -1,5 +1,9 @@
  #%PAM-1.0
 -@include common-auth
@@ -28,9 +28,51 @@ diff -up src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig src/xrdp-0.8.0/instfile
 +account include system-auth
 +password include system-auth
 +session include system-auth
+diff -up src/xrdp-0.8.0/instfiles/xrdp.service.orig src/xrdp-0.8.0/instfiles/xrdp.service
+--- src/xrdp-0.8.0/instfiles/xrdp.service.orig	2015-12-04 06:39:06.000000000 -0700
++++ src/xrdp-0.8.0/instfiles/xrdp.service	2015-12-04 06:40:54.000000000 -0700
+@@ -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
+-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-0.8.0/instfiles/xrdp-sesman.service.orig src/xrdp-0.8.0/instfiles/xrdp-sesman.service
+--- src/xrdp-0.8.0/instfiles/xrdp-sesman.service.orig	2015-12-04 06:39:06.000000000 -0700
++++ src/xrdp-0.8.0/instfiles/xrdp-sesman.service	2015-12-04 06:41:09.000000000 -0700
+@@ -6,9 +6,8 @@ StopWhenUnneeded=true
+ [Service]
+ Type=forking
+ PIDFile=/var/run/xrdp-sesman.pid
+-EnvironmentFile=/etc/sysconfig/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-0.8.0/instfiles/xrdp.sh.orig src/xrdp-0.8.0/instfiles/xrdp.sh
+--- src/xrdp-0.8.0/instfiles/xrdp.sh.orig	2015-12-04 06:39:06.000000000 -0700
++++ src/xrdp-0.8.0/instfiles/xrdp.sh	2015-12-04 06:39:06.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-0.8.0/sesman/startwm.sh.orig src/xrdp-0.8.0/sesman/startwm.sh
 --- src/xrdp-0.8.0/sesman/startwm.sh.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/sesman/startwm.sh	2015-05-26 17:22:39.000000000 -0600
++++ src/xrdp-0.8.0/sesman/startwm.sh	2015-12-04 06:39:06.000000000 -0700
 @@ -8,6 +8,17 @@ wm_start()
      export LANG LANGUAGE
    fi
@@ -51,7 +93,7 @@ diff -up src/xrdp-0.8.0/sesman/startwm.sh.orig src/xrdp-0.8.0/sesman/startwm.sh
      . /etc/X11/Xsession
 diff -up src/xrdp-0.8.0/xrdp/xrdp.ini.orig src/xrdp-0.8.0/xrdp/xrdp.ini
 --- src/xrdp-0.8.0/xrdp/xrdp.ini.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/xrdp/xrdp.ini	2015-05-26 17:25:17.000000000 -0600
++++ src/xrdp-0.8.0/xrdp/xrdp.ini	2015-12-04 06:39:06.000000000 -0700
 @@ -36,7 +36,7 @@ grey=dedede
  #red=ff0000
  #green=00ff00
diff --git a/xrdp-sesman.service b/xrdp-sesman.service
index 8222069b906a..c33376ecc337 100644
--- a/xrdp-sesman.service
+++ b/xrdp-sesman.service
@@ -6,9 +6,8 @@ StopWhenUnneeded=true
 [Service]
 Type=forking
 PIDFile=/var/run/xrdp-sesman.pid
-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