Version bump, fixes arbitrary code execution as uid x2gouser

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

3 files changed, 84 insertions, 6 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index 6bd0fd87529d..b7a9e641f16c 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.20 2013/03/21 13:55:35 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.21 2013/06/07 14:12:26 voyageur Exp $
+
+*x2goserver-4.0.0.2 (07 Jun 2013)
+
+  07 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-4.0.0.2.ebuild:
+  Version bump, fixes arbitrary code execution as uid x2gouser
 
   21 Mar 2013; Bernard Cafarelli <voyageur@gentoo.org>
   x2goserver-3.1.1.4-r1.ebuild, x2goserver-3.1.1.9.ebuild,
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 387aa8c67351..659077a9f7b9 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -7,15 +7,17 @@ AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79
 DIST x2goserver-3.1.1.4.tar.gz 64858 SHA256 17139f5c9b9d649ced0c9c6723cfaa1afdbfeb4001748ced9d05fa88848dceae SHA512 fd55a0a415fd9d0633f788783ba70ae8d5544283ab9f454e16c05249ea75eb141a4d40e7875048cd87610cb14654e04a986b22b460c6a3974bc0c491bcdf8b76 WHIRLPOOL 4040513461e6bd90c454791ba7c6c291e93ca7e0dd179eda1cb507174784c8746d8806416ad19c368271c31cda20fafabcac0f14c0e755db445da5e9f6ffda61
 DIST x2goserver-3.1.1.9.tar.gz 66239 SHA256 6903648c1cf7609a43dd56c216b8577d663f10286bb5573dfdee6a879bbe5524 SHA512 3eedd7f7bc5307e8f51f7bd30e6b2d573731c528d513fe45ddf58e09e603fa96dd062ea62c17dfc34bb787fa40639ff29321b2a9eef638032e6e6dd0f79fe5c9 WHIRLPOOL c2b33e8ed9b73ae2e1d75c5e4b7805e046ba752a982e657b2629d799aabdde0d2d501fdcec7c6fb19776c4e02d3b1cbc6bb80d905493b0eb9694ba9733374e80
 DIST x2goserver-4.0.0.0.tar.gz 67941 SHA256 32c7926edeecd8d9362711ba34f9795821e140bb8d10d056c4f4c2c98fb1778f SHA512 f951bfffb398a7ff9e2d59714a742d0c02180b8264a83292a88b10c7d08816c20f0d6ab2f3147717d0f6784153606814257cf5be7850bebb811340aafeaeb7db WHIRLPOOL 297e4d9c16551672d19393ec9f1fc6ba0416809337654e4bdc8b2387943e5aef742f54bb9e16ff6ee772dc347b1330eb5b6c702e4e55b28d2a9fcd82ee471383
+DIST x2goserver-4.0.0.2.tar.gz 68101 SHA256 e175a908f7a78ad797584a332aefcfce185d714a5f0d50245f8e77c8f0b85e1b SHA512 95d3148dd4a122f6d60ae7477130fae644a7c88c7555bc6dda20fe95479384e24344c7d87b6618cf6fe79b31ba05c21eb883b0390f78f6202fff8ead937dfaf1 WHIRLPOOL b0422cab05061751f24763393d9c7a320a61000531249383272216afcc1c05d8cd0c31f586453f25fd8c337ab935e8b47e54184db61cf701c91fe7000ff2df5f
 EBUILD x2goserver-3.1.1.4-r1.ebuild 2036 SHA256 da240b8cad95a4ee4f4ab5cab8ad60b67c3fe1784ad4b56ed813c1f900c23baf SHA512 ecabcaf4a3dbbe3b088f02ae0a387dde9fcdc4d731e7b37b51a1fe6f69007cafd1387ac8d4454bac1ce7d5292276a96da93e5d2603ac4eb6a269f8ab01cd0025 WHIRLPOOL a85a3f255858b3b3756c70a446b8ddd6422a37cbae11f346c5f0a1697800dce2c02675289908fd7f42c003907540c044930bc2385e45887261c988034dec402d
 EBUILD x2goserver-3.1.1.9.ebuild 2044 SHA256 15113ea875dda744c77dfcf6590fe9a3566e77f260a03869c1e97f0119dd2a31 SHA512 3759ef252fa40751695e1b00af306132ed3d20f3f9350c0d4a85e13bf5135e3260b54b98d2afc73c6fbf9c5512853d8994fae350c8a8a9e622f96637cbb30ce1 WHIRLPOOL 8122f9a75ebbee38220b9707de273a1205864d066a7d8306c3a74034c189c44469a97c04f00eacfdd7698eb5ef32272ef15036c518a9e0ed8db97f95bea3937a
 EBUILD x2goserver-4.0.0.0.ebuild 2050 SHA256 4b6c3c48f0ac61da1ca9f5e5e884eea30781246e769067f465717cc30140afca SHA512 c95622cd83ee166f0553f91fdd8f0abaebe3c765d25f661a3192baa2255db7af71f344350ad9a4e044dc783d7299b8051dd78aaef545d6ab8286e9799df984b0 WHIRLPOOL c9909c91e426f6138ef8efa317ea2a43348a865fb3b6d0b40b286e76b5cb4b8b81a8e236a681b2098017acd6369a3c4fd30f955e6eb4996809eccc4ee1fd8d8c
