Fix install paths in init.d. Set proper --localstatedir. Both reported by Jan Psota.

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 17 insertions, 8 deletions

diff --git a/net-misc/xrdp/ChangeLog b/net-misc/xrdp/ChangeLog
index 218992d81df4..23d6ebfeb915 100644
--- a/net-misc/xrdp/ChangeLog
+++ b/net-misc/xrdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/xrdp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.9 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.10 2014/10/23 10:23:41 mgorny Exp $
+
+  23 Oct 2014; Michał Górny <mgorny@gentoo.org> files/xrdp-initd,
+  xrdp-0.6.1.ebuild, xrdp-0.8.0.ebuild:
+  Fix install paths in init.d. Set proper --localstatedir. Both reported by Jan
+  Psota.
 
 *xrdp-0.8.0 (23 Oct 2014)
 *xrdp-0.6.1 (23 Oct 2014)
diff --git a/net-misc/xrdp/files/xrdp-initd b/net-misc/xrdp/files/xrdp-initd
index a6fbce01896b..15a0a4ebfce6 100644
--- a/net-misc/xrdp/files/xrdp-initd
+++ b/net-misc/xrdp/files/xrdp-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/files/xrdp-initd,v 1.3 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/files/xrdp-initd,v 1.4 2014/10/23 10:23:41 mgorny Exp $
 
 depend() {
 	use net logger
@@ -9,11 +9,11 @@ depend() {
 
 start() {
 	ebegin "Starting X remote desktop daemon"
-	start-stop-daemon --start --pidfile /var/run/xrdp.pid --exec /usr/bin/xrdp > /dev/null
+	start-stop-daemon --start --pidfile /var/run/xrdp.pid --exec /usr/sbin/xrdp > /dev/null
 	eend $? || return $?
 
 	ebegin "Starting remote desktop session manager"
-	start-stop-daemon --start --pidfile /var/run/xrdp-sesman.pid --exec /usr/bin/xrdp-sesman > /dev/null
+	start-stop-daemon --start --pidfile /var/run/xrdp-sesman.pid --exec /usr/sbin/xrdp-sesman > /dev/null
 	eend $?
 }
 
diff --git a/net-misc/xrdp/xrdp-0.6.1.ebuild b/net-misc/xrdp/xrdp-0.6.1.ebuild
index 2a4aea071f63..18a93877efe7 100644
--- a/net-misc/xrdp/xrdp-0.6.1.ebuild
+++ b/net-misc/xrdp/xrdp-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.1 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.2 2014/10/23 10:23:41 mgorny Exp $
 
 EAPI=5
 
@@ -41,7 +41,9 @@ src_configure() {
 		&& ewarn "Both kerberos & pam auth enabled, kerberos will take precedence."
 
 	local myconf=(
-		# configure.ac is completed flawed
+		# warning: configure.ac is completed flawed
+
+		--localstatedir="${EPREFIX}"/var
 
 		# -- authentication backends --
 		# kerberos is inside !SESMAN_NOPAM conditional for no reason
diff --git a/net-misc/xrdp/xrdp-0.8.0.ebuild b/net-misc/xrdp/xrdp-0.8.0.ebuild
index 9ebcc74a70ba..b2ca2c54f007 100644
--- a/net-misc/xrdp/xrdp-0.8.0.ebuild
+++ b/net-misc/xrdp/xrdp-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.1 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.2 2014/10/23 10:23:41 mgorny Exp $
 
 EAPI=5
 
@@ -59,7 +59,9 @@ src_configure() {
 		&& ewarn "Both kerberos & pam auth enabled, kerberos will take precedence."
 
 	local myconf=(
-		# configure.ac is completed flawed
+		# warning: configure.ac is completed flawed
+
+		--localstatedir="${EPREFIX}"/var
 
 		# -- authentication backends --
 		# kerberos is inside !SESMAN_NOPAM conditional for no reason