x2go-commits February 2013

x2go-commits@lists.x2go.org

1 participants
165 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-133-g9737884
by git-admin＠x2go.org 15 Feb '13

15 Feb '13

The branch, master has been updated via 97378841e2201ccc3dd2eec5736e607d2d2da45e (commit) from cd23b80ca2f1056500e8b78cedebf60089086bda (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 97378841e2201ccc3dd2eec5736e607d2d2da45e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 15 11:08:07 2013 +0100 Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gogetapps | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8d32658..b6dd930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + - Allow for deploying X2Go Published Applications system-wide on a + per-user basis (in /etc/x2go/applications-per-user/<username>). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 28842c0..39cafa2 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -182,7 +182,8 @@ my $file; my @dirs; @dirs[0]="/etc/x2go/applications"; my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); -@dirs[1]="$homedir/.x2go/applications"; +@dirs[1]="/etc/x2go/applications-per-user/$name"; +@dirs[2]="$homedir/.x2go/applications"; foreach(@dirs) { my $dirname=$_; hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-6-g5231ba4
by git-admin＠x2go.org 14 Feb '13

14 Feb '13

The branch, master has been updated via 5231ba48183cc603a5193400884dd01b360491ba (commit) from 716736e53b9bf284d5bc196b708bc3b2362b50a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5231ba48183cc603a5193400884dd01b360491ba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 14 06:26:41 2013 +0100 Add load balancing support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + lib/x2gobroker-agent.pl | 37 ++++++++++++++ x2gobroker/agent.py | 87 +++++++++++++++++++++++++++++++++ x2gobroker/brokers/base_broker.py | 32 ++++++++++-- x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/web/plain.py | 2 +- 6 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 x2gobroker/agent.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 025cc4c..0984633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.0.2): - Make CC, CFLAGS and LDFLAGS configurable through build system. - Make host session option a list, not string. + - Add load balancing support. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 6a64bbf..74e0751 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -98,6 +98,43 @@ if($mode eq 'listsessions') exec ("/bin/su - $uid -c \"x2golistsessions --all-servers\""); } +if($mode eq 'findbestserver_by_sessionstats') || ($mode eq 'findbestserver') +{ + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); + print "OK\n"; + my $session_list = `/bin/su - -c \"x2golistsessions_root --all-servers\"`; + my $avail_servers = `/bin/su - $uid -c \"x2gogetservers\"`; + my $amount_sessions = 0; + + # initialize server_load hash + my %server_load = (); + foreach (split('\n', $avail_servers)) + { + $server_load{$_} = 0; + } + + # count sessions per server + my @session_list = split(/\n/, $session_list); + foreach (@session_list) + { + my ($apid, $sid, $disp, $hostname, $stat, $dcreated, $cookie, $gport, $sndport, $dsusp, $username, $fsport) = split('\\|', $_); + $amount_sessions++; + $server_load{$hostname} += 1; + } + + # render the output result + my @result; + for my $hostname ( keys %server_load ) { + my $available = 100-$server_load{$hostname}/$amount_sessions*100; + if ($available eq 0) { + $available = 100; + } + push @result, sprintf '%1$d:%2$s', $available, $hostname; + } + print join('\n', sort @result); + print "\n"; +} + if($mode eq 'getservers') { diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py new file mode 100644 index 0000000..3e7cdc6 --- /dev/null +++ b/x2gobroker/agent.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +import subprocess + +# X2Go Broker modules +import x2gobroker.defaults + +def call_x2gobroker_agent(username, mode): + """\ + Launch X2Go Broker Agent and process its output. + + @param username: run the broker agent for this user + @type username: C{unicode} + @param mode: execution mode of the broker (listsessions, getservers, etc.) + @type mode: C{unicode} + + """ + cmdline = [ + '{x2gobroker_agent_binary}'.format(x2gobroker_agent_binary=x2gobroker.defaults.X2GOBROKER_AGENT_CMD), + '{username}'.format(username=username), + '{mode}'.format(mode=mode), + ] + + subprocess.Popen(cmd_line, + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=False, + ) + + return subprocess.stdout.read() + +def list_sessions(username): + """\ + Query X2Go Broker Agent for a session list for a given username. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + return call_broker_agent(username, mode='listsessions') + +def find_best_server(username=None): + """\ + Query X2Go Broker Agent for the best server for the given user. + In many cases the username does not have an effect on the + detection of an optimal server. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + server_list = call_broker_agent(username, mode='findbestserver') + server_list.sort(reverse=True) + return server_list[0].split(':')[1] + +def get_servers(username=None): + """\ + Query X2Go Broker Agent for the list of available servers + for the given user. In many cases the username does not + have an effect on the list of available servers. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + return call_broker_agent(username, mode='getservers') + diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index c06dfa6..9c710b3 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -29,10 +29,12 @@ import types import copy import uuid import netaddr +import random # X2Go Broker modules import x2gobroker.config import x2gobroker.defaults +import x2gobroker.agent class X2GoBroker(object): """\ @@ -685,7 +687,7 @@ class X2GoBroker(object): return list_of_profiles - def select_session(self, profile_id): + def select_session(self, profile_id, username=None): """\ Start/resume a session by selecting a profile name offered by the X2Go client. @@ -693,16 +695,40 @@ class X2GoBroker(object): broker. @param profile_id: the selected profile ID. This matches one of the dictionary keys offered by the C{list_profiles} method - @type profile_id: C{dict} + @type profile_id: C{unicode} + @param username: specify username that this operation runs for + @type username: C{unicode} """ profile = self.get_profile(profile_id) + # if we have more than one server, pick one server randomly for X2Go Broker Agent queries + server_list = profile[u'host'] + random.shuffle(server_list) + agent_query_server = server_list[0] + + best_server = x2gobroker.agent.find_best_server() + selected_session = { - 'server': profile[u'host'][0], + 'server': best_server, 'port': profile[u'sshport'], } + # do some load balancing if more than one server is configured + if len(server_list) >= 1 and username: + + session_list = x2gobroker.agent.list_sessions(username=username) + if session_list: + + # if resuming, always select the first session in the list, there should only be one suspended session + server_name = session_list[0].split('|')[3] + session_info = session_list[0].split('|')[1] + + selected_session.update({ + 'server': server_name, + 'session_info': session_info, + }) + return selected_session def change_password(self, new='', old=''): diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index ad21567..5970659 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -76,7 +76,7 @@ class X2GoBroker(base.X2GoBroker): } return list_of_profiles - def select_session(self, profile_id): + def select_session(self, profile_id, username=None): selectprofile_output = { 'server': 'localhost', diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index b6c5f83..e25b5c0 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -142,7 +142,7 @@ class X2GoBrokerWebPlain: if profile_id: - profile_info = broker_backend.select_session(profile_id=profile_id) + profile_info = broker_backend.select_session(profile_id=profile_id, username=username) if profile_info.has_key('server'): output += "SERVER:" output += profile_info['server'] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-x2go.git - master (branch) updated: 0.4.0.1-2-g938bb81
by git-admin＠x2go.org 14 Feb '13

