Version bump, includes Gentoo-specific fixes for Xsession on new installs, bug #506764. Also fixes /etc/sudoers.d permissions, bug #504906

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 93 insertions, 12 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 44ca6f5d33c8..956a9de6c5e8 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.41 2014/03/03 16:40:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.42 2014/04/07 15:03:14 voyageur Exp $
+
+*x2goserver-4.0.1.15 (07 Apr 2014)
+
+  07 Apr 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-4.0.1.15.ebuild:
+  Version bump, includes Gentoo-specific fixes for Xsession on new installs,
+  bug #506764. Also fixes /etc/sudoers.d permissions, bug #504906
 
   03 Mar 2014; Bernard Cafarelli <voyageur@gentoo.org>
   -x2goserver-4.0.1.6-r1.ebuild, -x2goserver-4.0.1.8.ebuild:
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 6438c7d1be1b..84fb3fa956da 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX x2gocleansessions.service 198 SHA256 e06420fa5fe526c9ff616af1976840136ef174b94e8876fa6a2d32ee1d111ab8 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5 WHIRLPOOL c9485457a052188ef83aa7b15d4df69c2584ddc023248b7b7557b2d61a310f23cbae60a265e1e74c8be4a6d3a3cb54212452ff6c3905bb07e9e93389057cda71
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e
 DIST x2goserver-4.0.1.13.tar.gz 79103 SHA256 c3e78206d564a16d67ffb7702e4d59fbcd1dff36a6daa37978eacc5bfe345656 SHA512 322c4158e62ba02eb67e79ae3e56962f7b15c5905555a0efccbdec1b6d7b3b84fa3ec8f6fad9056a02180dd2355c51a579d38e44216f282110b3cf8d73ef621d WHIRLPOOL 11248906d89f818a4672e5e924834e9b075a20ef1c551ce11b430417de283dcdd5da55b5e05366738b425fee17b972d6c02588981cff737e404cc78e9734beea
+DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0
 EBUILD x2goserver-4.0.1.12.ebuild 2401 SHA256 72f30f8aa6e75f0123374b1423eaf740b070067c91b94343cea23fb4b4a717fa SHA512 fcbd5acb503338f8e6ba83c764f1eeb3d4548fbf8918d7e8378e60f88b17879fba032ef99d732ea94592a67c18722fe405bc8a082c872102dfb5d335121d137d WHIRLPOOL 5c1d0cacd27f9a41b873022adc54b6e7b98c1cee58372587d05aa474f5e37b5108bfec7954fd0973ee4fcab16bb94273e42f0f113fbb46affa17660930352394
 EBUILD x2goserver-4.0.1.13.ebuild 2401 SHA256 bd5d519da46395a37565748d21df7c03c51359bb8ebae39405ba3c93c846bbf2 SHA512 5fc7122f6f8425202e70c320dee39b02fd3512caf94825b3a4664e87bdc62a336a8fe42367d34b05f4c6e157026d5bda773d2e373e8d786aa23128cb965da329 WHIRLPOOL add6e9ff97bdcfa29c68d757f63ba946b69d11f469bd7073b0d1c5e234da3cbd487f000b1c90c61eb370b8152f6e1bf1985d29a69d2ad343a10aea4acfeafd8a
-MISC ChangeLog 8023 SHA256 40fed26af8873783bb07c7efd6c55b9ac861b6ae70fe3ddc01b1d2c7dc2c5587 SHA512 c7753918514c6ec1e7db6c3f69d5e04843f271497032077562ab48f43da5fd38bfe483b51393dd1d609d678d57663ccc882627276ded39da96a88a3d2baef53b WHIRLPOOL eaa1d00d329bdbcadc1f0fb4a6726cfc85a8e95aee3fd9473dee785965292c32c3f74e4f5b46f2feb285c3b73ee5dc68862e968c5439351e5fef67917ebbc5ea
+EBUILD x2goserver-4.0.1.15.ebuild 2459 SHA256 b586530ba9ebf001d7dccd95501b7ee70dcd10ab82232feb2b8b701cabd2f316 SHA512 0fd27c3df57bd676f0f69f92f8aeb046715f762a1bd24a20b8c88513613594cf208902411561bb1146af2280712f3ae608e8dcfdd2fab44667744a60abe0e5de WHIRLPOOL 1dd163aa7aaf71f887fcb66bb7849501f6543ce368162cdaa0442f2576f1c14ded51cd974e0bfc4c1cdf38c2870f7397a09b9414bbe0237057943e8cc6d2cd04
+MISC ChangeLog 8289 SHA256 b272cfe786f29db52a1d2e3fa98ebe9bec89ee760388cac56071ae85bf291132 SHA512 b412e77038b8d034d105d8383a17a824e4c0908318bdb50afb0bfeef2ee2a3fb88cca0291b55e7489681f1741e16970159dae41611ee24bbbe5dbf36727a0d5a WHIRLPOOL 229c8fcbdbc9ed2314f90980ba2c79c729639405edbab128cd03c927000270004ca930ff02f98b62ec45d37efe20e63dccdd137712c0a0e59367d6bf2723595a
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlMUsKEACgkQFYEBGcdFJfLwggD/ap9EWCZyKUQ1aBVGohBlfoTG
-2MS6HooEFJkFJHD4MH4A/15r6et7+sCj90cQax2sXbqsIBybjuER4zDKo7Wl97bw
-=ptWA
------END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
new file mode 100644
index 000000000000..f50a51c13f2e
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild,v 1.1 2014/04/07 15:03:14 voyageur Exp $
+
+EAPI=4
+inherit eutils 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="+doc +fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+# Requires man2html, only provided by sys-apps/man
+DEPEND="doc? ( sys-apps/man )"
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-ReadBackwards
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	net-misc/nx
+	net-misc/openssh
+	x11-apps/xauth
+	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() {
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build if needed
+	if ! use doc; then
+		sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	fi
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+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/*
+	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"
+}