This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.2.x in repository x2goclient. at 87ae17b grammar fix in changelog This branch includes the following new commits: new 797b82e Windows: Reduce size of NSIS installer by switching to lzma solid compression new ea826b9 Changelog: Specify updates to third-party components for Windows new 80a61c4 whitespace fix new 2d3d8ba Provide more meaningful messages on SSH errors (host pub key not found, export pub key not found, authorized_keys file not found). For SSHd startup failures provide different messages on Windows and non-Windows machines. (Fixes: #235). FIXME: add detection code to report SSH daemon startup failures. new b4221f7 fix for last commit new ce85148 Add new cmdline option --hide-foldersharing. If used, all GUI elements related to exporting client-side folders to X2Go sessions get hidden. (Fixes: #514). new 17a62d2 fix man page new e57e42d add option --close-disconnect to man page new 87ae17b grammar fix in changelog The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit 797b82eeb4d4609cc047c91c267d913f9d4dffa4 Author: Mike DePaulo <mikedep333@gmail.com> Date: Fri Jun 27 23:15:58 2014 -0400 Windows: Reduce size of NSIS installer by switching to lzma solid compression --- debian/changelog | 1 + nsis/x2goclient.nsi | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 21bcaf1..5d89ee1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low * New upstream release (4.0.2.1): - Windows: Enable PulseAudio log when --debug is passed. - Windows: Fix compatibility with current PulseAudio master branch + - Windows: Reduce size of NSIS installer by switching to lzma solid compression -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 10 Apr 2014 18:30:25 +0200 diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 326e3d5..bb6154b 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -19,6 +19,10 @@ ;Default installation folder InstallDir "$PROGRAMFILES\x2goclient" + ;NSIS 2.46 defaults to zlib. Setting this reduces the size of a default + ;(no fonts) build by about 24% + SetCompressor /SOLID lzma + ;Get installation folder from registry if available InstallDirRegKey HKLM "Software\x2goclient" "" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit ea826b9ced4d4d706f369d1d78c92dd3b3c17e39 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jun 28 09:33:21 2014 -0400 Changelog: Specify updates to third-party components for Windows --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5d89ee1..d09035c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,20 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low - Windows: Enable PulseAudio log when --debug is passed. - Windows: Fix compatibility with current PulseAudio master branch - Windows: Reduce size of NSIS installer by switching to lzma solid compression + - Windows: cygwin packages (inluding patched OpenSSH 6.6.1p1-3) updated from + latest versions as of 2014-04-08 to latest versions as of 2014-06-09. This + includes openssl 1.0.1h-1, which fixes the 6 CVEs announced on 2014-06-05. + (Cygwin openssl was also individually updated to 1.0.1h-1 in + 4.0.2.0+build4.) This also includes migrating from libjpeg to + libjpeg-turbo, which reduces CPU usage of nxproxy.) + - Windows: nx-libs-lite updated from 3.5.0.22 to 3.5.0.24 + (linked against aforementioned cygwin package versions) + - Windows: Win32 OpenSSL updated from 1.0.1g to 1.0.1h, which fixes the 6 + CVEs announced on 2014-06-05. + (Win32 OpenSSL was also updated to 1.0.1h in 4.0.2.0+build3.) + - Windows: VcXsrv (XP Compatible) updated from 1.14.3.1 to 1.14.3.2. + Fixes CVE-2014-0209, CVE-2014-0210, and CVE-2014-0211 + (VcXsrv was also updated to 1.14.3.2 in 4.0.2.0+build2.) -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 10 Apr 2014 18:30:25 +0200 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit 80a61c48ba59969c9174435bdd7b80af98a0caa3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 28 22:07:20 2014 +0200 whitespace fix --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index d09035c..ad7a2ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low - Don't start pulse on Windows, until we have not session with pulse support. - Check if sound is activated before starting pulse. - Fix starting sshd on Win XP. (Fixes: #421). + [ Mike DePaulo ] * New upstream release (4.0.2.1): - Windows: Enable PulseAudio log when --debug is passed. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit 2d3d8ba3bae1eb4f0cec31d5498123f5dcd83a16 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 28 22:38:48 2014 +0200 Provide more meaningful messages on SSH errors (host pub key not found, export pub key not found, authorized_keys file not found). For SSHd startup failures provide different messages on Windows and non-Windows machines. (Fixes: #235). FIXME: add detection code to report SSH daemon startup failures. --- debian/changelog | 5 ++++ onmainwindow.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad7a2ef..ce5d7a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,11 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low we force X2Go client to only use the default "accelerated X" as system tray icon (and prohibit usage of the session's icon as tray icon). (Fixes: #365). + - Provide more meaningful messages on SSH errors (host pub key not + found, export pub key not found, authorized_keys file not found). + For SSHd startup failures provide different messages on Windows + and non-Windows machines. (Fixes: #235). + FIXME: add detection code to report SSH daemon startup failures. * debian/control: + Add dbg:package x2goplugin-dbg. diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 8dbd5b8..edfe63a 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -7798,10 +7798,11 @@ QString ONMainWindow::createRSAKey() generateHostDsaKey(); generateEtcFiles(); startSshd(); + /* FIXME: test successful SSH daemon startup */ rsa.setFileName ( homeDir+"/.x2go/etc/ssh_host_dsa_key.pub" ); rsa.open ( QIODevice::ReadOnly | QIODevice::Text ); #else - printSshDError(); + printSshDError_noHostPubKey(); return QString::null; #endif } @@ -7920,7 +7921,7 @@ void ONMainWindow::slotRetExportDir ( bool result,QString output, QFile file ( key+".pub" ); if ( !file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) { - printSshDError(); + printSshDError_noExportPubKey(); QFile::remove ( key+".pub" ); return; @@ -7941,7 +7942,7 @@ void ONMainWindow::slotRetExportDir ( bool result,QString output, file.setFileName ( authofname ); if ( !file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) { - printSshDError(); + printSshDError_noAuthorizedKeysFile(); QFile::remove ( key+".pub" ); return; @@ -9980,6 +9981,7 @@ void ONMainWindow::startSshd() clientdir.c_str(), // Starting directory &si, // Pointer to STARTUPINFO structure &sshd );// Pointer to PROCESS_INFORMATION structure + /* FIXME: test successful SSH daemon startup */ delete []desktop; winSshdStarted=true; #else @@ -9989,6 +9991,7 @@ void ONMainWindow::startSshd() arguments<<"-f"<<etcDir +"/sshd_config"<< "-h" << etcDir+"/ssh_host_dsa_key"<<"-D"<<"-p"<<clientSshPort; sshd->start ( appDir+"/sshd",arguments ); + /* FIXME: test successful SSH daemon startup */ x2goDebug<<"Usermode sshd started."; #endif @@ -11345,17 +11348,67 @@ void ONMainWindow::initSelectSessDlg() -void ONMainWindow::printSshDError() +void ONMainWindow::printSshDError_startupFailure() +{ +#ifdef Q_OS_WIN + if ( closeEventSent ) + return; + QMessageBox::critical ( 0l,tr ( "SSH Error" ), + tr ( "SSH daemon could not be started.\n\n" + + "You'll need SSH daemon for printing and file sharing.\n\n" + + "Normally, this should not happen as X2Go Client for \n" + "Windows ships its internal sshd.exe.\n\n" + + "If you see this message, please report a bug against\n" + "the X2Go bugtracker." + ), + QMessageBox::Ok,QMessageBox::NoButton ); +#else + if ( closeEventSent ) + return; + QMessageBox::critical ( 0l,tr ( "SSH Error" ), + tr ( "SSH daemon is not running.\n\n" + + "You'll need SSH daemon for printing and file sharing\n\n" + + "Please ask your system administrator to provide the SSH\n" + "service on your computer." + ), + QMessageBox::Ok,QMessageBox::NoButton ); +#endif +} + +void ONMainWindow::printSshDError_noHostPubKey() +{ + if ( closeEventSent ) + return; + QMessageBox::critical ( 0l,tr ( "SSH Error" ), + tr ( "SSH daemon failed to open the application's public host key." + ), + QMessageBox::Ok,QMessageBox::NoButton ); +} + +void ONMainWindow::printSshDError_noExportPubKey() +{ + if ( closeEventSent ) + return; + QMessageBox::critical ( 0l,tr ( "SSH Error" ), + tr ( "SSH daemon failed to open the application's public key\n" + "used for exporting folders and printers." + ), + QMessageBox::Ok,QMessageBox::NoButton ); +} + +void ONMainWindow::printSshDError_noAuthorizedKeysFile() { if ( closeEventSent ) return; - QMessageBox::critical ( 0l,tr ( "Error" ), - tr ( "sshd not started, " - "you'll need sshd for printing " - "and file sharing\n" - "you can install sshd with\n" - "<b>sudo apt-get install " - "openssh-server</b>" ), + QMessageBox::critical ( 0l,tr ( "SSH Error" ), + tr ( "SSH daemon failed to open the application's\n" + "authoized_keys file." + ), QMessageBox::Ok,QMessageBox::NoButton ); } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit ce851482ae483140292ab508c32f1abcbbee4117 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 28 23:31:43 2014 +0200 Add new cmdline option --hide-foldersharing. If used, all GUI elements related to exporting client-side folders to X2Go sessions get hidden. (Fixes: #514). --- debian/changelog | 3 +++ editconnectiondialog.cpp | 4 ++-- man/man1/x2goclient.1 | 3 +++ onmainwindow.cpp | 13 +++++++++++-- onmainwindow.h | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce5d7a2..fa47171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low For SSHd startup failures provide different messages on Windows and non-Windows machines. (Fixes: #235). FIXME: add detection code to report SSH daemon startup failures. + - Add new cmdline option --hide-foldersharing. If used, all GUI + elements related to exporting client-side folders to X2Go sessions + get hidden. (Fixes: #514). * debian/control: + Add dbg:package x2goplugin-dbg. diff --git a/editconnectiondialog.cpp b/editconnectiondialog.cpp index d2b784d..0769e3b 100644 --- a/editconnectiondialog.cpp +++ b/editconnectiondialog.cpp @@ -54,11 +54,11 @@ EditConnectionDialog::EditConnectionDialog ( QString id, QWidget * par, otherSet=new SettingsWidget ( id,parent ); exportDir=new ShareWidget ( id,parent ); - fr->addTab ( sessSet,tr ( "&Session" ) ); fr->addTab ( conSet,tr ( "&Connection" ) ); fr->addTab ( otherSet,tr ( "&Settings" ) ); - fr->addTab ( exportDir,tr ( "&Shared folders" ) ); + if (! parent->getHideFolderSharing()) + fr->addTab ( exportDir,tr ( "&Shared folders" ) ); QPushButton* ok=new QPushButton ( tr ( "&OK" ),this ); QPushButton* cancel=new QPushButton ( tr ( "&Cancel" ),this ); diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 5338900..5860810 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -40,6 +40,9 @@ Switch the tray icon to the session's icon on successful session startup/resumpt Show tray icon (default: false). This option overrides the global tray icon settings and also forces the tray icon to be shown in hidden X2Go Client mode. .TP +\*(T<\fB\-\-hide-foldersharing\fR\*(T> +Hide all elements in X2Go Client GUI that are related to folder sharing. +.TP \*(T<\fB\-\-client-ssh-port\fR\*(T> Local ssh port (for filesystem export, default: 22). .TP diff --git a/onmainwindow.cpp b/onmainwindow.cpp index edfe63a..f09d80d 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -71,6 +71,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) startMaximized=false; startHidden=false; keepTrayIcon=false; + hideFolderSharing=false; thinMode=false; closeDisconnect=false; showHaltBtn=false; @@ -1084,7 +1085,8 @@ void ONMainWindow::trayIconInit() appSeparator=trayIconActiveConnectionMenu->addSeparator(); - trayIconActiveConnectionMenu->addAction(tr ("Share folder..." ),this, SLOT(slotExportDirectory())); + if (!hideFolderSharing) + trayIconActiveConnectionMenu->addAction(tr ("Share folder..." ),this, SLOT(slotExportDirectory())); trayIconActiveConnectionMenu->addAction(tr("Suspend"),this, SLOT(slotSuspendSessFromSt())); trayIconActiveConnectionMenu->addAction(tr("Terminate"),this, SLOT(slotTermSessFromSt())); connect (trayIconActiveConnectionMenu, SIGNAL(triggered(QAction*)), this, @@ -6685,6 +6687,11 @@ bool ONMainWindow::parseParameter ( QString param ) keepTrayIcon=true; return true; } + if ( param=="--hide-foldersharing" ) + { + hideFolderSharing=true; + return true; + } if ( param=="--pgp-card" ) { usePGPCard=true; @@ -7282,6 +7289,7 @@ void ONMainWindow::showHelp() "--session-conf=<file>\t\t path to alternative session config\n" "--tray-icon\t\t\t force to show session trayicon\n" "--close-disconnect\t\t close X2Go Client after disconnect\n"; + "--hide-foldersharing\t\t\t hide all folder sharing related options\n"; qCritical ( "%s",helpMsg.toLocal8Bit().data() ); if (!startHidden && !haveTerminal) @@ -11069,7 +11077,8 @@ void ONMainWindow::initStatusDlg() { sbSusp->show(); sbTerm->show(); - sbExp->show(); + if (! hideFolderSharing ) + sbExp->show(); } X2goSettings st ( "settings" ); diff --git a/onmainwindow.h b/onmainwindow.h index a7bb3d1..1764993 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -492,6 +492,10 @@ public: { return sessionCfg; } + bool getHideFolderSharing() + { + return hideFolderSharing; + } void runApplication(QString exec); @@ -549,6 +553,7 @@ private: bool closeDisconnect; bool startHidden; bool keepTrayIcon; + bool hideFolderSharing; bool defaultUseSound; bool defaultXinerama; bool cardStarted; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit 17a62d28d8ede9cbb439c0d0d2e5d1f52caf5c7e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 28 23:32:32 2014 +0200 fix man page --- man/man1/x2goclient.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 5860810..fe3840e 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -36,7 +36,7 @@ Hide client (start hidden, default: false). Always keep the "accelerated X" icon in the system tray. Without this option the default behaviour is: Switch the tray icon to the session's icon on successful session startup/resumption. .TP -\*(T<\fB\-\-hide\fR\*(T> +\*(T<\fB\-\-tray-icon\fR\*(T> Show tray icon (default: false). This option overrides the global tray icon settings and also forces the tray icon to be shown in hidden X2Go Client mode. .TP -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit e57e42d9ba607c6dd079251b71c616c4af6f7945 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 28 23:35:29 2014 +0200 add option --close-disconnect to man page --- man/man1/x2goclient.1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index fe3840e..9c4832d 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -17,7 +17,7 @@ x2goclient \- Client application to launch server-side X2Go sessions. .SH DESCRIPTION \fBx2goclient\fR is a GUI application for launching server-side X2Go sessions. .PP -.SH OPTIONS +.SH GUI OPTIONS \fBx2goclient\fR has the following options: .TP \*(T<\fB\-\-help-pack\fR\*(T> @@ -43,13 +43,16 @@ to be shown in hidden X2Go Client mode. \*(T<\fB\-\-hide-foldersharing\fR\*(T> Hide all elements in X2Go Client GUI that are related to folder sharing. .TP +\*(T<\fB\-\-close\-disconnect\fR\*(T> +Close X2Go Client after a session got disconnected. +.TP \*(T<\fB\-\-client-ssh-port\fR\*(T> Local ssh port (for filesystem export, default: 22). +.SH PROFILING SESSIONS GLOBALLY +You can pre-profile sessions globally using the following options. They will override the options in the session profiles. .TP \*(T<\fB\-\-user\fR\*(T> Pre-selection of user at client startup (LDAP mode). -.SH PROFILING SESSIONS GLOBALLY -You can pre-profile sessions globally using the following options. They will override the options in the session profiles. .TP \*(T<\fB\-\-command\fR\*(T> Default command for session startup. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit 87ae17b41858e274b7ab2658bc86972520b096e6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 29 14:40:04 2014 +0200 grammar fix in changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa47171..38c2685 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,8 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low - Wrong cmd line option throw error dialog if running not from terminal. - Add command line option "close-disconnect", which make client close after session is disconnected. - - Don't start pulse on Windows, until we have not session with pulse support. + - Don't start pulse on Windows, until we really have to start a session + that requires pulse support. - Check if sound is activated before starting pulse. - Fix starting sshd on Win XP. (Fixes: #421). -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit b4221f721936ef7048ac1e474bd17afb0aa490a4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 28 22:47:19 2014 +0200 fix for last commit --- onmainwindow.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/onmainwindow.h b/onmainwindow.h index 0ea829b..a7bb3d1 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1106,7 +1106,10 @@ private: void initSelectSessDlg(); void initStatusDlg(); void initPassDlg(); - void printSshDError(); + void printSshDError_startupFailure(); + void printSshDError_noHostPubKey(); + void printSshDError_noExportPubKey(); + void printSshDError_noAuthorizedKeysFile(); void loadPulseModuleNativeProtocol(); void initEmbedToolBar(); #ifdef Q_OS_LINUX -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org