x2go-commits January 2013

x2go-commits@lists.x2go.org

1 participants
160 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-123-g75e933b
by git-admin＠x2go.org 19 Jan '13

19 Jan '13

The branch, master has been updated via 75e933b3c9e7a6c9f95edb2a9b7e1a1ca01a19d4 (commit) from 3ca3fe6b1a4e90fb3bde0d9dc22d5558bb53fd62 (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 75e933b3c9e7a6c9f95edb2a9b7e1a1ca01a19d4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 19 16:04:24 2013 +0100 happy new year ----------------------------------------------------------------------- Summary of changes: X2Go/Log.pm | 6 +++--- X2Go/Server.pm | 6 +++--- X2Go/Server/DB.pm | 6 +++--- X2Go/Server/DB/PostgreSQL.pm | 6 +++--- X2Go/Server/DB/SQLite3.pm | 6 +++--- X2Go/Utils.pm | 6 +++--- debian/copyright | 8 ++++---- .../lib/libx2go-server-db-sqlite3-wrapper.pl | 6 +++--- .../src/libx2go-server-db-sqlite3-wrapper.c | 4 ++-- x2goserver-compat/bin/x2gosuspend | 6 +++--- x2goserver-compat/bin/x2gosuspend-agent | 6 +++--- x2goserver-compat/bin/x2goterminate | 6 +++--- .../share/x2gofeature.d/x2goserver-compat.features | 6 +++--- .../bin/x2goserver-run-extensions | 8 ++++---- .../x2gofeature.d/x2goserver-extensions.features | 6 +++--- x2goserver-fmbindings/bin/x2gofm | 6 +++--- x2goserver-printing/bin/x2goprint | 6 +++--- .../x2gofeature.d/x2goserver-printing.features | 6 +++--- .../share/x2gofeature.d/x2goserver-pyhoca.features | 6 +++--- .../x2gofeature.d/x2goserver-xsession.features | 6 +++--- x2goserver/bin/x2gocmdexitmessage | 6 +++--- x2goserver/bin/x2gofeature | 6 +++--- x2goserver/bin/x2gofeaturelist | 4 ++-- x2goserver/bin/x2gogetapps | 6 +++--- x2goserver/bin/x2gogetservers | 6 +++--- x2goserver/bin/x2golistdesktops | 6 +++--- x2goserver/bin/x2golistmounts | 6 +++--- x2goserver/bin/x2golistsessions | 6 +++--- x2goserver/bin/x2golistshadowsessions | 6 +++--- x2goserver/bin/x2gomountdirs | 6 +++--- x2goserver/bin/x2gopath | 10 +++++----- x2goserver/bin/x2goresume-session | 6 +++--- x2goserver/bin/x2goruncommand | 6 +++--- x2goserver/bin/x2gosessionlimit | 6 +++--- x2goserver/bin/x2gosetkeyboard | 8 ++++---- x2goserver/bin/x2goshowblocks | 6 +++--- x2goserver/bin/x2gostartagent | 6 +++--- x2goserver/bin/x2gosuspend-session | 6 +++--- x2goserver/bin/x2goterminate-session | 6 +++--- x2goserver/bin/x2goumount-session | 6 +++--- x2goserver/bin/x2goversion | 6 +++--- x2goserver/lib/x2gochangestatus | 6 +++--- x2goserver/lib/x2gocreatesession | 6 +++--- x2goserver/lib/x2gogetagent | 6 +++--- x2goserver/lib/x2gogetdisplays | 6 +++--- x2goserver/lib/x2gogetports | 6 +++--- x2goserver/lib/x2gogetstatus | 6 +++--- x2goserver/lib/x2goinsertport | 6 +++--- x2goserver/lib/x2goinsertsession | 6 +++--- x2goserver/lib/x2golistsessions_sql | 6 +++--- x2goserver/lib/x2gologlevel | 6 +++--- x2goserver/lib/x2goresume | 6 +++--- x2goserver/lib/x2gormport | 6 +++--- x2goserver/lib/x2gosuspend-agent | 6 +++--- x2goserver/lib/x2gosyslog | 6 +++--- x2goserver/sbin/x2gocleansessions | 6 +++--- x2goserver/sbin/x2godbadmin | 6 +++--- x2goserver/sbin/x2golistsessions_root | 6 +++--- x2goserver/share/x2gofeature.d/x2goserver.features | 6 +++--- 59 files changed, 180 insertions(+), 180 deletions(-) The diff of changes is: diff --git a/X2Go/Log.pm b/X2Go/Log.pm index ec08dd2..12ee7b2 100644 --- a/X2Go/Log.pm +++ b/X2Go/Log.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> package X2Go::Log; diff --git a/X2Go/Server.pm b/X2Go/Server.pm index e63df56..bbbbdf0 100644 --- a/X2Go/Server.pm +++ b/X2Go/Server.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> package X2Go::Server; diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index c87334d..5fda1a2 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,8 +15,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> package X2Go::Server::DB; diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index f1233e9..dfb27e5 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,8 +15,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> package X2Go::Server::DB::PostgreSQL; diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index b615c76..d3d45d9 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> package X2Go::Server::DB::SQLite3; diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm index c0d15b0..f5e4cf6 100644 --- a/X2Go/Utils.pm +++ b/X2Go/Utils.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> package X2Go::Utils; diff --git a/debian/copyright b/debian/copyright index 92c339a..2871fda 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-M. Graesing <heinz-m.graesing(a)obviously-nice.de> -Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -Copyright (C) 2007-2012 Oleksandr Shneyder +Copyright (C) 2007-2013 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de -Copyright (C) 2007-2012 Heinz-Markus Graesing +Copyright (C) 2007-2013 Heinz-Markus Graesing heinz-m.graesing(a)obviously-nice.de Upstream contributors to x2goserver-extensions: @@ -35,5 +35,5 @@ Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2007-2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and +The Debian packaging is (C) 2007-2013, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and is licensed under the GPL, see above. diff --git a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl index 97c63fd..3d16fd5 100755 --- a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl +++ b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -XU -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Switch; diff --git a/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c b/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c index c70174f..fcff47e 100644 --- a/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c +++ b/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c @@ -1,7 +1,7 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * Copyright (C) 2011-2012 Moritz 'Morty' Strübe <morty(a)gmx.net> + * Copyright (C) 2011-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + * Copyright (C) 2011-2013 Moritz 'Morty' Strübe <morty(a)gmx.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend index a525624..0408a67 100755 --- a/x2goserver-compat/bin/x2gosuspend +++ b/x2goserver-compat/bin/x2gosuspend @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # this script is here for reasons of backwards compatibility with older clients x2gosuspend-session $@ \ No newline at end of file diff --git a/x2goserver-compat/bin/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent index 2ae4edc..8090c64 100755 --- a/x2goserver-compat/bin/x2gosuspend-agent +++ b/x2goserver-compat/bin/x2gosuspend-agent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> shift; shift; diff --git a/x2goserver-compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate index 57ca2a5..ca76052 100755 --- a/x2goserver-compat/bin/x2goterminate +++ b/x2goserver-compat/bin/x2goterminate @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; my $proc=shift; diff --git a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features index f4a9376..8d023ae 100755 --- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features +++ b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index f89515c..e003fd6 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,9 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> set -e diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 7f89a5c..10a9795 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver-fmbindings/bin/x2gofm b/x2goserver-fmbindings/bin/x2gofm index 9070055..7666d8c 100755 --- a/x2goserver-fmbindings/bin/x2gofm +++ b/x2goserver-fmbindings/bin/x2gofm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2012 Milan Knížek <knizek.confy(a)gmail.com> -# Copyright (C) 2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 Milan Knížek <knizek.confy(a)gmail.com> +# Copyright (C) 2012-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> use strict; diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index 3256f40..cdbf8fa 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use File::Basename; diff --git a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features index bbe195c..faebdd6 100755 --- a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features +++ b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features index 8c3e4b5..f0020eb 100755 --- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features +++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features index f4eb3dc..e88bbbf 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index 1e6b022..79cd0a5 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; X2GO_ROOT=${HOME}/.x2go diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index c2c851b..ee0d309 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> [ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } diff --git a/x2goserver/bin/x2gofeaturelist b/x2goserver/bin/x2gofeaturelist index 44b3bfc..e879e4e 100755 --- a/x2goserver/bin/x2gofeaturelist +++ b/x2goserver/bin/x2gofeaturelist @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> X2GO_LIB_PATH="$(x2gopath libexec)"; X2GO_SHARE_PATH="$(x2gopath share)"; diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 40f7e70..28842c0 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index ac38c42..83ba5c1 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 4a97622..160148d 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 624d0a4..2262a80 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 75ff45a..9d8a0bf 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2golistshadowsessions b/x2goserver/bin/x2golistshadowsessions index 46893ce..6c11455 100755 --- a/x2goserver/bin/x2golistshadowsessions +++ b/x2goserver/bin/x2golistshadowsessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 7965f54..5d8e386 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath index b42c9bb..0a70a54 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,10 +17,10 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 Jan Engelhard <jengelh(a)inai.de> +# Copyright (C) 2012-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 Jan Engelhard <jengelh(a)inai.de> base="${0%/*}"; diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index f4b5624..75fa1b0 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> SESSION_NAME="$1" X2GO_GEOMETRY="$2" diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index cad9dd2..0aa79b6 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> DISPLAY=":$1" X2GO_AGENT_PID=$2 diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index d4d1b7d..8eb1cae 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Config::Simple; diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index cb99b40..007233d 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,9 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index 0c3e832..79526a3 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 45b3ba5..5b97fb4 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 645c352..4d6c0fc 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> if [ $# -eq 1 ]; then SESSION_NAME="$1" diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 9819498..c8b5c92 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> if [ $# -eq 1 ]; then SESSION_NAME="$1" diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 704b696..ff3de4e 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index eee00db..1854a20 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index de10749..1d2c01e 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index f05a987..27d3d2d 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index d61b4bd..90169bb 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index e84ae0f..44e66c9 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index bf5d09d..33d3428 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index 3d6dc0f..98072b0 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index 398b5d1..4019675 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index 8f8a410..94deece 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 1a0dcd1..0780ac5 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index 5d5c49e..7bc1c2f 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 768e751..7111896 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 172b504..53ac3b2 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 103dcb7..21cdc0c 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index 89b74b4..b6451d5 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index b160dc4..1988c09 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Hostname; diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 56915d9..b0de568 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 0699d2d..e1070dc 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -1,5 +1,5 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; use Sys::Hostname; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 5e4ce76..4a123f3 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH="$(x2gopath libexec)"; 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

x2goserver.git - master (branch) updated: 3.1.1.3-122-g3ca3fe6
by git-admin＠x2go.org 19 Jan '13

19 Jan '13

The branch, master has been updated via 3ca3fe6b1a4e90fb3bde0d9dc22d5558bb53fd62 (commit) from d2e3018311a85734001bde6da8cbff6a060d3c4c (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 3ca3fe6b1a4e90fb3bde0d9dc22d5558bb53fd62 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 19 15:55:01 2013 +0100 Add Reinhard Tartler to Uploaders. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f4ab554..64412af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low + Use Breaks/Replaces to exchange x2goserver.conf in x2goserver package by x2goserver.conf in new x2goserver-common package. + Move several x2goserver-* package to x2goserver's Recommends field. + + Add Reinhard Tartler to Uploaders. * /debian/x2goserver.init: + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package diff --git a/debian/control b/debian/control index 9110cfa..3052691 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, + Reinhard Tartler <siretart(a)tauware.de>, Build-Depends: debhelper (>= 7.0.50~), man2html-base | man2html 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

x2goserver.git - master (branch) updated: 3.1.1.3-121-gd2e3018
by git-admin＠x2go.org 19 Jan '13

19 Jan '13

The branch, master has been updated via d2e3018311a85734001bde6da8cbff6a060d3c4c (commit) from 58e58ea304d91945a96e1757b419283ac696c830 (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 d2e3018311a85734001bde6da8cbff6a060d3c4c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 19 15:52:59 2013 +0100 Add X2Go Server feature X2GO_LIST_SHADOWSESSIONS. ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB.pm | 25 +++++++++ X2Go/Server/DB/PostgreSQL.pm | 49 ++++++++++++++++- X2Go/Server/DB/SQLite3.pm | 53 ++++++++++++++++++- debian/changelog | 1 + .../lib/libx2go-server-db-sqlite3-wrapper.pl | 2 +- .../{x2golistsessions => x2golistshadowsessions} | 34 ++++++------ x2goserver/man/man8/x2golistshadowsessions.8 | 55 ++++++++++++++++++++ x2goserver/share/x2gofeature.d/x2goserver.features | 1 + 8 files changed, 199 insertions(+), 21 deletions(-) copy x2goserver/bin/{x2golistsessions => x2golistshadowsessions} (74%) create mode 100644 x2goserver/man/man8/x2golistshadowsessions.8 The diff of changes is: diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index c9a83a1..c87334d 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -424,3 +424,28 @@ sub db_listsessions_all return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listsessions_all`); } } + +sub db_listshadowsessions +{ + my $server=shift or die "argument \"server\" missed"; + if ($backend eq 'postgres') + { + return X2Go::Server::DB::PostgreSQL::db_listshadowsessions($server); + } + if ($backend eq 'sqlite') + { + return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listshadowsessions $server`); + } +} + +sub db_listshadowsessions_all +{ + if($backend eq 'postgres') + { + return X2Go::Server::DB::PostgreSQL::db_listshadowsessions_all(); + } + if ($backend eq 'sqlite') + { + return split("\n",`$x2go_lib_path/libx2go-server-db-sqlite3-wrapper listshadowsessions_all`); + } +} diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index 72ba833..f1233e9 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -45,7 +45,7 @@ use base 'Exporter'; our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', - 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts'); + 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts', 'db_listshadowsessions','db_listshadowsessions_all'); my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); @@ -493,4 +493,51 @@ sub db_listsessions_all return @sessions; } +sub db_listshadowsessions +{ + init_db(); + my $server=shift or die "argument \"server\" missed"; + my @sessions; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(now()- init_time,'SSSS'), fs_port from sessions_view + where status !='F' and server='$server' and + (session_id like '%XSHAD%') order by status desc"); + $sth->execute() or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @sessions[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @sessions; +} + +sub db_listshadowsessions_all +{ + init_db(); + my @sessions; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(now()- init_time,'SSSS'), fs_port from sessions_view + where status !='F' and + (session_id is like '%XSHAD%') order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @sessions[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @sessions; +} + 1; diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index 6abdb82..b615c76 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -54,8 +54,8 @@ use base 'Exporter'; our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', - 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', - 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts'); + 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot',. + 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts', 'db_listshadowsessions','db_listshadowsessions_all', ); sub init_db { @@ -509,6 +509,55 @@ sub db_listsessions_all return @sessions; } +sub db_listshadowsessions +{ + my $dbh = init_db(); + my $server=shift or die "argument \"server\" missed"; + my @strings; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + strftime('%Y-%m-%dT%H:%M:%S',init_time), + cookie,client,gr_port,sound_port, + strftime('%Y-%m-%dT%H:%M:%S',last_time), + uname, + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + where status !='F' and server=? and uname=? + and ( session_id like '%XSHAD%') order by status desc"); + $sth->execute($server, $realuser); + if ($sth->err()) + { + syslog('error', "listsessions (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } + my @sessions = fetchrow_array_datasets($sth); + $sth->finish(); + $dbh->disconnect(); + return @sessions; +} + +sub db_listshadowsessions_all +{ + my $dbh = init_db(); + my @strings; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + strftime('%Y-%m-%dT%H:%M:%S',init_time), + cookie,client,gr_port,sound_port, + strftime('%Y-%m-%dT%H:%M:%S',last_time), + uname, + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + where status !='F' and uname=? and ( session_id like '%XSHAD%') order by status desc"); + + $sth->execute($realuser); + if ($sth->err()) + { + syslog('error', "listsessions_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } + my @sessions = fetchrow_array_datasets($sth); + $sth->finish(); + $dbh->disconnect(); + return @sessions; +} + sub check_root { if ($realuser ne "root") diff --git a/debian/changelog b/debian/changelog index 4349cbf..f4ab554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low - Make session type label XFCE a valid session that starts xfce4-session. - Fix failures of x2gogetagent that was related to faulty regexp in SQLite3 DB wrapper script. + - Add X2Go Server feature X2GO_LIST_SHADOWSESSIONS. * /debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. diff --git a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl index 751aa69..97c63fd 100755 --- a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl +++ b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl @@ -55,7 +55,7 @@ my $cmd=shift or die "command not specified"; switch ($cmd) { case /.*listsessions.*root/ { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") } - case /.*(listsessions|getmounts).*/ { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } + case /.*(list.*sessions|getmounts).*/ { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } case /.*root/ { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") } else { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } } diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistshadowsessions similarity index 74% copy from x2goserver/bin/x2golistsessions copy to x2goserver/bin/x2golistshadowsessions index 75ff45a..46893ce 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistshadowsessions @@ -24,30 +24,30 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use X2Go::Server::DB qw(db_listsessions db_listsessions_all); +use X2Go::Server::DB qw(db_listshadowsessions db_listshadowsessions_all); use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); if ( @ARGV ) { - syslog('info', "x2golistsessions has been called with options: @ARGV"); + syslog('info', "x2golistshadowsessions has been called with options: @ARGV"); } else { - # hiding normal x2golistsessions calls into debug loglevel - syslog('debug', "x2golistsessions has been called with no option"); + # hiding normal x2golistshadowsessions calls into debug loglevel + syslog('debug', "x2golistshadowsessions has been called with no option"); } -sub check_stat -{ - my $sess=shift; - my $log="$ENV{'HOME'}/.x2go/C-$sess/session.log"; - my $text=`tail -1 $log 2>/dev/null`; - if ($text =~ m/Session suspended/) - { - return 0; - } - return 1; -} +#sub check_stat +#{ +# my $sess=shift; +# my $log="$ENV{'HOME'}/.x2go/C-$sess/session.log"; +# my $text=`tail -1 $log 2>/dev/null`; +# if ($text =~ m/Session suspended/) +# { +# return 0; +# } +# return 1; +#} my $serv=shift; if( ! $serv) @@ -58,11 +58,11 @@ if( ! $serv) my @outp; if($serv eq "--all-servers") { - @outp=db_listsessions_all(); + @outp=db_listshadowsessions_all(); } else { - @outp=db_listsessions($serv); + @outp=db_listshadowsessions($serv); } for (my $i=0;$i<@outp;$i++) diff --git a/x2goserver/man/man8/x2golistshadowsessions.8 b/x2goserver/man/man8/x2golistshadowsessions.8 new file mode 100644 index 0000000..b832147 --- /dev/null +++ b/x2goserver/man/man8/x2golistshadowsessions.8 @@ -0,0 +1,55 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2golistshadowsessions 8 "Jan 2013" "Version 4.0.x.y" "X2Go Server Tool" +.SH NAME +x2golistshadowsessions \- List Available X2Go Shadow Sessions for User +.SH SYNOPSIS +'nh +.fi +.ad l +x2golistshadowsessions [<server_hostname>|--all-servers] + +.SH DESCRIPTION +\fBx2golistshadowsessions\fR returns a list of running or suspended X2Go shadow sessions +(sessions that provide the X2Go Desktop Sharing feature) for X2Go server <server_hostname>. +If no server hostname is given at the command line, the shadow session list query runs for the local system. +.PP +\fBx2golistshadowsessions\fR is run with normal user privileges and it is used by X2Go clients to render +a list of available X2Go shadow sessions. +.SH X2GO CLUSTER MODE +If \fBx2golistshadowsessions\fR is executed with the \fI--all-servers\fR option then the central database +of your X2Go cluster is queried for running/suspended shadow sessions belonging to the user executing this command. +These sessions may be active on any of the X2Go servers within your cluster. +.SH RETURN VALUES +A line-by-line list of available X2Go sessions. Each line consists of several session attribute fields separated by the pipe +symbol (,,|''). +.PP +The meaning of the session attributes of each output line are shown below: + + field 01: <agent_pid> + field 02: <session_id> + field 03: <port> + field 04: <host> + field 05: <state> + field 06: <init_time> + field 07: <session_cookie> + field 08: <client_ip> + field 09: <gr_port> + field 10: <snd_port> + field 11: <last_time> + field 12: <user> + field 13: <age_in_secs> + field 14: <sshfs_port> + +.PP +As exitcode \fBx2golistshadowsessions\fR always returns 0. +.SH SEE ALSO +x2golistsessions(8), x2golistdesktops(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-session(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 1d23695..5e4ce76 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -36,6 +36,7 @@ case "$X2GO_FEATURE" in "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;; "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; + "X2GO_LIST_SHADOWSESSIONS") echo "ok"; exit 0;; *) exit -1;; esac 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

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.0-2-g397b7e0
by git-admin＠x2go.org 19 Jan '13

19 Jan '13

The branch, release/4.0.0.x has been updated via 397b7e0a06353a42189269334f0c889212218b9f (commit) from c1be0db4c047e623650f3888ab9d9c767da38038 (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 397b7e0a06353a42189269334f0c889212218b9f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 19 12:43:35 2013 +0100 fix typo ----------------------------------------------------------------------- Summary of changes: x2goserver/man/man8/x2golistsessions.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index c872745..332493e 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -23,7 +23,7 @@ a list of available X2Go sessions. .SH X2GO CLUSTER MODE If \fBx2golistsessions\fR is executed with the \fI--all-servers\fR option then the central database of your X2Go cluster is queried for running/suspended sessions belonging to the user executing this command. -These sessions may be active on any of the X2Go servers within you cluster. +These sessions may be active on any of the X2Go servers within your cluster. .SH RETURN VALUES A line-by-line list of available X2Go sessions. Each line consists of several session attribute fields separated by the pipe symbol (,,|''). 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

x2goserver.git - master (branch) updated: 3.1.1.3-120-g58e58ea
by git-admin＠x2go.org 19 Jan '13

19 Jan '13

The branch, master has been updated via 58e58ea304d91945a96e1757b419283ac696c830 (commit) from d45eed1fad248c20ce0fefeac180e13cb9155f38 (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 58e58ea304d91945a96e1757b419283ac696c830 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 19 12:43:35 2013 +0100 fix typo ----------------------------------------------------------------------- Summary of changes: x2goserver/man/man8/x2golistsessions.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index 0448e12..484b954 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -23,7 +23,7 @@ a list of available X2Go sessions. .SH X2GO CLUSTER MODE If \fBx2golistsessions\fR is executed with the \fI--all-servers\fR option then the central database of your X2Go cluster is queried for running/suspended sessions belonging to the user executing this command. -These sessions may be active on any of the X2Go servers within you cluster. +These sessions may be active on any of the X2Go servers within your cluster. .SH RETURN VALUES A line-by-line list of available X2Go sessions. Each line consists of several session attribute fields separated by the pipe symbol (,,|''). 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

x2goclient.git - master (branch) updated: 4.0.0.0-6-gbae30fd
by git-admin＠x2go.org 18 Jan '13

18 Jan '13

The branch, master has been updated via bae30fd56eb3d3eaf36c8b039dd309e6445fb593 (commit) via 2e583c61cf93b6bb1a7c992e0bf5c9615245f2c0 (commit) from 2204400df14c96319fb54f84ad05f23946a4be35 (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 bae30fd56eb3d3eaf36c8b039dd309e6445fb593 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 18 21:00:16 2013 +0100 changelog cleanup commit 2e583c61cf93b6bb1a7c992e0bf5c9615245f2c0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 18 20:58:14 2013 +0100 More icon updates needed. Discovered during Debian package update. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +- icons/128x128/x2go.png | Bin 6210 -> 6085 bytes icons/128x128/x2gomailclient.png | Bin 3502 -> 19158 bytes icons/128x128/x2gosession.png | Bin 8786 -> 9324 bytes icons/16x16/x2go.png | Bin 518 -> 854 bytes icons/x2goclient.xpm | 319 +++++++++++++++++++++++++++++++++----- 6 files changed, 279 insertions(+), 45 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4f97ed6..2cc467b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,11 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.1.0): - - Continue development... + - More icon updates needed. Discovered during Debian package update. [ Oleksandr Shneyder ] - * fixed support for RSA Keys in X2Go Broker code + * New upstream version (4.0.1.0): + - Fix support for RSA Keys in X2Go Broker code. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 diff --git a/icons/128x128/x2go.png b/icons/128x128/x2go.png index 43e5f87..adc77f7 100644 Binary files a/icons/128x128/x2go.png and b/icons/128x128/x2go.png differ diff --git a/icons/128x128/x2gomailclient.png b/icons/128x128/x2gomailclient.png index 6bf39cd..55cd35f 100644 Binary files a/icons/128x128/x2gomailclient.png and b/icons/128x128/x2gomailclient.png differ diff --git a/icons/128x128/x2gosession.png b/icons/128x128/x2gosession.png index fdb4956..bf22738 100644 Binary files a/icons/128x128/x2gosession.png and b/icons/128x128/x2gosession.png differ diff --git a/icons/16x16/x2go.png b/icons/16x16/x2go.png index f014e76..3b5aad9 100644 Binary files a/icons/16x16/x2go.png and b/icons/16x16/x2go.png differ diff --git a/icons/x2goclient.xpm b/icons/x2goclient.xpm index 74d2262..3530d4d 100644 --- a/icons/x2goclient.xpm +++ b/icons/x2goclient.xpm @@ -1,47 +1,280 @@ /* XPM */ -static char *x_goclient_new[] = { +static char *x_goclient[] = { /* columns rows colors chars-per-pixel */ -"32 32 9 1", -" c #1C3C1C3C1C3C", -". c #1F5F1F5F1F5F", -"X c #228222822282", -"o c #25A625A625A6", -"O c #28C928C928C9", -"+ c #2BEC2BEC2BEC", -"@ c #2F0F2F0F2F0F", -"# c #323232323232", -"$ c None", +"32 32 242 2", +" c #353B54", +". c #3B3E52", +"X c #343D5A", +"o c #383F5A", +"O c #3D454F", +"+ c #3E4155", +"@ c #3A425E", +"# c #374263", +"$ c #3E4562", +"% c #33426E", +"& c #3C466C", +"* c #3E496E", +"= c #2F4575", +"- c #2F487C", +"; c #314373", +": c #3C4A73", +"> c #33467A", +", c #374B7C", +"< c #3F547F", +"1 c #42434F", +"2 c #4D4D4D", +"3 c #444553", +"4 c #464851", +"5 c #434559", +"6 c #47495B", +"7 c #404561", +"8 c #444A65", +"9 c #494D63", +"0 c #434C6B", +"q c #494F6D", +"w c #4C5165", +"e c #47516E", +"r c #4B546D", +"t c #545564", +"y c #555C65", +"u c #54556A", +"i c #555A6E", +"p c #5D5E6A", +"a c #444F76", +"s c #484F70", +"d c #4C5471", +"f c #4D5872", +"g c #46537B", +"h c #525672", +"j c #545B72", +"k c #5B5F73", +"l c #555E7B", +"z c #595E7B", +"x c #5E656D", +"c c #5D6074", +"v c #57627F", +"b c #5D637A", +"n c #636474", +"m c #656B73", +"M c #6A6F76", +"N c #62667C", +"B c #66697C", +"V c #6A6C7C", +"C c #6D727A", +"Z c #777777", +"A c #72757E", +"S c #73787F", +"D c #797979", +"F c #334E85", +"G c #3C5183", +"H c #37548C", +"J c #3C5489", +"K c #3D5A93", +"L c #345A9D", +"P c #415587", +"I c #455887", +"U c #4E5D85", +"Y c #455B8A", +"T c #4A5E8B", +"R c #475F95", +"E c #485E91", +"W c #4F628E", +"Q c #516186", +"! c #5A6482", +"~ c #53648C", +"^ c #596789", +"/ c #5B6A8C", +"( c #476196", +") c #496093", +"_ c #466199", +"` c #4B659C", +"' c #4F689E", +"] c #526491", +"[ c #546993", +"{ c #596992", +"} c #536C9E", +"| c #5E6F99", +" . c #5F7194", +".. c #646A83", +"X. c #696D82", +"o. c #626B8A", +"O. c #6F7287", +"+. c #6B718C", +"@. c #6D788F", +"#. c #747583", +"$. c #767A83", +"%. c #797D85", +"&. c #75778C", +"*. c #747A8D", +"=. c #7C7E8E", +"-. c #616D92", +";. c #667394", +":. c #6A7696", +">. c #6D7891", +",. c #6A7A9C", +"<. c #717792", +"1. c #7A7F96", +"2. c #787F9A", +"3. c #4F6DA4", +"4. c #546DA1", +"5. c #5770A0", +"6. c #5C74A3", +"7. c #5774A9", +"8. c #5C7AAE", +"9. c #4372BF", +"0. c #647BA7", +"q. c #6E7DA2", +"w. c #627EAF", +"e. c #4976C0", +"r. c #487CCD", +"t. c #7E828A", +"y. c #7E8293", +"u. c #7C829A", +"i. c #7284A3", +"p. c #7C86A1", +"a. c #7184AB", +"s. c #7887AA", +"d. c #7A8DAC", +"f. c #6683B3", +"g. c #6C89BB", +"h. c #728AB7", +"j. c #7E8FB1", +"k. c #4580D8", +"l. c #4C85DB", +"z. c #7492C2", +"x. c #7F9BC7", +"c. c #7393C9", +"v. c #6693D7", +"b. c #759EDD", +"n. c #78A0DE", +"m. c #518BE2", +"M. c #69A1F2", +"N. c #78ABF6", +"B. c #83848D", +"V. c #84898F", +"C. c #838591", +"Z. c #858990", +"A. c #898D93", +"S. c #86899D", +"D. c #8D8D9B", +"F. c #8F909C", +"G. c #93939E", +"H. c #868FA2", +"J. c #8C92A2", +"K. c #9296A5", +"L. c #9C9CA2", +"P. c #9D9DAB", +"I. c #8193B4", +"U. c #8A95B2", +"Y. c #8194B9", +"T. c #939CB0", +"R. c #9EA0A4", +"E. c #9FA0AC", +"W. c #8EA1BF", +"Q. c #A4A4A5", +"!. c #A2A4AD", +"~. c #ACACAC", +"^. c #A9ACB0", +"/. c #A3AABF", +"(. c #ADB0B5", +"). c #B3B3B4", +"_. c #B1B3B9", +"`. c #BBBBBD", +"'. c #879DC5", +"]. c #859FCB", +"[. c #8EA2C7", +"{. c #94A5C2", +"}. c #95A9CB", +"|. c #87A5D2", +" X c #88A6D3", +".X c #8FABD9", +"XX c #94ADD3", +"oX c #93AFDE", +"OX c #ABB7CE", +"+X c #ACB8CF", +"@X c #B1B8C4", +"#X c #BBBEC4", +"$X c #B7BECA", +"%X c #A4B6D2", +"&X c #A7B9D4", +"*X c #8BAEE3", +"=X c #9BB7E0", +"-X c #9BB8E1", +";X c #85B7FF", +":X c #8FBDFF", +">X c #91BEFE", +",X c #BBC1CD", +"<X c #97C1FF", +"1X c #9CC4FF", +"2X c #AAC0E0", +"3X c #AEC7EC", +"4X c #B6C7E4", +"5X c #BACCE5", +"6X c #A0C7FF", +"7X c #A6CAFF", +"8X c #ACCEFF", +"9X c #AFD0FF", +"0X c #B2D2FF", +"qX c #BAD6FF", +"wX c #BED8FF", +"eX c #C1C1C3", +"rX c #C6C6C8", +"tX c #CACACB", +"yX c #D9D9D9", +"uX c #CBD4E1", +"iX c #CAD7EA", +"pX c #CBD8EB", +"aX c #D0DCEE", +"sX c #C0D5F3", +"dX c #C4DCFE", +"fX c #C9DFFF", +"gX c #CDE1FF", +"hX c #D5E1F3", +"jX c #DAE4F2", +"kX c #D3E5FE", +"lX c #DBE7FA", +"zX c #DBEAFF", +"xX c #EAEAEC", +"cX c #E7EDF7", +"vX c #EFEFF0", +"bX c #E3EEFE", +"nX c #E7F1FF", +"mX c #EBF3FF", +"MX c #F1F7FF", +"NX c #F5F9FE", +"BX c #FEFEFE", +"VX c None", /* pixels */ -"$o$$$$$$$$$$$$$$$$$$$$$$$$$$$$o$", -"o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$ @###@$$$$$ ##@$$$", -"$$$$$$$$$$$$$$$$@##$$$$$$$O@$$$$", -"$$$$$$$$$$$$$$$$$## $$$$$$#$$$$$", -"$$$$$$$$$$$$$$$$$@#@$$$$$$o$$$$$", -"$$$$$$$$$$$$$$ o$ ##$$$$$#$$$$$$", -"$$$$$$$$$$$$$$$$$$##@$$$ o$$$$$$", -"$$$$$$$$$$$$$$$$$$X##$$$#$$$$$$$", -"$$$$$$$$$$$$$$Xo#$$##o$ o$$$$$$$", -"$$$$$$$$$$$$$$$$$$$@##$#$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$###o$$$$$$$$", -"$$$$$$$$$$$$$$ o@#o$@##$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$##$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$##@$$$$$$$$", -"$$$$$$$$$$$$$$$@###$X###$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$#$##@$$$$$$$", -"$$$$$$$$$$$$$$$$$$$ $o##$$$$$$$", -"$$$$$$$$$$$$$$$O#$$#$$$##o$$$$$$", -"$$$$$$$$$$$$$$$$$$ X$$$@##$$$$$$", -"$$$$$$$$$$$$$$$$$$#$$$$$## $$$$$", -"$$$$$$$$$$$$$$$X$X $$$$$###$$$$$", -"$$$$$$$$$$$$$$$$$#$$$$$$$##$$$$$", -"$$$$$$$$$$$$$$$$oX$$$$$$$##@$$$$", -"$$$$$$$$$$$$$$$$#$$$$$$$$o## $$$", -"$$$$$$$$$$$$$$ @#O$$$$$$ #### $$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"X$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o", -"$X$$$$$$$$$$$$$$$$$$$$$$$$$$$$o$" +"VXVXx m m m M M C C C A C S S S %.%.%.%.%.t.t.t.B.t.V.V.V.t.VXVX", +"VXM ~.BXBXBXBXBXBXBXBXBXBXNXNXNXNXNXNXBXBXBXBXBXBXBXBXBXBX(.R.VX", +"x _.BXBXBXBXBXBXBXBXNXNXmXmXmXnXnXnXmXMXMXBXBXBXBXBXBXBXBXBX(.B.", +"x BXBXBXBXBXBXBXNXMXmXbXlXzXzXzXzXzXzXbXnXmXMXNXBXBXBXBXBXBXBXA.", +"x BXeXL.V.A n n k p n n n 5X#.B.Z.D.G.G.B.zXbXnXC._.`.#XeXF.BXA.", +"x BXeXL.Z.#.V B N N ......}.}.+.Q.Q.~.y.dXgXzXlXnXS.yXrX_.BXBXA.", +"x BXBXBXBXvXjXuX5X&X{.I.i.:.;.oX=.Q.~.u.qXdXfXkXzXJ.yXP.BXBXBXA.", +"x BXeXL.C.V c i i j k b ..X.O.o.h.Q.~.G.8X0XqXfXkXE.!.NXBXBXBXA.", +"x BXtXL.t.X.c i i l c b ....O.*.g.1.~.).i.7X0XqXU.tX{.MXBXBXBXZ.", +"x BXBXMXnXkXwX3X-X Xh.f.6.[ ~ Q | 6.~.).S.1X7X0XE.K.lXbXMXBXBXD.", +"x BX#XK.y.! c l l l ! ! ! o.o.+.o.M.J.)._.z.1Xs.tX{.gXzXnXNXBXA.", +"x BX#XJ.*.b f r r r i v b ..#.=.C.{ -.).).1.>XE.J.qXfXlXnXNXBXA.", +"x BXcXpX5X2XXXx.g.8.7.3.` ( E T Q ~ m.Q.).).;.#X|.0XdXgXbXMXBXA.", +"x NX,XT.p.>./ / { ~ ] ~ ) ] { { | +.e.:.`.`.`.S.1X9XwXgXzXnXNXA.", +"x NX@XJ.>.! f w e r r f c N V #.C.D.&.r._.`.eXc.1X8XqXgXlXmXNXA.", +"y NXuX+X{.Y.a.f.6.} ' ` ` R ( ) ] { { e.y.`.eX,.1X8XqXfXzXmXNX%.", +"O NXuX&X{.j.i.f.6.4.` ` R R E E W ^ / 3.I Z Z k 1X8XqXfXzXnXNXO ", +"O NX,XH.>.v r * $ # X X . + 1 + r.+ 4 2 2 0.8XwXfXzXnXNXO ", +"O NX,XE.p.;.^ Q T I P G F > > = ; % L H 4 : 2 2 7 8XdXfXzXmXBXO ", +"O NXnXaX5X2XXXx.g.8.4._ K H F - = = l.+ & N.3 2 2 '.dXgXbXmXBXO ", +"O BX`.J.*.b r $ $ @ o @ o o + . + , J 4 v.;Xg 2 2 q fXkXbXNXBX1 ", +"O BX,XF.*.b j f e 0 * & & & & & # M.3 : ;X>X*X4 2 4 4XzXnXNXBXO ", +"O BXBXMXnXgXsX3X-X|.z.f.} T P : 3.I 4 b.>X1X7Xs 2 2 l bXMXBXBXO ", +"O BXrXR.y.X.k w 0 8 8 $ $ $ 7 @ b.5 a <X1X7X0X[.2 2 3 cXBXBXBXO ", +"O BXeXG.V.V i w 9 9 7 5 7 7 7 [ U 4 *X7X8X0XwXfX9 2 2 &.BXBXBXO ", +"O BXBXBXBXvXjXiX4X%XW.d.,./ ..X4 0 9X0XqXwXgXkX<.2 2 4 xXBXBX1 ", +"O BXeXR.V.#.N c j h h d d j.XX8 2 d qXdXfXgXkXzXK.2 2 2 u xXBXO ", +"O BXeXG.B.M p t 9 6 5 3 5 4X3 3 3 3 + kXkXzXbXu 3 3 5 5 5 3 BXO ", +"O BXBXBXBXBXBXBXBXmXnXbXhXzXzXzXzXzXzXbXbXnXMXBXBXBXBXBXBXBXBXO ", +"O _.BXBXBXBXBXBXBXBXBXMXmXmXnXnXbXnXmXmXMXBXBXBXBXBXBXBXBXBXQ.O ", +"VX4 ).BXBXBXBXBXBXBXBXBXBXBXNXNXNXNXNXBXBXBXBXBXBXBXBXBXBX(.4 VX", +"VXVXO O O O O O O O O O O O O O 1 O O O O O O O O O O O O O VXVX" }; 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

python-x2go.git - master (branch) updated: 0.2.1.1-32-g3133baf
by git-admin＠x2go.org 17 Jan '13

17 Jan '13

The branch, master has been updated via 3133baf8a3c0e8dc6d80bad8d5aef6b0d0f34862 (commit) via eb0cf279859b9ac49f72cda07b8ca7730dfe7a7e (commit) from 5415362f73739312014478cb6b382369dbd3d5c7 (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 3133baf8a3c0e8dc6d80bad8d5aef6b0d0f34862 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 17 11:24:29 2013 +0100 return success of writing a session profile configuration to disk commit eb0cf279859b9ac49f72cda07b8ca7730dfe7a7e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 17 11:17:08 2013 +0100 only prep fake_hostname if unique_hostkey_aliases is set to True ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 3 ++- x2go/backends/profiles/_file.py | 2 +- x2go/inifiles.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index a8e8fca..b8c4c10 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -732,7 +732,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): self.unique_hostkey_aliases = unique_hostkey_aliases # prep the fake hostname with the real hostname, so we trigger the corresponding code path in # x2go.checkhosts and either of its missing host key policies - _fake_hostname = "[%s]:%s" % (hostname, port) + if self.unique_hostkey_aliases: + _fake_hostname = "[%s]:%s" % (hostname, port) if use_sshproxy and sshproxy_host and sshproxy_user: try: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index fcf678f..5320299 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -159,7 +159,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): self._profiles_need_profile_id_renewal = [] # at last write the profile config as is... - inifiles.X2GoIniFile.write(self) + return inifiles.X2GoIniFile.write(self) def get_profile_option_type(self, option): diff --git a/x2go/inifiles.py b/x2go/inifiles.py index d659f09..5b4f56d 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -215,8 +215,8 @@ class X2GoIniFile(object): fd.close() self.write_user_config = False return True - except: - pass + except Exception, e: + print e return False def get_type(self, section, key): 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

x2goclient.git - master (branch) updated: 4.0.0.0-4-g2204400
by git-admin＠x2go.org 16 Jan '13

16 Jan '13

The branch, master has been updated via 2204400df14c96319fb54f84ad05f23946a4be35 (commit) from b7bfb4baa723b10ef23f75034cc8dd95287a8faf (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 2204400df14c96319fb54f84ad05f23946a4be35 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Jan 16 14:10:44 2013 +0100 fixed support for RSA Keys in X2Go Broker code ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ httpbrokerclient.cpp | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 696fd8d..4f97ed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (4.0.1.0): - Continue development... + [ Oleksandr Shneyder ] + * fixed support for RSA Keys in X2Go Broker code + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 x2goclient (4.0.0.1-0~x2go1) unstable; urgency=low diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index f473a96..fe6d89f 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -250,7 +250,7 @@ void HttpBrokerClient::getUserSessions() void HttpBrokerClient::selectUserSession(const QString& session) { - QString brokerUser=config->brokerUser; + QString brokerUser=config->brokerUser; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); @@ -279,7 +279,7 @@ void HttpBrokerClient::selectUserSession(const QString& session) void HttpBrokerClient::changePassword(QString newPass) { newBrokerPass=newPass; - QString brokerUser=config->brokerUser; + QString brokerUser=config->brokerUser; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); @@ -460,8 +460,15 @@ void HttpBrokerClient::parseSession(QString sinfo) x2goDebug<<"starting parser\n"; QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts); int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----"); + if(keyStartPos==-1) + keyStartPos=sinfo.indexOf("-----BEGIN RSA PRIVATE KEY-----"); QString endStr="-----END DSA PRIVATE KEY-----"; int keyEndPos=sinfo.indexOf(endStr); + if(keyEndPos==-1) + { + endStr="-----END RSA PRIVATE KEY-----"; + keyEndPos=sinfo.indexOf(endStr); + } if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0)) config->key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos); QString serverLine=(lst[1].split("\n"))[0]; 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

pyhoca-gui.git - master (branch) updated: 0.2.1.1-43-gff2c502
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via ff2c5020c462c1ee05ef32b82c60dd6ccf22777e (commit) from 9f6c08f94d52c5c662fcfae91c2da524521ace4c (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 ff2c5020c462c1ee05ef32b82c60dd6ccf22777e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 10:38:26 2013 +0100 disable UniqueHostAliases checkbox in profile manager when connected ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index c0f7b32..71fd136 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1207,6 +1207,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort.Enable(False) self.SSHKeyFileLabel.Enable(False) self.SSHKeyFile.Enable(False) + self.UniqueHostAliases.Enable(False) self.SSHAutoLogin.Enable(False) if PARAMIKO_FEATURE['forward-ssh-agent']: self.SSHForwardAuthAgent.Enable(False) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-42-g9f6c08f
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 9f6c08f94d52c5c662fcfae91c2da524521ace4c (commit) from 1f9b6304ae56a69d46c6748f221ed326f48065aa (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 9f6c08f94d52c5c662fcfae91c2da524521ace4c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:56:13 2013 +0100 make unique aliases code always available. ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 42 ++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 23 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 504e33e..c0f7b32 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -261,12 +261,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for X2Go authentication")) if PARAMIKO_FEATURE['forward-ssh-agent']: self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections")) + self.UniqueHostKeyAliases = wx.CheckBox(self.tab_Connection, -1, _(u"Store SSH host keys under (unique) X2Go session profile ID")) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ") self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxySameUser = wx.CheckBox(self.tab_Connection, -1, _(u"Use same username for X2Go and proxy host")) self.SSHProxySamePassword = wx.CheckBox(self.tab_Connection, -1, _(u"Use same authentication for X2Go and proxy host")) - self.SSHProxyUniqueHostKeyAliases = wx.CheckBox(self.tab_Connection, -1, _(u"Store SSH host keys under (unique) X2Go session profile ID")) self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+": ") self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) @@ -569,7 +569,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ## CONNECTION TAB sizer_3 = wx.BoxSizer(wx.VERTICAL) sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL) - sizer_3_1_1 = wx.GridBagSizer(hgap=5,vgap=6) + sizer_3_1_1 = wx.GridBagSizer(hgap=6,vgap=6) sizer_3_1_1.Add(self.UserNameLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1_1.Add(self.UserName, pos=(0,1)) sizer_3_1_1.Add((16,0), pos=(0,2)) @@ -583,25 +583,25 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) if PARAMIKO_FEATURE['forward-ssh-agent']: sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1.Add(self.UseSSHProxy, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.UniqueHostKeyAliases, pos=(4,0), span=(1,6)) + sizer_3_1_1.Add(self.UseSSHProxy, pos=(5,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Proxy, wx.VERTICAL) sizer_3_2_1 = wx.GridBagSizer(hgap=6,vgap=6) - sizer_3_2_1.Add(self.SSHProxyUniqueHostKeyAliases, pos=(0,0), span=(1,6)) - sizer_3_2_1.Add(self.SSHProxySameUser, pos=(1,0), span=(1,6)) - sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyUser, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add((16,0), pos=(3,2)) - sizer_3_2_1.Add(self.SSHProxyKeyFileLabel, pos=(3,3), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyKeyFile, pos=(3,4), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyKeyFileBrowseButton, pos=(3,5), flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_3_2_1.Add(self.SSHProxyHostLabel, pos=(4,0), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyHost, pos=(4,1), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(4,3), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyPort, pos=(4,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(5,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxySameUser, pos=(0,0), span=(1,6)) + sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(1,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyUser, pos=(2,1), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add((16,0), pos=(2,2)) + sizer_3_2_1.Add(self.SSHProxyKeyFileLabel, pos=(2,3), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyKeyFile, pos=(2,4), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyKeyFileBrowseButton, pos=(2,5), flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_3_2_1.Add(self.SSHProxyHostLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyHost, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(3,3), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) @@ -846,7 +846,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHKeyFile.Enable(False) self.SSHKeyFileBrowseButton.Enable(False) self.UseSSHProxy.SetValue(self.profile_config['usesshproxy']) - self.SSHProxyUniqueHostKeyAliases.SetValue(self.profile_config['uniquehostkeyaliases']) + self.UniqueHostKeyAliases.SetValue(self.profile_config['uniquehostkeyaliases']) self.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin']) _ssh_proxy = self.profile_config['usesshproxy'] @@ -1224,7 +1224,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyPortLabel.Enable(False) self.SSHProxyPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) - self.SSHProxyUniqueHostKeyAliases.Enable(False) def __update_from_screen(self): @@ -1268,7 +1267,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if self.profile_config.has_key('sshproxytunnel'): self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_REMOVED' self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue() - self.profile_config['uniquehostkeyaliases'] = self.SSHProxyUniqueHostKeyAliases.GetValue() + self.profile_config['uniquehostkeyaliases'] = self.UniqueHostKeyAliases.GetValue() if self.profile_config['sshproxysameuser']: self.profile_config['sshproxyuser'] = '' else: @@ -1490,7 +1489,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyPortLabel.Enable(False) self.SSHProxyPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) - self.SSHProxyUniqueHostKeyAliases.Enable(False) self.LinkSpeed.Enable(False) self.ModemLabel.Enable(False) self.ISDNLabel.Enable(False) @@ -1916,7 +1914,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if self.SSHProxyAutoLogin.GetValue(): self.SSHProxyKeyFileLabel.Enable(False) self.SSHProxyAutoLogin.Enable(True) - self.SSHProxyUniqueHostKeyAliases.Enable(True) else: self.staticbox_Proxy.Enable(False) self.SSHProxySameUser.Enable(False) @@ -1931,7 +1928,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyKeyFile.Enable(False) self.SSHProxyKeyFileBrowseButton.Enable(False) self.SSHProxyAutoLogin.Enable(False) - self.SSHProxyUniqueHostKeyAliases.Enable(False) def OnSetKeyboard(self, event): """\ hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2013