Bug#774999: unblock (pre-approval): x2goclient/4.0.3.1-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking planned upload of package x2goclient
I plan include two more upstream patches in the x2goclient Debian package for jessie.
Recently, with my upstream hat on, I fixed the two below issues:
* debian/patches:
+ Add 0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-
application.patch. Prevent X2Go Client from exiting abnormally on
printing incoming printjobs via the print dialog window. (Closes:
#774907).
-> bites nearly everyone who attepts to print via the X2Go printing feature
+ Add 0004-fix-quoting+escaping-ssh-commands.patch. Fix quotes when calling
remote commands via SSH (esp. allow same quoting/ escaping style for
libssh and openSSH+Krb based connections). (Closes: #774998).
-> bites people deploying X2Go Client in enterprise (with SSO) environments
light+love
Mike
unblock x2goclient/4.0.3.1-3
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru x2goclient-4.0.3.1/debian/changelog x2goclient-4.0.3.1/debian/changelog
--- x2goclient-4.0.3.1/debian/changelog 2015-01-06 05:58:24.000000000 +0100
+++ x2goclient-4.0.3.1/debian/changelog 2015-01-09 21:58:22.000000000 +0100
@@ -1,3 +1,16 @@
+x2goclient (4.0.3.1-3) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-
+ application.patch. Prevent X2Go Client from exiting abnormally on
+ printing incoming printjobs via the print dialog window. (Closes:
+ #774907).
+ + Add 0004-fix-quoting+escaping-ssh-commands.patch. Fix quotes when calling
+ remote commands via SSH (esp. allow same quoting/ escaping style for
+ libssh and openSSH+Krb based connections). (Closes: #774998).
+
+ -- Mike Gabriel <sunweaver@debian.org> Fri, 09 Jan 2015 21:57:45 +0100
+
x2goclient (4.0.3.1-2) unstable; urgency=medium
* debian/patches:
diff -Nru x2goclient-4.0.3.1/debian/patches/0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-application.patch x2goclient-4.0.3.1/debian/patches/0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-application.patch
--- x2goclient-4.0.3.1/debian/patches/0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-application.patch 1970-01-01 01:00:00.000000000 +0100
+++ x2goclient-4.0.3.1/debian/patches/0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-application.patch 2015-01-09 15:02:00.000000000 +0100
@@ -0,0 +1,41 @@
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 7 Jan 2015 09:31:55 +0000 (+0100)
+Subject: Use app.setQuitOnLastWindowClosed(false) for the X2Go Client QtApplication to assure...
+X-Git-Url: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=3008b2a10fde108810650849522f4d2e76c3b300
+
+Use app.setQuitOnLastWindowClosed(false) for the X2Go Client QtApplication to assure that X2Go Client does not arbitrarily exit during a running session. This fixes X2Go Client crashes that occur when printing via the CUPS-X2Go printing mechanism with activate print dialog popup on incoming print jobs and minimized main window. (Fixes: #702).
+---
+
+#diff --git a/debian/changelog b/debian/changelog
+#index a754d04..ae08442 100644
+#--- a/debian/changelog
+#+++ b/debian/changelog
+#@@ -9,6 +9,11 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
+# * New upstream release (4.0.3.2):
+# - Provide empty Turkish translation file.
+# - Add several info/error/debug log message while hunting down #702.
+#+ - Use app.setQuitOnLastWindowClosed(false) for the X2Go Client QtApplication
+#+ to assure that X2Go Client does not arbitrarily exit during a running
+#+ session. This fixes X2Go Client crashes that occur when printing via
+#+ the CUPS-X2Go printing mechanism with activate print dialog popup on
+#+ incoming print jobs and minimized main window. (Fixes: #702).
+#
+# [ Jason Alavaliant ]
+# * New upstream verson (4.0.3.2):
+diff --git a/ongetpass.cpp b/ongetpass.cpp
+index e88cbe5..0a9401b 100644
+--- a/ongetpass.cpp
++++ b/ongetpass.cpp
+@@ -103,7 +103,11 @@ int x2goMain ( int argc, char *argv[] )
+ {
+ ONMainWindow* mw = new ONMainWindow;
+ mw->show();
+- return app.exec();
++ int retval;
++ app.setQuitOnLastWindowClosed(false);
++ retval = app.exec();
++ delete mw;
++ return retval;
+ }
+ #endif
+ return 0;
diff -Nru x2goclient-4.0.3.1/debian/patches/0004-fix-quoting+escaping-ssh-commands.patch x2goclient-4.0.3.1/debian/patches/0004-fix-quoting+escaping-ssh-commands.patch
--- x2goclient-4.0.3.1/debian/patches/0004-fix-quoting+escaping-ssh-commands.patch 1970-01-01 01:00:00.000000000 +0100
+++ x2goclient-4.0.3.1/debian/patches/0004-fix-quoting+escaping-ssh-commands.patch 2015-01-09 21:56:06.000000000 +0100
@@ -0,0 +1,85 @@
+commit a86676d05d21c91700500dea0f84a08b006cbfa7
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Fri Jan 9 21:41:46 2015 +0100
+
+ Fix quotes when calling remote commands via SSH (esp. allow same quoting/ escaping style for libssh and openSSH+Krb based connections). (Fixes: #720).
+
+ (rebased against current version of X2Go Client in Debian)
+
+#diff --git a/debian/changelog b/debian/changelog
+#index 3e67cf4..21e06c5 100644
+#--- a/debian/changelog
+#+++ b/debian/changelog
+#@@ -26,6 +26,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
+# - Fix string concatenation/layout of error message when tunnel I/O errors
+# occur.
+# - Improve debugging/logging the SSH connections made by X2Go Client.
+#+ - Fix quotes when calling remote commands via SSH (esp. allow same quoting/
+#+ escaping style for libssh and openSSH+Krb based connections). (Fixes: #720).
+#
+# [ Jason Alavaliant ]
+# * New upstream verson (4.0.3.2):
+--- a/httpbrokerclient.cpp
++++ b/httpbrokerclient.cpp
+@@ -302,10 +302,10 @@
+ else
+ {
+ if (nextAuthId.length() > 0) {
+- sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+nextAuthId+ " --task selectsession --sid \\\""+session+"\\\"",
++ sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+nextAuthId+ " --task selectsession --sid \""+session+"\"",
+ this,SLOT ( slotSelectSession(bool,QString,int)));
+ } else {
+- sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task selectsession --sid \\\""+session+"\\\"",
++ sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task selectsession --sid \""+session+"\"",
+ this,SLOT ( slotSelectSession(bool,QString,int)));
+ }
+ }
+--- a/onmainwindow.cpp
++++ b/onmainwindow.cpp
+@@ -5444,14 +5444,7 @@
+ }
+ }
+ }
+- if(sshConnection->useKerberos())
+- {
+- sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo '"+kbMap+"' | xmodmap -");
+- }
+- else
+- {
+- sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo \\\""+kbMap+"\\\" | xmodmap -");
+- }
++ sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo \""+kbMap+"\" | xmodmap -");
+ }
+ #endif
+
+--- a/sshmasterconnection.cpp
++++ b/sshmasterconnection.cpp
+@@ -1140,7 +1140,7 @@
+ QUuid uuid = QUuid::createUuid();
+ QString uuidStr = uuid.toString().mid(1, 36).toLower();
+
+- QString shcmd = " echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr ;
++ QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr +";'";
+
+ #ifdef Q_OS_WIN
+ sshCmd="plink -batch "+user+"@"+host+" -P "+
+--- a/sshprocess.cpp
++++ b/sshprocess.cpp
+@@ -190,7 +190,7 @@
+ // #endif
+ if(!masterCon->useKerberos())
+ {
+- QString shcmd = "sh -c \"echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +"\";";
++ QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'";
+ masterCon->addChannelConnection(this, uuidStr, shcmd);
+ connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray)));
+ connect(masterCon,SIGNAL(channelClosed(SshProcess*,QString)), this,SLOT(slotChannelClosed(SshProcess*,QString)));
+@@ -198,7 +198,7 @@
+ else
+ {
+ QString host=masterCon->getHost();
+- QString shcmd = "echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr;
++ QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'";
+ proc=new QProcess(this);
+ #ifdef Q_OS_WIN
+ if(masterCon->get_kerberosDelegation())
diff -Nru x2goclient-4.0.3.1/debian/patches/series x2goclient-4.0.3.1/debian/patches/series
--- x2goclient-4.0.3.1/debian/patches/series 2015-01-06 05:56:47.000000000 +0100
+++ x2goclient-4.0.3.1/debian/patches/series 2015-01-09 21:55:16.000000000 +0100
@@ -1,3 +1,5 @@
0001_use-QUrl::toPercentEncoding-for-encoding-broker-passwords.patch
0002_fix-GUI-for-session-profile-subfolders.patch
+0003_use-app-setQuitOnLastWindowClose-false-for-X2GoClient-application.patch
+0004-fix-quoting+escaping-ssh-commands.patch
1001_deprecated-apache2-config.patch
Reply to: