x2go-commits November 2012

x2go-commits@lists.x2go.org

1 participants
327 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-102-g88389bf
by git-admin＠x2go.org 30 Nov '12

30 Nov '12

The branch, master has been updated via 88389bf045c33d96260ce5b1c6af92ff5d858e8f (commit) from 03afe809d558b5aa87205e09b28b85ca3ff1dc26 (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 88389bf045c33d96260ce5b1c6af92ff5d858e8f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 30 08:39:42 2012 +0100 Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream issue #67). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gomountdirs | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6a2246e..03e44ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.10): - Adapt Xinerama path in x2gopath: use $base for detecting the path to the Xinerama libs, as well, as is done with all the other paths. + - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream + issue #67). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index b008d1c..b9f9431 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -200,6 +200,7 @@ for (my $i=0;$i<@dirs;$i++) my $printspool=0; my $mimeboxspool=0; my $mntpath; + my $this_mdir = $mdir; if(@dirs[$i]=~m/__PRINT_SPOOL_/) { @dirs[$i]=~s/__PRINT_SPOOL_//; @@ -222,24 +223,24 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/\/ramdrive\/mnt\///; if ($p =~ m/CDROM/) { - $mdir=$mdir."/cd"; + $this_mdir=$this_mdir."/cd"; } else { - $mdir=$mdir."/rm"; + $this_mdir=$this_mdir."/rm"; } } else { - $mdir=$mdir."/disk"; + $this_mdir=$this_mdir."/disk"; } $p=~s/\//_/g; $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; $p=~s/~//g; - mkdir("$mdir/$p"); - $mntpath="$mdir/$p"; + mkdir("$this_mdir/$p"); + $mntpath="$this_mdir/$p"; } if (db_insertmount( $session, $mntpath, $host)) 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/3.1.1.x (branch) updated: 3.1.1.9-5-g5a0b2ca
by git-admin＠x2go.org 30 Nov '12

30 Nov '12

The branch, release/3.1.1.x has been updated via 5a0b2cacaf99cefe524fd398b072aecb0710bbd7 (commit) from 8292c49e91d6ab71826715e89ee09261e4acf670 (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 5a0b2cacaf99cefe524fd398b072aecb0710bbd7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 30 08:39:42 2012 +0100 Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream issue #67). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gomountdirs | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6180211..b703359 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.10): - Adapt Xinerama path in x2gopath: use $base for detecting the path to the Xinerama libs, as well, as is done with all the other paths. + - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream + issue #67). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 8436219..5ebf101 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -221,6 +221,7 @@ for (my $i=0;$i<@dirs;$i++) my $printspool=0; my $mimeboxspool=0; my $mntpath; + my $this_mdir = $mdir; if(@dirs[$i]=~m/__PRINT_SPOOL_/) { @dirs[$i]=~s/__PRINT_SPOOL_//; @@ -243,24 +244,24 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/\/ramdrive\/mnt\///; if ($p =~ m/CDROM/) { - $mdir=$mdir."/cd"; + $this_mdir=$this_mdir."/cd"; } else { - $mdir=$mdir."/rm"; + $this_mdir=$this_mdir."/rm"; } } else { - $mdir=$mdir."/disk"; + $this_mdir=$this_mdir."/disk"; } $p=~s/\//_/g; $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; $p=~s/~//g; - mkdir("$mdir/$p"); - $mntpath="$mdir/$p"; + mkdir("$this_mdir/$p"); + $mntpath="$this_mdir/$p"; } if (db_insertmount( $session, $mntpath, $host)) hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2gobroker.git - master (branch) updated: 9adabffa81c28e09169d03ea0df588e926476350
by git-admin＠x2go.org 30 Nov '12

30 Nov '12

The branch, master has been updated via 9adabffa81c28e09169d03ea0df588e926476350 (commit) from a98cb7c746281aaccb47f5d47b51e968e2316fc6 (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 9adabffa81c28e09169d03ea0df588e926476350 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 30 08:30:44 2012 +0100 draft for possible configuration file ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 86 ++++++++++++++++++++++++++++++++++++++++++++---- x2gobroker/defaults.py | 38 +++++++++++++++++++++ 2 files changed, 117 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index a1b56f5..0123e60 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -18,14 +18,86 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -[common] -backend=zeroconf +### +### GLOBAL section +### + +[global] + +# Possible X2Go Session Broker backends: +# +# 1. backend = zeroconf +# Use the ZeroConf X2Go Session Broker backend, this backend is for demo only +# and only operates on localhost. Make sure you have x2gobroker, x2gobroker-agent +# and x2goserver installed on the same machine. + +# 2. backend = simple +# The Simple X2Go Session Broker backend is for providing session profiles +# to multiple users/clients on a text config file basis. +# Authentication is required, make sure you have a working PAM setup. The +# session profile setup is accomplished by two files, a session profile +# list and a session profile map. The session profile map defines what user +# will get offered what session profile(s). + +# 3. backend = minibalancer +# A minimal load balancer for an X2Go server farm. Provide the same set of +# session profiles to multiple users, optimally without login (set check_credentials +# to false, below) and offer one of several pre-configured X2Go servers running +# the same setup. + +# 4. backend = ldap +# A production backend that stores all session profile, server and session +# profile mapping in LDAP + +backend = zeroconf + +# Allow unauthenticated connections? Then set check_credentials to false (i.e. 0) +check-credentials = true + +# To secure server-client communication the client can start the communication +# with a pre-set, agreed on authentication ID. Set the below value to 1 to make +# use of this feature +use-authid = false + +# X2Go supports two different auth ID modes (static and dynamic), for now set the +# below value to true +use-static-authid = true + +# Make up your own static_authid below... +static-authid = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> + +# X2Go Session Broker knows about two output formats: a text/html based output +# and a text/json based output. The different outputs run under different URLs + +# enable {base_url}/html/ +enable-html-output = true + +# enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) +enable-json-output = false + +### +### configurations for individual session brokers +### + +[zeroconf] +enable = true [simple] -#... +enable = false +session-profiles = /etc/x2go/x2gobroker-simple-sessionprofiles.conf +session-profiles-map = /etc/x2go/x2gobroker-simple-sessionprofilesmap.conf + +[loadbalancer] +enable = false +session-profiles = /etc/x2go/x2gobroker-loadbalancer-sessionprofiles.conf +server-list-PROFILENAME1 = server1.profile1.mydomain.tld, server2.profile1.mydomain.tld, server3.profile1.mydomain.tld +server-list-PROFILENAME2 = server1.profile2.mydomain.tld, server2.profile2.mydomain.tld [ldap] -ldapuri=ldap://<ldapmaster.localdomain> -#replica=ldapi:/// -binddn="cn=admin,dc=example,dc=net" -bindpw="<very-secret>" +enable = false +uri = ldap://localhost:389 +base = dc=example,dc=org +user-search-filter = (&(objectClass=posixAccount)(uid=*)) +host-search-filter = (&(objectClass=ipHost)(serial=X2GoServer)(cn=*)) +group-search-filter = (&(objectClass=posifxGroup)(cn=*)) +starttls = false diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 5357045..d3de516 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -19,5 +19,43 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +import uuid + # FIXME: this path must not be hard-coded X2GOBROKER_AGENT_CMD="/usr/lib/x2gobroker-agent" + +# defaults for X2Go Sessino Broker configuration file +X2GOBROKER_CONFIG_DEFAULTS = { + 'global': { + 'backend': 'zeroconf', + 'check-credentials': True, + 'use-authid': False, + 'use-static-authid': true, + 'static-authid': uuid.uuid4(), + 'enable-html-output': True, + 'enable-json-output': False, + }, + 'zeroconf': { + 'enable': True, + } + 'simple': { + 'enable': False, + 'session-profiles': '/etc/x2go/x2gobroker-simple-sessionprofiles.conf', + 'session-profiles-map': '/etc/x2go/x2gobroker-simple-sessionprofilesmap.conf', + }, + 'loadbalancer': { + 'enable': False, + 'session-profiles': '/etc/x2go/x2gobroker-loadbalancer-sessionprofiles.conf', + 'server-list-PROFILENAME1': ['server1.profile1.mydomain.tld','server2.profile1.mydomain.tld','server3.profile1.mydomain.tld',], + 'server-list-PROFILENAME2': ['server1.profile2.mydomain.tld','server2.profile2.mydomain.tld',], + } + 'ldap': { + 'enable': False, + 'uri': 'ldap://localhost:389', + 'base': 'dc=example,dc=org', + 'user-search-filter': '(&(objectClass=posixAccount)(uid=*))', + 'host-search-filter': '(&(objectClass=ipHost)(serial=X2GoServer)(cn=*))', + 'group-search-filter': '(&(objectClass=posifxGroup)(cn=*))', + 'starttls': False, + }, +} hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-95-g3bb8542
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via 3bb8542118d12a81d4017908337d1ce39e9e2eb8 (commit) from a853ca8373782108de71c4a24189e0d60703ac98 (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 3bb8542118d12a81d4017908337d1ce39e9e2eb8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 23:37:20 2012 +0100 fix indentations in default.py ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 58a0615..15ea901 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -179,33 +179,33 @@ X2GO_CLIENTSETTINGS_DEFAULTS = { 'server': 'localhost', 'port1': 0, 'port2': 0, - }, + }, 'General': { # clientport is not needed for Python X2go 'clientport': 22, 'autoresume': True, - }, + }, 'Authorization': { 'newprofile': True, 'suspend': True, 'editprofile': True, 'resume': True - }, + }, 'trayicon': { 'enabled': True, 'mintotray': True, 'noclose': True, 'mincon': True, 'maxdiscon': True, - }, - } + }, +} X2GO_CLIENTPRINTING_DEFAULTS = { 'General': { # showdialog will result in a print action that allows opening a print dialog box 'showdialog': False, # if true, open a PDF viewer (or save as PDF file). If false, print via CUPS or print command 'pdfview': True, - }, + }, 'print': { # If false, print via CUPS. If true, run "command" to process the print job 'startcmd': False, @@ -215,7 +215,7 @@ X2GO_CLIENTPRINTING_DEFAULTS = { 'stdin': False, # ignored in Python X2go 'ps': False, - }, + }, 'save': { # a path relative to the user's home directory 'folder': 'PDF', @@ -227,13 +227,13 @@ X2GO_CLIENTPRINTING_DEFAULTS = { 'open': True, # command to execute as PDF viewer 'command': 'xpdf', - }, + }, 'CUPS': { # default print queue for CUPS, if print queue does not exist, the default # CUPS queue is detected 'defaultprinter': 'PDF', - }, - } + }, +} if X2GOCLIENT_OS == 'Windows': X2GO_CLIENTPRINTING_DEFAULTS['print'].update({'gsprint': os.path.join(os.environ['ProgramFiles'], 'GhostGum', 'gsview', 'gsprint.exe'), }) @@ -250,7 +250,7 @@ if X2GOCLIENT_OS == 'Windows': 'test_installed': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), 'run_command': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], - }, + }, 'VcXsrv': { 'display': 'localhost:40', 'last_display': 'localhost:40', @@ -258,7 +258,7 @@ if X2GOCLIENT_OS == 'Windows': 'test_installed': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), 'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], - }, + }, 'VcXsrv_shipped': { 'display': 'localhost:40', 'last_display': 'localhost:40', @@ -266,7 +266,7 @@ if X2GOCLIENT_OS == 'Windows': 'test_installed': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], - }, + }, 'VcXsrv_development': { 'display': 'localhost:40', 'last_display': 'localhost:40', @@ -274,7 +274,7 @@ if X2GOCLIENT_OS == 'Windows': 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], - }, + }, 'Xming': { 'display': 'localhost:40', 'last_display': 'localhost:40', @@ -282,8 +282,8 @@ if X2GOCLIENT_OS == 'Windows': 'test_installed': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), 'run_command': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], - }, - } + }, + } else: # make the variable available when building API documentation with epydoc X2GO_CLIENTXCONFIG_DEFAULTS = {} @@ -310,7 +310,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '', 'print': False, 'xdmcpserver': 'localhost', - } +} """L{X2goSessionProfiles} default values to fill a new session profile with.""" ## ## X2Go Proxy defaults 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

python-pampy.git - squeeze-backports (branch) created: debian/0.1.4-1-1-g52b0b06
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, squeeze-backports has been created at 52b0b06c6ea97747b3dbffcf0843e4c09577be96 (commit) - Log ----------------------------------------------------------------- commit 52b0b06c6ea97747b3dbffcf0843e4c09577be96 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 21:44:14 2012 +0100 first attempt to get the package build against squeeze ----------------------------------------------------------------------- hooks/post-receive -- python-pampy.git (providing Launchpad import (for Ubuntu packages), related to X2Go project) 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-pampy.git" (providing Launchpad import (for Ubuntu packages), related to X2Go project).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-67-gdf05dba
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via df05dba7a9a5f3b183a88af780c25fb6030c0f58 (commit) from d2cc801523e925317f3b3eddde55910075aaf7a1 (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 df05dba7a9a5f3b183a88af780c25fb6030c0f58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 21:34:11 2012 +0100 Use expand_file from File::Path::Expand to detect full path of ~x2gothinclient/.halt. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2gothinclient/sbin/x2gothinclientd | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fb55b78..c9ad056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,7 +71,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low + Update pointer to X2Go TCE documentation on http://wiki.x2go.org. [ Oleksandr Shneyder ] - * modified x2gothinclientd to find /var/lib/x2goclient/.halt + * New upstream version (1.0.99.1): + - Use expand_file from File::Path::Expand to detect full path + of ~x2gothinclient/.halt. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 6a406c3..3ccb7d8 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -20,6 +20,7 @@ use strict; +use File::Path::Expand; use IPC::Open3; sub catch_term @@ -93,7 +94,7 @@ elsif ($pid == 0 ) while(sleep 1) { # test if shutdown button on X2Go Client was clicked - if ( -e "/var/lib/x2gothinclient/.halt") + if (-e expand_file("~x2gothinclient/.halt")) { # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-67-gbdd10f0
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via bdd10f0f95071f148a94fb28dba15449b5ccf8e9 (commit) from d2cc801523e925317f3b3eddde55910075aaf7a1 (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 bdd10f0f95071f148a94fb28dba15449b5ccf8e9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 21:32:56 2012 +0100 Use expand_file from File::Path::Expand to detect full path of ~x2gothinclient/.halt. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2gothinclient/sbin/x2gothinclientd | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fb55b78..c9ad056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,7 +71,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low + Update pointer to X2Go TCE documentation on http://wiki.x2go.org. [ Oleksandr Shneyder ] - * modified x2gothinclientd to find /var/lib/x2goclient/.halt + * New upstream version (1.0.99.1): + - Use expand_file from File::Path::Expand to detect full path + of ~x2gothinclient/.halt. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 6a406c3..75901cf 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -93,7 +93,7 @@ elsif ($pid == 0 ) while(sleep 1) { # test if shutdown button on X2Go Client was clicked - if ( -e "/var/lib/x2gothinclient/.halt") + if (-e expand_file("~x2gothinclient/.halt")) { # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gobroker.git - master (branch) updated: a98cb7c746281aaccb47f5d47b51e968e2316fc6
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via a98cb7c746281aaccb47f5d47b51e968e2316fc6 (commit) from 84a07a50c36aca75f0f869c0c0d5e62aff714745 (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 a98cb7c746281aaccb47f5d47b51e968e2316fc6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 17:36:41 2012 +0100 /debian/control: python-x2gobroker depends on python-pampy ----------------------------------------------------------------------- Summary of changes: Makefile | 3 +-- debian/control | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 3a68e40..1293dab 100755 --- a/Makefile +++ b/Makefile @@ -55,8 +55,7 @@ build_setuidwrappers: gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: -# $(PERL) Makefile.PL INSTALLDIRS=vendor -# $(MAKE) -f Makefile.perl +# run setup.py build+install somewhere here... distclean: clean diff --git a/debian/control b/debian/control index 1c22572..62e4fcf 100644 --- a/debian/control +++ b/debian/control @@ -111,6 +111,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, + python-pampy, Suggests: apache2 | httpd, Description: X2Go http(s) based session broker (Python modules) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-pampy.git - pristine-tar (branch) created: 4bc9bdb13b4008640bfbeab8feb434470dbd5add
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, pristine-tar has been created at 4bc9bdb13b4008640bfbeab8feb434470dbd5add (commit) - Log ----------------------------------------------------------------- commit 4bc9bdb13b4008640bfbeab8feb434470dbd5add Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 17:28:55 2012 +0100 pristine-tar data for python-pampy_0.1.4.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-pampy.git (Debian package python-pampy) 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-pampy.git" (Debian package python-pampy).

1 0

python-pampy.git - upstream (branch) created: b509c1c75120a6409c44243112d3783814f97fea
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, upstream has been created at b509c1c75120a6409c44243112d3783814f97fea (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- python-pampy.git (Debian package python-pampy) 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-pampy.git" (Debian package python-pampy).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2012