x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

x2goserver.git - master (branch) updated: 3.1.0.0-7-gdd6fb08
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via dd6fb08b75cec6f5b0cf159dd3dc1c0adafd5d53 (commit) from 8fd1754c73f52028db96187f2d810e0c534b2777 (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 dd6fb08b75cec6f5b0cf159dd3dc1c0adafd5d53 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 20:33:02 2012 +0100 Fix Makefile of x2goserver-fmbindings (thanks to Oliver Burger), improve uninstall code in Makefiles. ----------------------------------------------------------------------- Summary of changes: Makefile | 17 +++++++++++++++-- debian/changelog | 2 ++ x2goserver-extensions/Makefile | 26 +++++++++++++++++++++++++- x2goserver-fmbindings/Makefile | 8 ++++---- 4 files changed, 46 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index da9d5db..3be40f9 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,14 @@ #!/usr/bin/make -f +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR= +PREFIX=/usr/local +ETCDIR=/etc/x2go +LIBDIR=$(PREFIX)/lib/x2go +SHAREDIR=$(PREFIX)/share/x2go + all: build build: build-arch build-indep @@ -51,10 +60,14 @@ install: $(MAKE) -C x2goserver-pyhoca $@ uninstall: - $(MAKE) -C x2goserver $@ $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-compat $@ - $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ + $(MAKE) -C x2goserver-extensions $@ + $(MAKE) -C x2goserver $@ + if test -d $(DESTDIR)$(LIBDIR); then $(RM_DIR) $(DESTDIR)$(LIBDIR); fi + if test -d $(DESTDIR)$(SHAREDIR)/x2gofeature.d; then $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d; fi + if test -d $(DESTDIR)$(SHAREDIR); then $(RM_DIR) $(DESTDIR)$(SHAREDIR); fi + if test -d $(DESTDIR)$(ETCDIR); then $(RM_DIR) $(DESTDIR)$(ETCDIR); fi diff --git a/debian/changelog b/debian/changelog index d5664c6..7e2e1ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low - Do only run session cleanup scripts from within x2goruncommand. Dropping them from x2goterminate-session. - Be tolerant against x2go_logout script failures. + - Fix Makefile of x2goserver-fmbindings (thanks to Oliver Burger), + improve uninstall code in Makefiles. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:10:12 +0100 diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 2fe807c..d3bbbb6 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -22,7 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) #SBIN_SCRIPTS=$(shell cd sbin && ls) #LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder) man_pages = `cd man && find * -type f` @@ -110,6 +110,30 @@ uninstall_scripts: # for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done # for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/.placeholder + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/.placeholder + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/ for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index bd9aa69..a9d8da5 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -22,7 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) #SBIN_SCRIPTS=$(shell cd sbin && ls) #LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && ls *.features) man_pages = `cd man && find * -type f` @@ -53,7 +53,7 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d - $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ + $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: @@ -66,7 +66,7 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-extensions $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions + $(INSTALL_FILE) VERSION.x2goserver-fmbindings $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-fmbindings uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version @@ -81,5 +81,5 @@ uninstall_man: $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-fmbindings $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true 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

nx-libs.git - nx-buildscripts (branch) updated: 12a71b8bc04917b5c1e62ae2f01ca206243678a1
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, nx-buildscripts has been updated via 12a71b8bc04917b5c1e62ae2f01ca206243678a1 (commit) from 9e7d9489689e5cdd42d6fa048f1a4b3754898766 (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 12a71b8bc04917b5c1e62ae2f01ca206243678a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 19:17:03 2012 +0100 typo fix ----------------------------------------------------------------------- Summary of changes: bin/nx-tarballrelease | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/nx-tarballrelease b/bin/nx-tarballrelease index 7f4c6ff..f74884d 100755 --- a/bin/nx-tarballrelease +++ b/bin/nx-tarballrelease @@ -5,7 +5,7 @@ set -x # Copyright (C) 2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # This is free software; you can redistribute it and/or modify -# it under the tBerms of the GNU General Public License as published by +# it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # 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

x2goclient.git - master (branch) updated: 3.99.1.0-15-gf9f9efe
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via f9f9efef4450485b53cf43100d1ad14ea8f96b16 (commit) from 3b20e0e71cf3c01b1f73ecee2014c4ddf5c07a3f (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 f9f9efef4450485b53cf43100d1ad14ea8f96b16 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Feb 29 16:56:38 2012 +0100 Properly set DISPLAY environment variable on Mac OS X. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow_part2.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 534c2d9..d9bcfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout. - On Mac OS X connect to Xserver via Unix file socket. + - Properly set DISPLAY environment variable on Mac OS X. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index f43c179..e8df279 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -1900,12 +1900,17 @@ void ONMainWindow::slotTunnelOk() env << "NX_CLIENT="+QCoreApplication::applicationFilePath (); #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN ) + // On Mac OS X, we want to make sure that DISPLAY is set to a proper value, + // but at the same time don't want to set the value ourselves but keep + // the provided one. QString disp=getXDisplay(); if ( disp==QString::null ) { //slotProxyerror ( QProcess::FailedToStart ); return; } +#endif // Q_OS_WIN || Q_OS_DARWIN +#if defined ( Q_OS_WIN ) if ( dispInd==-1 ) { env <<"DISPLAY=localhost:"+disp; @@ -1917,8 +1922,8 @@ void ONMainWindow::slotTunnelOk() /* x2goDebug<<"existing env DISPLAY("<<dispInd<< ") DISPLAY=localhost:"+disp<<endl;*/ } -#endif -#ifdef Q_OS_DARWIN +#endif // Q_OS_WIN +#if defined ( Q_OS_DARWIN ) //setting /usr/X11/bin to find xauth env.insert ( 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

x2goclient.git - master (branch) updated: 3.99.1.0-14-g3b20e0e
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via 3b20e0e71cf3c01b1f73ecee2014c4ddf5c07a3f (commit) via 93d11591928f54ff28a06edd10cb13494ef10d41 (commit) from db39c41e27721872a3c235298c42c41d202d35b6 (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 3b20e0e71cf3c01b1f73ecee2014c4ddf5c07a3f Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Feb 29 16:53:01 2012 +0100 On Mac OS X connect to Xserver via Unix file socket. commit 93d11591928f54ff28a06edd10cb13494ef10d41 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 29 16:46:49 2012 +0100 fix copyright headers ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 8 ++-- onmainwindow_part3.cpp | 72 ++++++++++++----------------------------------- onmainwindow_privat.h | 6 ++-- 4 files changed, 27 insertions(+), 60 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cbdbd57..534c2d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - The default of a 10 seconds SSH connection timeout is pretty low, especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout. + - On Mac OS X connect to Xserver via Unix file socket. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 344c993..904ab79 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1,9 +1,9 @@ -/*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * +***************************************************************************/ +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* oleksandr.shneyder(a)obviously-nice.de * * * * 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 F* +* it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index fb6a3ba..363eecc 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -1,9 +1,9 @@ -/*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * +***************************************************************************/ +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* oleksandr.shneyder(a)obviously-nice.de * * * * 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 F* +* it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * @@ -2054,63 +2054,29 @@ bool ONMainWindow::checkAgentProcess() #if defined ( Q_OS_DARWIN ) QString ONMainWindow::getXDisplay() { - QTcpSocket tcpSocket ( this ); - uint dispNumber=0; - QString xname,xdir,xopt; - dispNumber=0; - xdir=ConfigDialog::getXDarwinDirectory(); - xname=xdir+"/Contents/MacOS/X11"; - xopt=" -rootless :0"; - - //for newer versions of XQuartz start startx instead of X11.app - xname="/usr/X11/bin/startx"; - xopt=""; - tcpSocket.connectToHost ( "127.0.0.1",6000+dispNumber ); + QLocalSocket unixSocket (this); + QString xsocket (getenv ("DISPLAY")); - if ( tcpSocket.waitForConnected ( 3000 ) ) - { - tcpSocket.close(); - return QString::number ( dispNumber ); - } - if ( xname==QString::null ) - { - QMessageBox::critical ( - this,tr ( "Can't connect to X-Server" ), - tr ( - "Can't connect to X-Server\nPlease check your settings" - ) ); - slotConfig(); - return QString::null; - } - QProcess* pr=new QProcess ( this ); - pr->setWorkingDirectory ( xdir ); - pr->start ( xname+" "+xopt,QIODevice::NotOpen ); - if ( pr->waitForStarted ( 3000 ) ) + // OS X starts the X11 server automatically, as soon as the launchd UNIX socket + // is accessed. + // On user login, the DISPLAY environment variable is set to this said existing + // socket. + // By now, we should have a socket. Test, if connecting works. + if ((!xsocket.isEmpty ())) { -#ifdef Q_OS_DARWIN - //FIXME: the call of unistd.h sleep() do not work on all - // Mac OS X systems - system ( "sleep 3" ); -#endif + unixSocket.connectToServer (xsocket); - tcpSocket.connectToHost ( "127.0.0.1",6000+dispNumber ); - if ( tcpSocket.waitForConnected ( 1000 ) ) + if (unixSocket.waitForConnected (10000)) { - tcpSocket.close(); - return QString::number ( dispNumber ); + unixSocket.disconnectFromServer (); + return (xsocket); } - QMessageBox::critical ( - this,tr ( "Can't connect to X-Server" ), - tr ( - "Can't connect to X-Server\nPlease check your settings" - ) ); - slotConfig(); - return QString::null; } + // And if not, error out. QMessageBox::critical ( - this,QString::null, + this,tr ( "Can't connect to X server\nPlease check your settings" ), tr ( - "Can't start X Server\nPlease check your settings" ) ); + "Can't start X server\nPlease check your settings" ) ); slotConfig(); return QString::null; } diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 9e4375a..aa049f7 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)obviously-nice.de * * * * 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 * @@ -66,7 +66,7 @@ #include <QFileDialog> #include <QHttp> #include <QUrl> -#include <QTcpSocket> +#include <QLocalSocket> #include <QPlastiqueStyle> #include "sshprocess.h" #include "imgframe.h" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-12-gdb39c41
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via db39c41e27721872a3c235298c42c41d202d35b6 (commit) from acc0632ba462e6e3be91bb70e812c00fcfb176c6 (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 db39c41e27721872a3c235298c42c41d202d35b6 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Feb 29 16:41:15 2012 +0100 The default of a 10 seconds SSH connection timeout is pretty low, especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ sshmasterconnection.cpp | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4c32c71..cbdbd57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard. - Add .gitignore file. + - The default of a 10 seconds SSH connection timeout is pretty low, + especially when using tcp_wrappers with the identd option turned on. + Wait for a 60 seconds timeout. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 2626346..9c6626a 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -137,6 +137,7 @@ void SshMasterConnection::run() #endif // int verbosity=SSH_LOG_PROTOCOL; + long timeout = 60; my_ssh_session = ssh_new(); if ( my_ssh_session == NULL ) @@ -153,6 +154,9 @@ void SshMasterConnection::run() ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif // ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + + ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); + if ( !sshConnect() ) { QString err=ssh_get_error ( my_ssh_session ); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-12-g5120097
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via 5120097388392ff56602e771037ad7ad261a33a1 (commit) from acc0632ba462e6e3be91bb70e812c00fcfb176c6 (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 5120097388392ff56602e771037ad7ad261a33a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 29 16:41:15 2012 +0100 The default of a 10 seconds SSH connection timeout is pretty low, especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ sshmasterconnection.cpp | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4c32c71..cbdbd57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard. - Add .gitignore file. + - The default of a 10 seconds SSH connection timeout is pretty low, + especially when using tcp_wrappers with the identd option turned on. + Wait for a 60 seconds timeout. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 2626346..9c6626a 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -137,6 +137,7 @@ void SshMasterConnection::run() #endif // int verbosity=SSH_LOG_PROTOCOL; + long timeout = 60; my_ssh_session = ssh_new(); if ( my_ssh_session == NULL ) @@ -153,6 +154,9 @@ void SshMasterConnection::run() ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif // ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + + ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); + if ( !sshConnect() ) { QString err=ssh_get_error ( my_ssh_session ); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-11-gacc0632
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via acc0632ba462e6e3be91bb70e812c00fcfb176c6 (commit) from 178a4015b4928a708fa37dd507c0a5f89fa152cf (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 acc0632ba462e6e3be91bb70e812c00fcfb176c6 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Feb 29 16:34:59 2012 +0100 Add .gitignore file. ----------------------------------------------------------------------- Summary of changes: .gitignore | 17 +++++++++++++++++ debian/changelog | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 .gitignore The diff of changes is: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..721e32c --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# Temporary object files/static libs. +*.[oa] + +# Generated by qmake. +moc_*.cpp +ui_*.h +qrc_resources.cpp + +# VIM temporary files. +.*.sw* + +# Generated by lrelease. +x2goclient_*.qm + +# Generated by qmake when building on OS X. +x2goclient.app + diff --git a/debian/changelog b/debian/changelog index 3d26561..4c32c71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.1.1): - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard. + - Add .gitignore file. [ Daniel Lindgren ] * New upstream version (3.99.1.1): 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

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-4-g655173f
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via 655173ff215dde1a167193eafe29bfc955a19561 (commit) from be86627adf0392f94d70ad28cb9c6867b3bef0f5 (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 655173ff215dde1a167193eafe29bfc955a19561 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Feb 29 15:56:49 2012 +0100 Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around issue in Mac OS X 10.5 SDK. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + .../051_nxcomp_macos105-fdisset.full+lite.patch | 82 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 87 insertions(+), 0 deletions(-) create mode 100644 debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d2da304..ff0f01e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls. + [ Mihai Moldovan ] + * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around + issue in Mac OS X 10.5 SDK. + [ Oleksandr Shneyder ] * Create patch: 203_nxagent_disable-rootless-exit.full.patch. Add command line argument "-norootlessexit". diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch new file mode 100644 index 0000000..86f24e8 --- /dev/null +++ b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch @@ -0,0 +1,82 @@ +Description: workaround for Mac OS X 10.5 + The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be + writeable, although it does only access the data. Given that we have a + const pointer for a const struct, copy and pass that. + . + Note that this is merely a workaround for OS X 10.5, as 10.6 and later + define the second argument of FD_ISSET as const struct const *foo, too. + . + It is safe, as data is accessed read-only by FD_ISSET, even on 10.5. +Forward: pending +Author: Mihai Moldovan <ionic(a)ionic.de> +--- + nxcomp/Agent.h | 28 ++++++++++++++++++++-------- + 1 files changed, 20 insertions(+), 8 deletions(-) + +--- a/nxcomp/Agent.h ++++ b/nxcomp/Agent.h +@@ -149,30 +149,38 @@ + + int remoteCanRead(const fd_set * const readSet) + { ++ // OS X 10.5 requires the second argument to be non-const, so copy readSet. ++ // It's safe though, as FD_ISSET does not operate on it. ++ fd_set readWorkSet = *readSet; ++ + #if defined(TEST) || defined(INFO) + *logofs << "Agent: remoteCanRead() is " << +- (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0) +- << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet) ++ (FD_ISSET(remoteFd_, readWorkSet) && transport_ -> dequeuable() != 0) ++ << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readWorkSet) + << " and dequeuable " << transport_ -> dequeuable() + << ".\n" << logofs_flush; + #endif + +- return (FD_ISSET(remoteFd_, readSet) && ++ return (FD_ISSET(remoteFd_, readWorkSet) && + transport_ -> dequeuable() != 0); + } + + int remoteCanWrite(const fd_set * const writeSet) + { ++ // OS X 10.5 requires the second argument to be non-const, so copy writeSet. ++ // It's safe though, as FD_ISSET does not operate on it. ++ fd_set writeWorkSet = *writeSet; ++ + #if defined(TEST) || defined(INFO) + *logofs << "Agent: remoteCanWrite() is " << +- (FD_ISSET(remoteFd_, writeSet) && transport_ -> ++ (FD_ISSET(remoteFd_, writeWorkSet) && transport_ -> + queuable() != 0 && canRead_ == 1) << " with FD_ISSET() " +- << (int) FD_ISSET(remoteFd_, writeSet) << " queueable " ++ << (int) FD_ISSET(remoteFd_, writeWorkSet) << " queueable " + << transport_ -> queuable() << " channel can read " + << canRead_ << ".\n" << logofs_flush; + #endif + +- return (FD_ISSET(remoteFd_, writeSet) && ++ return (FD_ISSET(remoteFd_, writeWorkSet) && + transport_ -> queuable() != 0 && + canRead_ == 1); + } +@@ -203,13 +211,17 @@ + + int proxyCanRead(const fd_set * const readSet) + { ++ // OS X 10.5 requires the second argument to be non-const, so copy readSet. ++ // It's safe though, as FD_ISSET does not operate on it. ++ fd_set readWorkSet = *readSet; ++ + #if defined(TEST) || defined(INFO) + *logofs << "Agent: proxyCanRead() is " +- << ((int) FD_ISSET(proxy -> getFd(), readSet) ++ << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet) + << ".\n" << logofs_flush; + #endif + +- return (FD_ISSET(proxy -> getFd(), readSet)); ++ return (FD_ISSET(proxy -> getFd(), &readWorkSet)); + } + + int enqueueData(const char *data, const int size) const diff --git a/debian/patches/series b/debian/patches/series index 654f25c..dc42d85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,6 +25,7 @@ 030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch +051_nxcomp_macos105-fdisset.full+lite.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

x2goclient.git - master (branch) updated: 3.99.1.0-10-g178a401
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via 178a4015b4928a708fa37dd507c0a5f89fa152cf (commit) from c8b59f5802e87941dd8c8a462b8b6173e32eb8d9 (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 178a4015b4928a708fa37dd507c0a5f89fa152cf Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Feb 29 16:28:34 2012 +0100 Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goclient.pro | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 542878d..3d26561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,11 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low with a dark GUI theme. - Prettify x2goclient.pro. + [ Mihai Moldovan ] + * New upstream version (3.99.1.1): + - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with + Leopard. + [ Daniel Lindgren ] * New upstream version (3.99.1.1): - Update/improve Swedish translation after testing x2goclient on Windows. diff --git a/x2goclient.pro b/x2goclient.pro index d4362b2..16c5f06 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -128,7 +128,8 @@ x2go_linux_static { macx { message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups + LIBS += -framework LDAP -lcups -lcrypto -lssl -lz + CONFIG += x86 x86_64 } win32-* { message(building $$TARGET for windows without ldap and cups) @@ -137,8 +138,8 @@ win32-* { } QT += svg network ICON =icons/x2go-mac.icns -QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk - +QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 plugin{ hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-10-gae98f11
by git-admin＠x2go.org 29 Feb '12

29 Feb '12

The branch, master has been updated via ae98f113fa1079b1ec0667e25e55c0b108f7b996 (commit) via c8b59f5802e87941dd8c8a462b8b6173e32eb8d9 (commit) from 437e34c48f017b0014bb422da512f2bcd0e07710 (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 ae98f113fa1079b1ec0667e25e55c0b108f7b996 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 29 16:28:34 2012 +0100 Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard. commit c8b59f5802e87941dd8c8a462b8b6173e32eb8d9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 29 16:26:31 2012 +0100 Prettify x2goclient.pro. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++ x2goclient.pro | 201 +++++++++++++++++++++++++++-------------------------- 2 files changed, 108 insertions(+), 99 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cbf4a4b..3d26561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,12 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - Update copyright year in about window. Including all translations. - Power button icon: make inner part transparent. Needed for people with a dark GUI theme. + - Prettify x2goclient.pro. + + [ Mihai Moldovan ] + * New upstream version (3.99.1.1): + - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with + Leopard. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/x2goclient.pro b/x2goclient.pro index 5c96688..16c5f06 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -12,13 +12,14 @@ CONFIG += $$(X2GO_LINUX_STATIC) FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui contest.ui -TRANSLATIONS += x2goclient_en.ts -TRANSLATIONS += x2goclient_de.ts -TRANSLATIONS += x2goclient_ru.ts -TRANSLATIONS += x2goclient_nb_no.ts -TRANSLATIONS += x2goclient_sv.ts -TRANSLATIONS += x2goclient_fr.ts -TRANSLATIONS += x2goclient_zh_tw.ts +TRANSLATIONS += x2goclient_en.ts \ + x2goclient_de.ts \ + x2goclient_ru.ts \ + x2goclient_nb_no.ts \ + x2goclient_sv.ts \ + x2goclient_fr.ts \ + x2goclient_zh_tw.ts + HEADERS += configdialog.h \ editconnectiondialog.h \ exportdialog.h \ @@ -31,78 +32,78 @@ HEADERS += configdialog.h \ sshprocess.h \ SVGFrame.h \ userbutton.h \ - x2goclientconfig.h \ - x2gologdebug.h \ - printprocess.h \ - cupsprint.h \ - cupsprintwidget.h \ - cupsprintersettingsdialog.h \ - printwidget.h \ - printercmddialog.h \ - printdialog.h \ - wapi.h \ - sessionwidget.h \ - configwidget.h \ - connectionwidget.h \ - settingswidget.h \ - sharewidget.h \ - clicklineedit.h \ - httpbrokerclient.h \ - ongetpass.h \ - onmainwindow_privat.h \ - x2gosettings.h \ - brokerpassdlg.h \ - contest.h \ - xsettingswidget.h + x2goclientconfig.h \ + x2gologdebug.h \ + printprocess.h \ + cupsprint.h \ + cupsprintwidget.h \ + cupsprintersettingsdialog.h \ + printwidget.h \ + printercmddialog.h \ + printdialog.h \ + wapi.h \ + sessionwidget.h \ + configwidget.h \ + connectionwidget.h \ + settingswidget.h \ + sharewidget.h \ + clicklineedit.h \ + httpbrokerclient.h \ + ongetpass.h \ + onmainwindow_privat.h \ + x2gosettings.h \ + brokerpassdlg.h \ + contest.h \ + xsettingswidget.h SOURCES += sharewidget.cpp \ - settingswidget.cpp\ - configwidget.cpp \ - sessionwidget.cpp \ - connectionwidget.cpp \ - configdialog.cpp \ - editconnectiondialog.cpp \ - exportdialog.cpp \ - imgframe.cpp \ - LDAPSession.cpp \ - onmainwindow.cpp \ - onmainwindow_part2.cpp \ - onmainwindow_part3.cpp \ - onmainwindow_part4.cpp \ - sessionbutton.cpp \ - sessionmanagedialog.cpp \ - sshmasterconnection.cpp \ - sshprocess.cpp \ - SVGFrame.cpp \ - userbutton.cpp \ - x2gologdebug.cpp \ - printprocess.cpp \ - cupsprint.cpp \ - cupsprintwidget.cpp \ - cupsprintersettingsdialog.cpp \ - printwidget.cpp \ - printercmddialog.cpp \ - printdialog.cpp \ - wapi.cpp \ - clicklineedit.cpp \ - httpbrokerclient.cpp \ - ongetpass.cpp \ - x2gosettings.cpp \ - brokerpassdlg.cpp \ - contest.cpp \ - xsettingswidget.cpp + settingswidget.cpp\ + configwidget.cpp \ + sessionwidget.cpp \ + connectionwidget.cpp \ + configdialog.cpp \ + editconnectiondialog.cpp \ + exportdialog.cpp \ + imgframe.cpp \ + LDAPSession.cpp \ + onmainwindow.cpp \ + onmainwindow_part2.cpp \ + onmainwindow_part3.cpp \ + onmainwindow_part4.cpp \ + sessionbutton.cpp \ + sessionmanagedialog.cpp \ + sshmasterconnection.cpp \ + sshprocess.cpp \ + SVGFrame.cpp \ + userbutton.cpp \ + x2gologdebug.cpp \ + printprocess.cpp \ + cupsprint.cpp \ + cupsprintwidget.cpp \ + cupsprintersettingsdialog.cpp \ + printwidget.cpp \ + printercmddialog.cpp \ + printdialog.cpp \ + wapi.cpp \ + clicklineedit.cpp \ + httpbrokerclient.cpp \ + ongetpass.cpp \ + x2gosettings.cpp \ + brokerpassdlg.cpp \ + contest.cpp \ + xsettingswidget.cpp LIBS += -lssh plugin { -TARGET = x2goplugin + TARGET = x2goplugin } else{ -RC_FILE = x2goclient.rc -SOURCES += x2goclient.cpp -TARGET = x2goclient -DEFINES += CFGCLIENT -message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) + RC_FILE = x2goclient.rc + SOURCES += x2goclient.cpp + TARGET = x2goclient + DEFINES += CFGCLIENT + message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) } TEMPLATE = app @@ -111,47 +112,49 @@ INCLUDEPATH += . RESOURCES += resources.rcc linux-g++ { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups -lX11 -lXpm + message(building $$TARGET with ldap and cups) + LIBS += -lldap -lcups -lX11 -lXpm } linux-g++-64 { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups -lX11 -lXpm + message(building $$TARGET with ldap and cups) + LIBS += -lldap -lcups -lX11 -lXpm } x2go_linux_static { - message (linking all libs statically) - LIBS -= -lssh - LIBS += -lssh_static -lssl -lXpm - QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS + message (linking all libs statically) + LIBS -= -lssh + LIBS += -lssh_static -lssl -lXpm + QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS } macx { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups + message(building $$TARGET with ldap and cups) + LIBS += -framework LDAP -lcups -lcrypto -lssl -lz + CONFIG += x86 x86_64 } win32-* { - message(building $$TARGET for windows without ldap and cups) - LIBS += -lwinspool -lws2_32 - CONFIG += static release + message(building $$TARGET for windows without ldap and cups) + LIBS += -lwinspool -lws2_32 + CONFIG += static release } QT += svg network ICON =icons/x2go-mac.icns -QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk - +QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 plugin{ -DEFINES += CFGPLUGIN - linux-g++ { - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } - linux-g++-64 { - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } - win32-* { - DEFINES += QT_NODLL - CONFIG += qaxserver - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } -RC_FILE = x2goplugin.rc + DEFINES += CFGPLUGIN + linux-g++ { + include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + } + linux-g++-64 { + include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + } + win32-* { + DEFINES += QT_NODLL + CONFIG += qaxserver + include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + } + RC_FILE = x2goplugin.rc + } 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits