x2go-commits February 2013

x2go-commits@lists.x2go.org

1 participants
165 discussions

python-x2go.git - master (branch) updated: 0.2.1.1-44-g810c1e9
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via 810c1e98f0e38a4cc5364aac2f2832264bd56e58 (commit) from a93d4f2646aa310295eacaf4f7c6b1bb2566c19e (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 810c1e98f0e38a4cc5364aac2f2832264bd56e58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 08:41:43 2013 +0100 modify low_latency for already initialized control sessions ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 7a66bbd..1c94138 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -608,6 +608,8 @@ class X2GoSession(object): ssh_rootdir=self.ssh_rootdir, low_latency=low_latency, logger=self.logger) + else: + self.control_session.low_latency = low_latency __init_control_session = init_control_session def is_master_session(self): 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

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-6-g258902b
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via 258902bec76cc4828ab7453df7406957ce93048a (commit) from d439556ff1b83aecb10991cf0f031fd4da23494e (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 258902bec76cc4828ab7453df7406957ce93048a Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Tue Feb 12 08:32:30 2013 +0100 Avoid building of libxcomp1 (which actually is identical to libxcomp3, just with a wrong name). (Fixes: #104). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../053_nx-X11_no-xcomp1-install-target.full.patch | 29 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) create mode 100644 debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e437dc2..7260164 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low [ Orion Poplawski ] * Fix wrong symlink direction of libNX_* files. (Fixes: #107). + * Avoid building of libxcomp1 (which actually is identical to libxcomp3, + just with a wrong name). (Fixes: #104). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100 diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch new file mode 100644 index 0000000..eca4200 --- /dev/null +++ b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch @@ -0,0 +1,29 @@ +--- a/nx-X11/lib/X11/Imakefile 2013-01-04 05:25:49.000000000 -0700 ++++ b/nx-X11/lib/X11/Imakefile 2013-01-15 15:26:07.969167259 -0700 +@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp + NX_XCOMPLIBLINK = Xcomp + NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) + NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) +-NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) + NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status + + NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext +@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOM + + all:: $(NX_XCOMPLIBTARGET) + +-$(NX_XCOMPDEPTARGET): +- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) +- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1 +- + depend:: $(NX_XCOMPLIBTARGET) + +-all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET) +- +-clean:: +- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) +- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1 ++all:: $(NX_XCOMPEXTLIBTARGET) + + #endif + diff --git a/debian/patches/series b/debian/patches/series index 5099b99..82977ef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ 031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch 052_nxcomp_macos10-nxauth-location.full+lite.patch +053_nx-X11_no-xcomp1-install-target.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-5-gd439556
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via d439556ff1b83aecb10991cf0f031fd4da23494e (commit) from cf521a4b6c4362a7160adbbcc83e3771e671d5d4 (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 d439556ff1b83aecb10991cf0f031fd4da23494e Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Tue Feb 12 08:13:37 2013 +0100 Fix wrong symlink direction of libNX_* files. (Fixes: #107). ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 14 +++++--------- debian/changelog | 4 ++++ 2 files changed, 9 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 93c7627..74f0d3a 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -92,22 +92,18 @@ install-full: # copy headers (for libnx-x11-dev) cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include - # copy libs (for libnx-x11) - find nx-X11/exports/lib/ | egrep "^.*\.so$$" | while read libpath; do \ + # copy libs (for libnx-x11), we want the targets of the links + find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \ libfile=$$(basename $$libpath); \ libdir=$$(dirname $$libpath); \ + link=$$(readlink $$libpath); \ \ mkdir -p $${libdir//exports/.build-exports}; \ - cp -L $$libpath $${libdir//exports/.build-exports}; \ - \ - find $$libdir/$$libfile.* | while read symlink; do \ - ln -s $$libfile $${libdir//exports/.build-exports}/$$(basename $$symlink); \ - done; \ + cp -a $${libpath/$$libfile/$$link} $${libdir//exports/.build-exports}; \ done; $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 - $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so $(DESTDIR)$(NXLIBDIR)/X11/ - $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* $(DESTDIR)$(NXLIBDIR)/X11/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/ find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ while read dirname; do \ diff --git a/debian/changelog b/debian/changelog index b7f95fe..e437dc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan Engelhard. + [ Orion Poplawski ] + * Fix wrong symlink direction of libNX_* files. (Fixes: #107). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100 nx-libs (2:3.5.0.17-0) unstable; urgency=low hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-43-ga93d4f2
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via a93d4f2646aa310295eacaf4f7c6b1bb2566c19e (commit) via 79f1296a15b362e57161632519c796ea43994104 (commit) from 5e85771f2aeb7d3095a72409b783e96934c788ef (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 a93d4f2646aa310295eacaf4f7c6b1bb2566c19e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 06:33:27 2013 +0100 Add low latency support for link types 'modem' and 'isdn'. Selecting either link quality will double nearly all connection timeout values. (Fixes: #53). commit 79f1296a15b362e57161632519c796ea43994104 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 00:43:14 2013 +0100 add fixure for X2Go BTS issue #23 (2) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++++--- x2go/backends/control/_stdout.py | 15 +++++++++++++++ x2go/session.py | 3 +++ 3 files changed, 25 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2075955..b42d0b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,10 +13,11 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.0): - Add session profile option ,,display'' to default session profile options. - Catch any kind of exception when writing session profile files and return - True or False in cases where I/O errors occur. (Fixes: #23). + True or False in cases where I/O errors occur. - Avoid the known_hosts file being flushed with localhost:[<someport>] entries. Store host keys of SSH-proxied hosts under the [<address>]:<port> - the system has _behind_ the SSH proxy gateway. (Hopefully fixes: #18). + the system has _behind_ the SSH proxy gateway. (Hopefully fixes: #18, + partially fixes: #53). - Add session profile option: uniquehostkeyaliases. Allow the (by-design-unique) X2Go session profile ID to be a representative for <hostname>:<port>. Update session profile IDs on hostname changes. @@ -31,6 +32,9 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low - Sort X2Go feature list, add force option for X2GoClient queries of server features and server components. Add alias get_server_components (for get_server_versions). + - Add low latency support for link types 'modem' and 'isdn'. Selecting + either link quality will double nearly all connection timeout values. + (Fixes: #53). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 @@ -48,7 +52,7 @@ python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low under the same user ID, we have to strictly differentiate between running/suspend sessions associated to the several connected session profiles. - - Make connection disruptures more robust. + - Make connection disruptures more robust. (Fixes: #23). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Dec 2012 12:36:34 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index fdf8449..0050147 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -128,6 +128,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): ssh_rootdir=os.path.join(defaults.LOCAL_HOME, defaults.X2GO_SSH_ROOTDIR), logger=None, loglevel=log.loglevel_DEFAULT, published_applications_no_submenus=0, + low_latency=False, **kwargs): """\ Initialize an X2Go control session. For each connected session profile there will be one SSH-based @@ -170,6 +171,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: C{int} + @param low_latency: set this boolean switch for weak connections, it will double all timeout values. + @type low_latency: C{bool} @param kwargs: catch any non-defined parameters in C{kwargs} @type kwargs: C{dict} @@ -223,6 +226,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): self.session_died = False + self.low_latency = low_latency + self.published_applications_no_submenus = published_applications_no_submenus self._already_querying_published_applications = threading.Lock() @@ -394,6 +399,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): ssh_transport = self.get_transport() if ssh_transport and ssh_transport.is_authenticated(): + if self.low_latency: timeout = timeout * 2 timer = gevent.Timeout(timeout) timer.start() try: @@ -837,6 +843,9 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if forward_sshagent is not None: self.forward_sshagent = forward_sshagent + if timeout and self.low_latency: + timeout = timeout * 2 + if key_filename or pkey or look_for_keys or allow_agent or (password and force_password_auth): try: if password and force_password_auth: @@ -1403,6 +1412,9 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): # this _success loop will catch errors in case the x2golistsessions output is corrupt # this should not be needed and is a workaround for the current X2Go server implementation + if self.low_latency: + maxwait = maxwait * 2 + timeout = gevent.Timeout(maxwait) timeout.start() try: @@ -1445,6 +1457,9 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): else: + if self.low_latency: + maxwait = maxwait * 2 + # this _success loop will catch errors in case the x2golistmounts output is corrupt timeout = gevent.Timeout(maxwait) diff --git a/x2go/session.py b/x2go/session.py index 2b70432..7a66bbd 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -591,6 +591,8 @@ class X2GoSession(object): Initialize a new control session (C{X2GoControlSession*}). """ + low_latency = self.terminal_params.has_key('link') and self.terminal_params['link'].lower() in ('modem', 'isdn') + if self.control_session is None: self.logger('initializing X2GoControlSession', loglevel=log.loglevel_DEBUG) self.control_session = self.control_backend(profile_name=self.profile_name, @@ -604,6 +606,7 @@ class X2GoSession(object): client_rootdir=self.client_rootdir, sessions_rootdir=self.sessions_rootdir, ssh_rootdir=self.ssh_rootdir, + low_latency=low_latency, logger=self.logger) __init_control_session = init_control_session 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-x2go.git - master (branch) updated: 0.2.1.1-41-g5e85771
by git-admin＠x2go.org 11 Feb '13

11 Feb '13

The branch, master has been updated via 5e85771f2aeb7d3095a72409b783e96934c788ef (commit) from 4793f3a5cadfc7d922403601363b2a1d46ecfc2a (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 5e85771f2aeb7d3095a72409b783e96934c788ef Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 00:35:52 2013 +0100 add fixure for X2Go BTS issue #23 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8e41c36..2075955 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.0): - Add session profile option ,,display'' to default session profile options. - Catch any kind of exception when writing session profile files and return - True or False in cases where I/O errors occur. + True or False in cases where I/O errors occur. (Fixes: #23). - Avoid the known_hosts file being flushed with localhost:[<someport>] entries. Store host keys of SSH-proxied hosts under the [<address>]:<port> the system has _behind_ the SSH proxy gateway. (Hopefully fixes: #18). 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-x2go.git - master (branch) updated: 0.2.1.1-40-g4793f3a
by git-admin＠x2go.org 11 Feb '13

11 Feb '13

The branch, master has been updated via 4793f3a5cadfc7d922403601363b2a1d46ecfc2a (commit) via 86055d5fdb0c0c94299946c95ffda6c468a89265 (commit) via e1f9afda375bab994849fc1b3feeded185a926b4 (commit) via 2fcc357335868fccc00f0d778c71f9924fa140eb (commit) from eafc5bb4b22a5bee841bfd97313beaa496fac941 (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 4793f3a5cadfc7d922403601363b2a1d46ecfc2a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 00:28:26 2013 +0100 add fixure for X2Go BTS issue #18 commit 86055d5fdb0c0c94299946c95ffda6c468a89265 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 00:27:26 2013 +0100 skip undefined print actions that get returned from HOOK_open_print_dialog hook commit e1f9afda375bab994849fc1b3feeded185a926b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 00:25:36 2013 +0100 whitespace fixes commit 2fcc357335868fccc00f0d778c71f9924fa140eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 28 15:45:10 2013 +0100 README update ----------------------------------------------------------------------- Summary of changes: README | 24 ++++++++++++------------ debian/changelog | 2 +- x2go/backends/printing/_file.py | 6 +++--- x2go/printactions.py | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/README b/README index dc8cde4..c1535ea 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ The Python X2Go module integrates X2Go client support into your python programme Python X2Go is used in the headless X2Go client »pyhoca-cli« and by the tiny systray GUI application »pyhoca-gui« -Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL. +Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL. On Windows and MacOS X systems you have to make sure that you have installed a current NX Proxy executable somewhere on your system. It probably will be sufficient to have the X2Go project's x2goclient package installed on your client machine. @@ -18,22 +18,22 @@ the X2Go project's x2goclient package installed on your client machine. On Debian / Ubuntu systems there is a nxproxy package available within the distribution. Python X2Go defaults to using the distro nxproxy binary. -Python X2Go was originally inspired by work of Jörg Sawatzki <joerg.sawatzki(a)web.de>. -Unfortunately, Jörg had to give up work on his ideas due to licensing issues with his -contractor. To make his ideas furthermore available to the OSS community this complete +Python X2Go was originally inspired by work of Jörg Sawatzki <joerg.sawatzki(a)web.de>. +Unfortunately, Jörg had to give up work on his ideas due to licensing issues with his +contractor. To make his ideas furthermore available to the OSS community this complete rewrite of Jörgs ideas has been called into life. -In case you have the opinion that parts of the presented code are not as much a rewrite +In case you have the opinion that parts of the presented code are not as much a rewrite as they should be, may I ask you to contact me directly and in person. I am sure, things can -be sorted out in a non-complicated and heartful fashion. Thanks in advance for your directness +be sorted out in a non-complicated and heartful fashion. Thanks in advance for your directness and wholeheartedness concerning this inner process. === Requirements === -* X2Go Server - - you need a working X2Go server to connect to. In order to use shadowing make sure - you have at least X2Go Baikal (3.1.x) installed +* X2Go Server + - you need a working X2Go server to connect to. In order to use shadowing make sure + you have at least X2Go Server (>= 4.1.0.0) installed * on the client system you will need - the python-gevent library (for details refer to: http://www.gevent.org/) - the python-paramiko library (SSH implementation in Python, http://www.lag.net/paramiko/) @@ -44,7 +44,7 @@ and wholeheartedness concerning this inner process. - also working: if no Ghostscript/GSView is installed the win32api ,,print'' command will be executed on incoming PDF print spool files. Win32api will try launch the print function of the default PDF viewer application (mostly Adobe Acrobat Reader) - - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go + - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go applications... it's highly recommended @@ -77,7 +77,7 @@ We use Launchpad for Ubuntu packaging: $ apt-get update $ apt-get install python-x2go -From Ubuntu oneiric on python-x2go is also available as a part of the +From Ubuntu oneiric on python-x2go is also available as a part of the Ubuntu GNU/Linux distribution. @@ -107,7 +107,7 @@ Testing and writing a short howto for this section is very welcome. === How to use it from the command line? === A good example for the usage of Python X2Go is the pyhoca-cli programme, a headless -X2Go client that aims at 100% compatibility with X2GoClient applications released in +X2Go client that aims at 100% compatibility with X2Go Client applications released in the X2Go project. On Debian/Ubuntu you can easily install the X2Go Client by running APT again: diff --git a/debian/changelog b/debian/changelog index 47fa7be..8e41c36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low True or False in cases where I/O errors occur. - Avoid the known_hosts file being flushed with localhost:[<someport>] entries. Store host keys of SSH-proxied hosts under the [<address>]:<port> - the system has _behind_ the SSH proxy gateway. + the system has _behind_ the SSH proxy gateway. (Hopefully fixes: #18). - Add session profile option: uniquehostkeyaliases. Allow the (by-design-unique) X2Go session profile ID to be a representative for <hostname>:<port>. Update session profile IDs on hostname changes. diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py index 1dc13f6..3f606f0 100644 --- a/x2go/backends/printing/_file.py +++ b/x2go/backends/printing/_file.py @@ -41,15 +41,15 @@ import x2go.x2go_exceptions as x2go_exceptions _print_property_map = { 'pdfview_cmd': { - 'ini_section': 'view', + 'ini_section': 'view', 'ini_option': 'command', }, 'save_to_folder': { - 'ini_section': 'save', + 'ini_section': 'save', 'ini_option': 'folder', }, 'printer': { - 'ini_section': 'CUPS', + 'ini_section': 'CUPS', 'ini_option': 'defaultprinter', }, 'print_cmd': { diff --git a/x2go/printactions.py b/x2go/printactions.py index 6f95ddd..23a8f83 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -529,6 +529,6 @@ class X2GoPrintActionDIALOG(X2GoPrintAction): self.logger('Session %s (%s) is calling X2GoClient class hook method <client_instance>.HOOK_open_print_dialog' % (self.session_name, self.profile_name), loglevel=log.loglevel_NOTICE) _new_print_action = self.client_instance.HOOK_open_print_dialog(profile_name=self.profile_name, session_name=self.session_name) - if type(_new_print_action) != type(self): + if _new_print_action and type(_new_print_action) != type(self): _new_print_action._do_print(pdf_file, job_title, spool_dir) 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

x2goserver.git - master (branch) updated: 3.1.1.3-132-gcd23b80
by git-admin＠x2go.org 11 Feb '13

11 Feb '13

The branch, master has been updated via cd23b80ca2f1056500e8b78cedebf60089086bda (commit) from bd0955765cfa6d6c6de1d462fb5a5ab004de65df (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 cd23b80ca2f1056500e8b78cedebf60089086bda Author: Matthew L. Dailey <matthew.l.dailey(a)dartmouth.edu> Date: Mon Feb 11 22:45:08 2013 +0100 Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 432dd7c..8d32658 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,10 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.1): - Make CFLAGS usable in x2goserver. (Fixes: #83). + [ Matthew L. Dailey ] + * New upstream version (4.0.0.1): + - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 0aa79b6..112f258 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 11.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then export DESKTOP_SESSION="2d-gnome" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi 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-5-gdf45ea1
by git-admin＠x2go.org 11 Feb '13

11 Feb '13

The branch, release/4.0.0.x has been updated via df45ea1b2327e0ec7672234a7370002fc8347529 (commit) from 5a29dae3550069dc53ffb2d12b25bac51e02596d (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 df45ea1b2327e0ec7672234a7370002fc8347529 Author: Matthew L. Dailey <matthew.l.dailey(a)dartmouth.edu> Date: Mon Feb 11 22:45:08 2013 +0100 Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d58d10..2625e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.1): - Make CFLAGS usable in x2goserver. (Fixes: #83). + [ Matthew L. Dailey ] + * New upstream version (4.0.0.1): + - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2414b2c..2f95341 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 11.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then export DESKTOP_SESSION="2d-gnome" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi 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-131-gbd09557
by git-admin＠x2go.org 11 Feb '13

11 Feb '13

The branch, master has been updated via bd0955765cfa6d6c6de1d462fb5a5ab004de65df (commit) from 5b05ae9c35e0971afa386651a762965a6d99a05f (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 bd0955765cfa6d6c6de1d462fb5a5ab004de65df Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 11 22:22:43 2013 +0100 Fix build-arch target in x2goserver/Makefile. (Fixes: #121). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/Makefile | 2 ++ 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1c67c6a..432dd7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low - Fix failures of x2gogetagent that was related to faulty regexp in SQLite3 DB wrapper script. - Add X2Go Server feature X2GO_LIST_SHADOWSESSIONS. + - Fix build-arch target in x2goserver/Makefile. (Fixes: #121). * /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/x2goserver/Makefile b/x2goserver/Makefile index 4f19236..f2d6d7a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -34,6 +34,8 @@ all: clean build build: build-arch build-indep +build-arch: + build-indep: build_man2html build_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 - release/4.0.0.x (branch) updated: 4.0.0.0-4-g5a29dae
by git-admin＠x2go.org 11 Feb '13

11 Feb '13

The branch, release/4.0.0.x has been updated via 5a29dae3550069dc53ffb2d12b25bac51e02596d (commit) from a147c0c3885d856a22f0fbba1191223b05564f64 (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 5a29dae3550069dc53ffb2d12b25bac51e02596d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 11 11:46:33 2013 +0100 Make CFLAGS usable in x2goserver. (Fixes: #83). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/Makefile | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08885e5..6d58d10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low + + [ Bernard Cafarelli ] + * New upstream version (4.0.0.1): + - Make CFLAGS usable in x2goserver. (Fixes: #83). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 + x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 43fdccf..4287478 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -3,6 +3,10 @@ SRC_DIR=$(CURDIR) SHELL=/bin/bash +CC ?= gcc +CFLAGS += -fPIE +LDFLAGS += -pie + INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_PROGRAM=install -o root -g root -m 755 @@ -37,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2013