summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-03-14 22:30:45 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-03-14 22:30:45 +0000
commite4993837e59b00ff8bd92d9ec96636664cf470e6 (patch)
tree776d647090519ccacbe2cc467049c3b1fe3dbb60 /net-misc/x2goserver/files
parentVersion bump, new homepage and source, clean ebuild, new versioning. Bug #408105 (diff)
downloadgentoo-2-e4993837e59b00ff8bd92d9ec96636664cf470e6.tar.gz
gentoo-2-e4993837e59b00ff8bd92d9ec96636664cf470e6.tar.bz2
gentoo-2-e4993837e59b00ff8bd92d9ec96636664cf470e6.zip
Version bump, cleaned ebuild and adapted to new server system. Fixes bug #408105
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/x2goserver/files')
-rw-r--r--net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch65
-rw-r--r--net-misc/x2goserver/files/x2goserver.init9
2 files changed, 2 insertions, 72 deletions
diff --git a/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch b/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch
deleted file mode 100644
index 0fb7e0ae784c..000000000000
--- a/net-misc/x2goserver/files/x2goserver-mountdirs_no_desktop_icon.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init
index c4a0927f07a4..6834582136d0 100644
--- a/net-misc/x2goserver/files/x2goserver.init
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -1,15 +1,10 @@
#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/files/x2goserver.init,v 1.1 2009/03/13 12:44:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/files/x2goserver.init,v 1.2 2012/03/14 22:30:45 voyageur Exp $
DAEMON=/usr/sbin/x2gocleansessions
-depend() {
- need postgresql
- use sshd
-}
-
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \