From: Bernard Cafarelli Date: Thu, 29 Apr 2010 12:48:01 +0000 (+0000) Subject: Version bump from NX overlay, drop 2.x version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d7469c981ec8103cb5cb51af3c8ee591d3780f4;p=gentoo.git Version bump from NX overlay, drop 2.x version Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog index 7fdbdc4ff289..b8914fade3a5 100644 --- a/net-misc/x2goserver/ChangeLog +++ b/net-misc/x2goserver/ChangeLog @@ -1,14 +1,11 @@ # ChangeLog for net-misc/x2goserver -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.2 2009/12/05 09:11:32 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.3 2010/04/29 12:48:01 voyageur Exp $ - 05 Dec 2009; Samuli Suominen - x2goserver-2.0.1.19.ebuild: - Remove kde-base/kdelibs:3.5 support. +*x2goserver-3.0.1.5 (29 Apr 2010) -*x2goserver-2.0.1.19 (13 Mar 2009) - - 13 Mar 2009; Bernard Cafarelli - +files/x2goserver.init, +metadata.xml, +x2goserver-2.0.1.19.ebuild: - Initial portage commit, from the NX overlay + 29 Apr 2010; Bernard Cafarelli + +files/x2goserver-mountdirs_no_desktop_icon.patch, + +x2goserver-3.0.1.5.ebuild: + Version bump from NX overlay, drop 2.x version diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index a97031c8fb32..47aab6af20de 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -1,5 +1,8 @@ +AUX x2goserver-mountdirs_no_desktop_icon.patch 1676 RMD160 6e5b9fd22a491ae6a482b82bfca51870ca1b8e2b SHA1 b81ef59db5e0844450b5fc7e232a61d053a906db SHA256 1ddd1f6a724bb5ff35e59a72d2d307a7880a3a87f777007635e4c5032e2b2957 AUX x2goserver.init 598 RMD160 840240b74432c7dd17d70d18a2a5956083de18d6 SHA1 528dffc8c36c6999e2276b99d1dedfe86694114d SHA256 5c6bf12ef00353ff330afaf050a8d2cb8338d1593b1b5f5ecc8ba15102887500 DIST x2goserver_2.0.1-19_all.deb 14536 RMD160 9052af7fe76051d13dbda6b8ca4dd0192e88218a SHA1 5610b16b5529ea65bd19bfee7a7a9dfc8079b716 SHA256 513173c738dfa6a4e379ccb1a99eaff46803ad08a325073fbca8b76b6be76d56 +DIST x2goserver_3.0.1-5_all.deb 16806 RMD160 cdfd9cb079c7a4d4f943be6fd13e0d3ec2b04182 SHA1 735807f16e95b7897a766c484fd6f08888e08369 SHA256 408c4dc52af8b2c93c7afeab40ce0e4588e226f45cceee4f3013de93623022c9 EBUILD x2goserver-2.0.1.19.ebuild 1607 RMD160 0295525d2fe4286cc48dc0c584315e8c28f0d6e1 SHA1 808571483701ee270b7ea1b3fb852152d51b8131 SHA256 133547f1117f048009ce856fbc96d5e0698212db60662b79b6fe84338747a97b -MISC ChangeLog 546 RMD160 7e81092360939d3120ecdceda670da5be0fbb6ab SHA1 d0b4702c848e85d2d0c67576e41b2f40d776e50f SHA256 8ab374a91e4e6965a420f18cf260432b902abe4e2c423038ab65ea2cfdf45dee +EBUILD x2goserver-3.0.1.5.ebuild 2385 RMD160 26bc631c8de65013420c31aa1bbbc75f163363a5 SHA1 522c307f5a36e5d20b76a5a7c51561f7349cf769 SHA256 2b251e07877abac8f68f416b4aa33dea70c6e757b5d99016109b39e056f7d6e0 +MISC ChangeLog 436 RMD160 451fb6833e00dc775f2e265723aea87a6ff9f962 SHA1 af40430b76005708df19b0aab3959c11383e443d SHA256 858cf23907dc91cd682cd37e7a4fc6bc468381f2a91fa098191b390fb53a7682 MISC metadata.xml 307 RMD160 0172cd4fc792a41fde528ec788ab0dd98f3d21bc SHA1 953412d99904e25f4845fdfda587298e7cbc7f2a SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 diff --git a/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch b/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch new file mode 100644 index 000000000000..0fb7e0ae784c --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch @@ -0,0 +1,65 @@ +--- usr/bin/x2gomountdirs.org 2010-01-18 22:18:16.000000000 +0100 ++++ usr/bin/x2gomountdirs 2010-01-18 22:16:33.000000000 +0100 +@@ -144,34 +144,34 @@ + if(system("sshfs -o Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) + { + print "mount @dirs[$i] ok\n"; +- if(! $printspool) +- { +- my $fname="$ENV{'HOME'}/Desktop"; +- my $p=@dirs[$i]; +- $p=~s/\/cygdrive\///g; +- $p=~s/\//_/g; +- $fname="$fname/$p"; +- if($type eq "dir") +- { +- $fname="$fname(sshfs-disk)"; +- } +- else +- { +- if($fname =~ m/CDROM/) +- { +- $fname="$fname(sshfs-cdrom)"; +- } +- else +- { +- $fname="$fname(sshfs-removable)"; +- } +- $fname=~s/_ramdrive_mnt_//; +- } +- print "fname: $fname\n"; +- open(F,">$fname"); +- print F "$mntpath\n$session\n\n\0"; +- close(F); +- } ++# if(! $printspool) ++# { ++# my $fname="$ENV{'HOME'}/Desktop"; ++# my $p=@dirs[$i]; ++# $p=~s/\/cygdrive\///g; ++# $p=~s/\//_/g; ++# $fname="$fname/$p"; ++# if($type eq "dir") ++# { ++# $fname="$fname(sshfs-disk)"; ++# } ++# else ++# { ++# if($fname =~ m/CDROM/) ++# { ++# $fname="$fname(sshfs-cdrom)"; ++# } ++# else ++# { ++# $fname="$fname(sshfs-removable)"; ++# } ++# $fname=~s/_ramdrive_mnt_//; ++# } ++# print "fname: $fname\n"; ++# open(F,">$fname"); ++# print F "$mntpath\n$session\n\n\0"; ++# close(F); ++# } + } + else + { diff --git a/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild new file mode 100644 index 000000000000..7f9fe02b794b --- /dev/null +++ b/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.0.1.5.ebuild,v 1.1 2010/04/29 12:48:01 voyageur Exp $ + +EAPI=1 +inherit eutils versionator + +MAJOR_PV="$(get_version_component_range 1-3)" +FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)" +DESCRIPTION="The X2Go server" +HOMEPAGE="http://x2go.berlios.de" +SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}_all.deb" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+fuse ldap postgres sqlite" + +DEPEND="" +RDEPEND="app-admin/sudo + net-misc/nx + virtual/ssh + fuse? ( sys-fs/sshfs-fuse ) + postgres? ( virtual/postgresql-server ) + sqlite? ( dev-db/sqlite )" +# Still in the NX overlay for now +# ldap? ( net-misc/x2goldaptools )" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} + cd "${S}" + + tar xozf data.tar.gz || die "failure unpacking data.tar.gz" + + # Use nxagent directly + sed -i -e "s/x2goagent/nxagent/" usr/bin/x2gostartagent || die "sed failed" + + if use sqlite ; then + echo sqlite > etc/x2go/sql + fi + + epatch "${FILESDIR}"/${PN}-mountdirs_no_desktop_icon.patch +} + +src_install() { + dobin usr/bin/* + dosbin usr/sbin/* + + exeinto /usr/share/x2go/script + doexe usr/lib/x2go/script/x2gocreatebase.sh + doexe usr/lib/x2go/script/x2gosqlite.sh + + insinto /etc/x2go + doins etc/x2go/sql + doins etc/x2go/x2goserver.conf + + if use sqlite ; then + einfo "creating x2go sqlite database directory /var/db/x2go" + dodir /var/db/x2go + fi + + if use postgres ; then + newinitd "${FILESDIR}"/${PN}.init ${PN} + fi +} + +pkg_postinst() { + if use postgres ; then + elog "To work, x2goserver needs a configured postgreSQL database" + elog " echo -n local > /etc/x2go/sql" + elog "Sample script to create the database can be found here:" + elog " /usr/share/x2go/script/x2gocreatebase.sh" + fi + if use sqlite ; then + elog "To work, x2goserver needs a configured sqlite database" + elog "Sample script to create the database can be found here:" + elog " /usr/share/x2go/script/x2gosqlite.sh" + fi + einfo "" + elog "You also need to give sudo rights on x2gopgwrapper to your users" + elog "A sudoers example for all members of the group users:" + elog " %users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper" + elog "To give only a special group access to the x2goserver, " + elog "change %users to any other group" +}