14 Feb '13

The branch, master has been updated via 938bb81114832e2c769218b90cd346c4258d59b8 (commit) from 4af31629e0038edcb7c8a89f463d641e50f9e88a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 938bb81114832e2c769218b90cd346c4258d59b8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 14 05:25:55 2013 +0100 sort session list fields ----------------------------------------------------------------------- Summary of changes: x2go/backends/info/_stdout.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 2273eb3..6bbed1d 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -60,20 +60,20 @@ class X2GoServerSessionInfoSTDOUT(object): """ try: l = x2go_output.split("|") - self.name = l[1] - self.cookie = l[6] self.agent_pid = int(l[0]) + self.name = l[1] self.display = int(l[2]) - self.status = l[4] - self.graphics_port = int(l[8]) - self.snd_port = int(l[9]) - self.sshfs_port = int(l[13]) - self.username = l[11] self.hostname = l[3] + self.status = l[4] # TODO: turn into datetime object self.date_created = l[5] + self.cookie = l[6] + self.graphics_port = int(l[8]) + self.snd_port = int(l[9]) # TODO: turn into datetime object self.date_suspended = l[10] + self.username = l[11] + self.sshfs_port = int(l[13]) self.local_container = '' except IndexError, e: # DEBUGGING CODE hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.0.6-4-g1d71a0a
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via 1d71a0a39cb3430f0efd54d24b7a329390d8aaa3 (commit) from df2c3b52274c257402026571d9ed00a9dd905762 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1d71a0a39cb3430f0efd54d24b7a329390d8aaa3 Author: Frédéric Motte <frederic.motte(a)liazo.fr> Date: Wed Feb 13 20:03:12 2013 +0100 Add French translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++ x2godesktopsharing_fr.ts | 97 ++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 60 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c05a3df..ac4f6ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ x2godesktopsharing (3.1.1.0-0~x2go1) UNRELEASED; urgency=low + [ Frédéric Motte ] + * New upstream version (3.1.1.0): + - Add French translation file. + + [ Mike Gabriel ] * Continue development... -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 10 Jan 2013 10:06:02 +0100 diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts index bde94cf..c3c6c8e 100644 --- a/x2godesktopsharing_fr.ts +++ b/x2godesktopsharing_fr.ts @@ -1,154 +1,124 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="fr_FR"> +<!DOCTYPE TS><TS> <context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation type="unfinished"></translation> + <translation>Sauver la selection de %1</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation type="unfinished"></translation> + <translation>Accepter %1 de %2 ?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> <source>X2GO DesktopSharing v</source> - <translation type="unfinished"></translation> + <translation>X2GO Desktop Sharing v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> - <translation type="unfinished"></translation> + <translation>L'application X2Go Desktop Sharing est déjà active pour ce display. +Si cette application n'est plus en cours d'execution, effacez le fichier %1 et redémarrez</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="337"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Erreur</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> - <translation type="unfinished"></translation> + <translation>Application X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs autorisés...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs bannis...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Activer X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Désactiver X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> - <translation type="unfinished"></translation> + <translation>Apropos de X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation>&Quitter</translation> </message> <message> - <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> - <translation type="unfinished"></translation> + <translation>Impossible d'écouter sur le socket:</translation> </message> <message> - <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> - <translation type="unfinished"></translation> + <translation>Accès autorisé</translation> </message> <message> - <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> - <translation type="unfinished"></translation> + <translation>%1(%2): accès autorisé</translation> </message> <message> - <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> - <translation type="unfinished"></translation> + <translation>Déconnecté %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> - <translation type="unfinished"></translation> + <translation>Connection distante</translation> </message> <message> - <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) connecté</translation> </message> <message> - <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> - <translation type="unfinished"></translation> + <translation>Accès refusé</translation> </message> <message> - <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> - <translation type="unfinished"></translation> + <translation>%1(%2): accès refusé</translation> </message> <message> - <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> - <translation type="unfinished"></translation> + <translation>Utilisateur déconnecté</translation> </message> <message> - <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) déconnecté</translation> </message> <message> - <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs bannis</translation> </message> <message> - <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs autorisés</translation> </message> <message> - <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Desktop Sharing</translation> </message> </context> <context> <name>mwnd</name> <message> - <location filename="dlg.ui" line="22"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Desktop Sharing</translation> </message> <message> - <location filename="dlg.ui" line="34"/> <source>remove</source> - <translation type="unfinished"></translation> + <translation>retirer</translation> </message> <message> - <location filename="dlg.ui" line="75"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -157,7 +127,14 @@ p, li { white-space: pre-wrap; } This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit <a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + X2Go Desktop Sharing vous permet de partager votre session X en cours sur le réseau local ou à travers Internet. Vous aurez la possibilité d'autoriser ou refuser les connections d'utilisateurs et de sauver vos préférences. Une icone dans la barre de meun vous informera de la configuration choisie et vous informera de l'activité des connections. Pour plus d'information, merci de vous rendre sur le site web + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></translation> </message> </context> </TS> hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-5-g716736e
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via 716736e53b9bf284d5bc196b708bc3b2362b50a4 (commit) from d424e129de63d2fd187d1364bf5d2791d74571be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 716736e53b9bf284d5bc196b708bc3b2362b50a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:35:35 2013 +0100 whitespace fix ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index f84e097..d797697 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -55,7 +55,7 @@ sshport=22 setdpi=0 pack=16m-jpeg -## +## ## pool-A (staff servers) ## ## The pool-A contains three X2Go Servers (server-A, server-B and server-C). hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-4-gd424e12
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via d424e129de63d2fd187d1364bf5d2791d74571be (commit) via dc84423e202eba6c1022821b24a25504ee1cab0c (commit) via 0e4b85183bd23e6561ba687bb693cf0f3612297d (commit) via fba2b53e36f84b12f7dfcdfe971149415cae3019 (commit) from 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d424e129de63d2fd187d1364bf5d2791d74571be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:35:02 2013 +0100 Make host session option a list, not string. commit dc84423e202eba6c1022821b24a25504ee1cab0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:34:32 2013 +0100 really build x2gobroker-agent setuidwrapper commit 0e4b85183bd23e6561ba687bb693cf0f3612297d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:33:59 2013 +0100 /debian/control: Add bin:package x2gobroker-agent. commit fba2b53e36f84b12f7dfcdfe971149415cae3019 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:32:31 2013 +0100 Make CC, CFLAGS and LDFLAGS configurable through build system. ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +- debian/changelog | 10 +++ debian/control | 94 ++++++++++++++-------------- debian/rules | 4 +- etc/broker/x2gobroker-sessionprofiles.conf | 3 +- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/defaults.py | 2 + 7 files changed, 67 insertions(+), 54 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 1293dab..07428f6 100755 --- a/Makefile +++ b/Makefile @@ -27,6 +27,10 @@ INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_PROGRAM=install -o root -g root -m 755 +CC ?= gcc +CFLAGS += -fPIE +LDFLAGS += -pie + RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty @@ -52,7 +56,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_setuidwrappers: - gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: # run setup.py build+install somewhere here... diff --git a/debian/changelog b/debian/changelog index e040920..025cc4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.0.0.2): + - Make CC, CFLAGS and LDFLAGS configurable through build system. + - Make host session option a list, not string. + * /debian/control: + + Add bin:package x2gobroker-agent. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 + x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low * Initial upstream version. diff --git a/debian/control b/debian/control index 2789bf7..3b222bc 100644 --- a/debian/control +++ b/debian/control @@ -138,50 +138,50 @@ Description: X2Go http(s) based session broker (Python modules) This package contains common files needed by all X2Go session brokers being package for this distribution. -#Package: x2gobroker-agent -#Architecture: any -#Depends: -# ${shlibs:Depends}, -# ${misc:Depends}, -# perl, -# adduser, -# x2goserver, -#Description: X2Go http(s) based session broker (common files) -# X2Go is a server based computing environment with -# - session resuming -# - low bandwidth support -# - LDAP support -# - client side mass storage mounting support -# - client side printing support -# - audio support -# - authentication by smartcard and USB stick -# . -# The session broker is a server tool for X2Go that -# tells your X2Go Client application in a terminal -# server cluster what servers and session types are -# most appropriate for the user in front of the -# X2Go terminal. -# . -# A session broker is most useful in load balanced -# X2Go server farms. -# . -# This package contains a setuid agent command that -# is required by the X2Go session broker. This package -# has to be installed on all X2Go servers that shall get -# managed via the X2Go session broker. -# . -# WARNING: This package installs a setuid wrapper -# (/usr/lib/x2go/broker/x2gobroker-agent) on your system. -# This setuid wrapper aims to be a secure replacement -# for the deprecated suidperl exectuable that was removed -# from Perl (>= 5.12). -# . -# This wrapper is only able to execute the Perl script -# /usr/lib/x2go/broker/x2gobroker-agent.pl. For running -# properly, x2gobroker-agent.pl needs setuid privileges. -# . -# If you hesitate to install this package, study the code -# of the named wrapper and the named Perl script beforehand. -# Note that the X2Go session broker will not work without this -# x2gobroker-agent component installed on your to-be-managed -# X2Go servers. +Package: x2gobroker-agent +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + perl, + adduser, + x2goserver, +Description: X2Go http(s) based session broker (common files) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains a setuid agent command that + is required by the X2Go session broker. This package + has to be installed on all X2Go servers that shall get + managed via the X2Go session broker. + . + WARNING: This package installs a setuid wrapper + (/usr/lib/x2go/broker/x2gobroker-agent) on your system. + This setuid wrapper aims to be a secure replacement + for the deprecated suidperl exectuable that was removed + from Perl (>= 5.12). + . + This wrapper is only able to execute the Perl script + /usr/lib/x2go/broker/x2gobroker-agent.pl. For running + properly, x2gobroker-agent.pl needs setuid privileges. + . + If you hesitate to install this package, study the code + of the named wrapper and the named Perl script beforehand. + Note that the X2Go session broker will not work without this + x2gobroker-agent component installed on your to-be-managed + X2Go servers. diff --git a/debian/rules b/debian/rules index 787fc72..997158b 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall include /usr/share/dpkg/buildflags.mk -#DEB_PERL_PACKAGES=libx2go-broker-perl -#DEB_PERL_CLEAN_TARGET=realclean -#include /usr/share/cdbs/1/class/perl-makemaker.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/python-distutils.mk diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 8b332a3..f84e097 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -144,8 +144,7 @@ acl-any-order=deny-allow [pool-C-XFCE] user= # no load balancing support, yet -#host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local -host=s-E1.pool-c.domain.local +host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local name=XFCE - pool-C command=XFCE acl-users-allow=testuser-A,testuser-B diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7da6336..c06dfa6 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -699,7 +699,7 @@ class X2GoBroker(object): profile = self.get_profile(profile_id) selected_session = { - 'server': profile[u'host'], + 'server': profile[u'host'][0], 'port': profile[u'sshport'], } diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 63bc254..48b61d8 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -139,6 +139,8 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'sshport': 22, u'setdpi': 0, u'pack': u'16m-jpeg', + u'user': '', + u'host': [ u'localhost', ], u'acl-users-allow': [], u'acl-users-deny': [], u'acl-users-order': '', hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goclient.git - master (branch) updated: 4.0.0.0-16-gb3121c4
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via b3121c46cd4494b6d15cf644292f290bf0dadc91 (commit) from 11e960045237f9a303a4d9a6c7be24db3f494946 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b3121c46cd4494b6d15cf644292f290bf0dadc91 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Feb 13 15:46:46 2013 +0100 Launching parec to init pulseaudio input only on Windows ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 6 +++++- onmainwindow.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3cd0b94..034b01c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * Continue new feature development... + [ Oleksandr Shneyder ] + * Launching parec to init pulseaudio input only on Windows + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 31aaf7f..acef85f 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -10593,8 +10593,10 @@ void ONMainWindow::printSshDError() QMessageBox::Ok,QMessageBox::NoButton ); } +#ifdef Q_OS_WIN void ONMainWindow::slotStartParec () { + if ( !parecTunnelOk ) { // wait 1 sec and try again @@ -10611,7 +10613,7 @@ void ONMainWindow::slotStartParec () sshConnection->executeCommand ( scmd ); } - +#endif void ONMainWindow::slotSndTunOk() { @@ -10623,8 +10625,10 @@ void ONMainWindow::slotPCookieReady ( bool result, QString , int ) { +#ifdef Q_OS_WIN if ( result ) slotStartParec(); +#endif } diff --git a/onmainwindow.h b/onmainwindow.h index 5865cd2..5a48cba 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -909,6 +909,7 @@ private slots: void slotCheckXOrgLog(); void slotCheckXOrgConnection(); void slotCheckPulse(); + void slotStartParec (); #endif private slots: void slotAppDialog(); @@ -1040,7 +1041,6 @@ private slots: void slotAttachProxyWindow(); void slotEmbedIntoParentWindow(); void slotEmbedWindow(); - void slotStartParec (); void slotSndTunOk(); void slotPCookieReady ( bool result,QString output, int proc ); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-baikal (branch) updated: 4.0.0.3
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, build-baikal has been updated via d351dcec2702444a87ff9eafb5a1733281be6e85 (commit) via 2d37d608452ade797ff5ace47db44cde28edf14d (commit) from 7bf7bd92b0f2935bdac590e62519827ac6e86b95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index bbf753a..3ab15cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0.1 +4.0.0.3 diff --git a/debian/changelog b/debian/changelog index 4ef406e..31ac841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.0.3-0~x2go1) unstable; urgency=low + + * Fix version in version.h, VERSION and x2goplugin.rc. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 14:37:24 +0100 + x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/version.h b/version.h index a8921eb..b44511f 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.0.1" +#define VERSION "4.0.0.3" diff --git a/x2goplugin.rc b/x2goplugin.rc index 4939012..70eccaf 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,0,1 - PRODUCTVERSION 4,0,0,1 + FILEVERSION 4,0,0,3 + PRODUCTVERSION 4,0,0,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 0 ,1\0" + VALUE "FileVersion", "4, 0, 0 ,3\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.0.1\0" - VALUE "ProductVersion", "4, 0, 0, 1\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.0.3\0" + VALUE "ProductVersion", "4, 0, 0, 3\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.0.3
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, build-main has been updated via d351dcec2702444a87ff9eafb5a1733281be6e85 (commit) via 2d37d608452ade797ff5ace47db44cde28edf14d (commit) from 7bf7bd92b0f2935bdac590e62519827ac6e86b95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index bbf753a..3ab15cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0.1 +4.0.0.3 diff --git a/debian/changelog b/debian/changelog index 4ef406e..31ac841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.0.3-0~x2go1) unstable; urgency=low + + * Fix version in version.h, VERSION and x2goplugin.rc. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 14:37:24 +0100 + x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/version.h b/version.h index a8921eb..b44511f 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.0.1" +#define VERSION "4.0.0.3" diff --git a/x2goplugin.rc b/x2goplugin.rc index 4939012..70eccaf 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,0,1 - PRODUCTVERSION 4,0,0,1 + FILEVERSION 4,0,0,3 + PRODUCTVERSION 4,0,0,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 0 ,1\0" + VALUE "FileVersion", "4, 0, 0 ,3\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.0.1\0" - VALUE "ProductVersion", "4, 0, 0, 1\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.0.3\0" + VALUE "ProductVersion", "4, 0, 0, 3\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - release/4.0.0.x (branch) updated: 4.0.0.2-2-gd351dce
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, release/4.0.0.x has been updated via d351dcec2702444a87ff9eafb5a1733281be6e85 (commit) from 2d37d608452ade797ff5ace47db44cde28edf14d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d351dcec2702444a87ff9eafb5a1733281be6e85 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 14:37:32 2013 +0100 release 4.0.0.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d20e18..31ac841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2goclient (4.0.0.3-0~x2go1) UNRELEASED; urgency=low +x2goclient (4.0.0.3-0~x2go1) unstable; urgency=low * Fix version in version.h, VERSION and x2goplugin.rc. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 14:35:58 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 14:37:24 +0100 x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2013