-MISC ChangeLog 4356 SHA256 4d4c0c0d0dc94d738df129478461bb597327a7fa695287ddff9fed0c430ad9b7 SHA512 932d0e0a666bde81487a0ac385bae683ca2cfd6f26a1419ef7cc886b126f2695a8a8cf15982efe9b97fcfc0fb4ef3099d28440340b40e5de5f9e43152f5d8183 WHIRLPOOL e81c667d8d5564129278970c678ef978e7d23dcf1b4b9c2fc4102f3668ecd3d2447cdb0bdecdf9d0cf78d16442f7ebd19b13ad14130f85090f173c2dc4d3db28
+EBUILD x2goserver-4.0.0.2.ebuild 2004 SHA256 abae596e6765673432f4769dc3713d4bec1dcd2f4f8b035b15926aee94737a90 SHA512 175739007c8416e678c34c87f568e490f1cf4cf222e1298a58869bc8c3652bb3504117914d0f602f3bc16f6efaf2e6af7f922055bcc035d6ff76efcf84cad438 WHIRLPOOL b0c0a84c1d7c0497170bd7eb9c564bf4cca993c01a6575998bb836024e215422db19ea8ca5a77bf66b7812e6ba7cca9c0fe5df3766366699b179076e45d80036
+MISC ChangeLog 4540 SHA256 8161c562721cae9b1796a87c68913a68410df9b51190da7f373f1c3137e5e225 SHA512 a82094428962d1f61b36aacc72de8c0d06993ad2355910f68958d94d434b2d89ae50a293324429f5e3cf5a02796cf2a3d23518bb37745ec2fbc70801cf0deec7 WHIRLPOOL a5a9a69428ef022653e7eb77931664270290d6e6af11e8d018c88924a9387cd08dc5c5f40fb920cd1d7dec708e821b1a78125a909495665dac5e9701143a52fd
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlFLEWgACgkQFYEBGcdFJfLB3AEAjPLvRkBqELiHUlhjvOHhAzxQ
-tQFuXflljGkH/ukN8t8A/1gzwT8eeTDKkE14LPAvESc4o6ZOIgBxA2BLEOJqZzuo
-=E/fA
+iF4EAREIAAYFAlGx6lAACgkQFYEBGcdFJfJTOAD/d/1ds1NG2r8+uHzKhgzSKvVF
+TniSU9LMsl6eUofoOcUBAJ6JMIuQiVMqI3RpfbDXf3lvEC6xZLeqnotuj1eQkMKs
+=o/bO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-4.0.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.0.0.2.ebuild
new file mode 100644
index 000000000000..cd7073d4bf59
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.0.2.ebuild,v 1.1 2013/06/07 14:12:26 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib 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 )"
+
+# Requires man2html, only provided by sys-apps/man
+DEPEND="sys-apps/man"
+RDEPEND="dev-perl/Config-Simple
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	net-misc/nx
+	virtual/ssh
+	x11-apps/xauth
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	enewuser x2gouser -1 -1 /var/lib/x2go
+	enewuser x2goprint -1 -1 /var/spool/x2goprint
+}
+
+src_prepare() {
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# 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
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+}
+
+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"
+}