commit: f38c944a6c204b782c471c702155bd57dfc663d3
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 12:31:14 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 12:31:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38c944a
net-misc/x2goserver: stricter dependency on sys-apps/iproute2
This fixes local desktop sharing,
thanks Uwe Sauter <uwe <AT> sauter-gechingen.de> in bug #572318
Bump EAPI
Fix pid file path in init script
Package-Manager: portage-2.2.27
net-misc/x2goserver/files/x2goserver.init | 4 +-
net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild | 88 +++++++++++++++++++++++
2 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/net-misc/x2goserver/files/x2goserver.init
b/net-misc/x2goserver/files/x2goserver.init
index a6b7a66..118c8e0 100644
--- a/net-misc/x2goserver/files/x2goserver.init
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -1,10 +1,10 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
DAEMON=/usr/sbin/x2gocleansessions
-PIDFILE=/var/run/x2goserver.pid
+PIDFILE=/run/x2goserver.pid
start() {
ebegin "Starting ${SVCNAME}"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild
b/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild
new file mode 100644
index 0000000..ecbadc0
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org";
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+ dev-perl/Config-Simple
+ dev-perl/File-BaseDir
+ dev-perl/File-ReadBackwards
+ dev-perl/File-Which
+ media-fonts/font-cursor-misc
+ media-fonts/font-misc-misc[nls]
+ >=net-misc/nx-3.5.0.25
+ net-misc/openssh
+ >=sys-apps/iproute2-4.3.0
+ x11-apps/xauth
+ x11-apps/xhost
+ x11-apps/xwininfo
+ fuse? ( sys-fs/sshfs-fuse )
+ postgres? ( dev-perl/DBD-Pg )
+ sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+ # Force the group creation, #479650
+ enewgroup x2gouser
+ enewgroup x2goprint
+ enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+ enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+ # Do not install Xresources symlink (#521126)
+ sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i
x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+ # Multilib clean
+ sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
"multilib sed failed"
+ # Skip man2html build
+ sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile
*/Makefile || die "man2html sed failed"
+ # Use nxagent directly
+ sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/"
x2goserver/bin/x2gostartagent || die "sed failed"
+
+ eapply_user
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+
+ fowners root:x2goprint /usr/bin/x2goprint
+ fperms 2755 /usr/bin/x2goprint
+ fperms 0750 /etc/sudoers.d
+ fperms 0440 /etc/sudoers.d/x2goserver
+ dosym /usr/share/applications /etc/x2go/applications
+
+ newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+ systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+ if use sqlite ; then
+ elog "To use sqlite and create the initial database, run:"
+ elog " # x2godbadmin --createdb"
+ fi
+ if use postgres ; then
+ elog "To use a PostgreSQL databse, more information is availabe
here:"
+ elog
"http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql";
+ fi
+
+ elog "For password authentication, you need to enable
PasswordAuthentication"
+ elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+ elog "An init script was installed for x2gocleansessions"
+}
