Your message dated Sun, 30 Dec 2012 12:35:02 +0000 with message-id <1356870902.4281.32.ca...@jacala.jungle.funky-badger.org> and subject line Re: Bug#696560: unblock: x2goclient/3.99.2.1-2 (pre-upload approval) has caused the Debian Bug report #696560, regarding unblock: x2goclient/3.99.2.1-2 (pre-upload approval) to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 696560: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696560 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock This is a pre-upload approval for transition of x2goclient src:package 3.99.2.1-2 to wheezy. The package has not been uploaded, yet. The upload closes two RC bugs (grave) and closes two other important bugs. The upload also fixes the hardening compiler/linker options in the project's main Makefile. As bonus an example file has been added that shows the usage of x2goplugin: /debian/examples/x2goplugin.html. Please let me know if an upload x2goclient 3.99.2.1-2 will get an unblock exception for wheezy. Thanks to all, Mike diff -Nru x2goclient-3.99.2.1/debian/changelog x2goclient-3.99.2.1/debian/changelog --- x2goclient-3.99.2.1/debian/changelog 2012-06-12 00:15:20.000000000 +0200 +++ x2goclient-3.99.2.1/debian/changelog 2012-12-22 21:37:25.000000000 +0100 @@ -1,3 +1,22 @@ +x2goclient (3.99.2.1-2) unstable; urgency=low + + * /debian/copyright: + + Set copyright format to v1.0. + * /debian/control: + + Orthographical and grammatical fixes in description texts. + * Fix patch: 001_hardening-x2goclient.patch, provide CPPFLAGS for + QMAKE_CFLAGS, as well. Provide CPPFLAGS first. + * Add patches: 004_allow-login-to-non-sh-users.patch and + 005_xinerama-for-non-sh-users.patch. Fix x2goclient for users that use + a non-sh shell (e.g. like tcsh) on the X2Go Server. (Closes: #682839). + * Add patch: 006_fix-x2goplugin.patch. Fixes host name resolving when + client is run in X2Go Plugin mode. Fixes session crashes directly + after session startup. Let the plugin tolerate whitespace at the beginning + of session profile configs. (Closes: #692555, #696524, #696529). + * Add example file: x2goplugin.html. + + -- Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Sat, 22 Dec 2012 21:36:55 +0100 + x2goclient (3.99.2.1-1) unstable; urgency=low * New upstream release. diff -Nru x2goclient-3.99.2.1/debian/control x2goclient-3.99.2.1/debian/control --- x2goclient-3.99.2.1/debian/control 2012-06-08 21:59:24.000000000 +0200 +++ x2goclient-3.99.2.1/debian/control 2012-12-17 23:46:02.000000000 +0100 @@ -34,9 +34,10 @@ Description: X2Go Client application (Qt4) X2Go is a serverbased computing environment with - session resuming - - low bandwith support + - low bandwidth support - LDAP support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . @@ -58,9 +59,10 @@ Description: X2Go Client (Qt4) as browser plugin X2Go is a serverbased computing environment with - session resuming - - low bandwith support + - low bandwidth support - LDAP support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . diff -Nru x2goclient-3.99.2.1/debian/copyright x2goclient-3.99.2.1/debian/copyright --- x2goclient-3.99.2.1/debian/copyright 2012-06-09 14:28:48.000000000 +0200 +++ x2goclient-3.99.2.1/debian/copyright 2012-08-17 14:39:35.000000000 +0200 @@ -1,4 +1,4 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: x2goclient Upstream-Contact: Oleksandr Shneyder <oleksandr.shney...@obviously-nice.de> Source: http://wiki.x2go.org diff -Nru x2goclient-3.99.2.1/debian/examples/x2goplugin.html x2goclient-3.99.2.1/debian/examples/x2goplugin.html --- x2goclient-3.99.2.1/debian/examples/x2goplugin.html 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-3.99.2.1/debian/examples/x2goplugin.html 2012-12-22 14:20:14.000000000 +0100 @@ -0,0 +1,47 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <title>X2Go Application Service</title> + </head> + <body onload="checkPlugin()"> + <div id="x2goplugin"> + <object + src="location" + type="application/x2go" + name="x2goplugin" + palette="background" + height="100%" + hspace="0" + vspace="0" + width="100%" + x2goconfig=" + session=X2Go-Demo-Session + server=localhost + user= + sshport=22 + command=KDE + rootless=false + sound=true + exportfs=true + speed=adsl + compression=16m-jpeg + quality=9 + dpi=120 + kbdlayout= + kbdtype=auto + showtoolbar=true + showstatusbar=true + usekbd=true + soundsystem=pulse + soundtunnel=true + defsndport=true + print=true + rootless=false + published=false + applications=WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL + "> + </object> + + </div> + </body> +</html> diff -Nru x2goclient-3.99.2.1/debian/patches/001_hardening-x2goclient.patch x2goclient-3.99.2.1/debian/patches/001_hardening-x2goclient.patch --- x2goclient-3.99.2.1/debian/patches/001_hardening-x2goclient.patch 2012-06-08 21:59:24.000000000 +0200 +++ x2goclient-3.99.2.1/debian/patches/001_hardening-x2goclient.patch 2012-06-25 17:37:25.000000000 +0200 @@ -7,13 +7,13 @@ build_client: lrelease x2goclient.pro - mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro -+ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro ++ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: lrelease x2goclient.pro - mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro -+ mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro ++ mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) build_man: diff -Nru x2goclient-3.99.2.1/debian/patches/004_allow-login-to-non-sh-users.patch x2goclient-3.99.2.1/debian/patches/004_allow-login-to-non-sh-users.patch --- x2goclient-3.99.2.1/debian/patches/004_allow-login-to-non-sh-users.patch 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-3.99.2.1/debian/patches/004_allow-login-to-non-sh-users.patch 2012-12-16 12:13:58.000000000 +0100 @@ -0,0 +1,71 @@ +Description: Allow x2goclient to connect to user accounts that have other shells than /bin/sh... +Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> +Date: Thu, 26 Jul 2012 09:06:53 +0000 (+0200) +Source: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=5e5eb0cfffc514ee419a116a78f25ff98728c746 +Abstract: + Allow x2goclient to connect to user accounts that have other shells than + /bin/sh and alike configured as default shell. Also: removal of bashisms in + shell execution commands. + +--- a/onmainwindow.cpp ++++ b/onmainwindow.cpp +@@ -5505,7 +5505,7 @@ + resumingSession.agentPid + " " + + resumingSession.sessionId+" "+ + resumingSession.sndPort+ " "+ command+" nosnd "+ +- sessionType +">& /dev/null & exit"; ++ sessionType +" 1> /dev/null 2>/dev/null & exit"; + if ( startSessSndSystem ==PULSE ) + { + cmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ +@@ -5524,7 +5524,7 @@ + resumingSession.sessionId+" "+ + resumingSession.sndPort+ " "+ + command+" esd "+ +- sessionType +">& /dev/null & exit"; ++ sessionType +" 1> /dev/null 2>/dev/null & exit"; + break; + case ARTS: + cmd="setsid x2goruncommand "+ +@@ -5533,7 +5533,7 @@ + resumingSession.sessionId+" "+ + resumingSession.sndPort+ " "+ + command+" arts "+ +- sessionType +">& /dev/null & exit"; ++ sessionType +" 1> /dev/null 2>/dev/null & exit"; + break; + + } +@@ -5563,7 +5563,7 @@ + proc->startNormal ("PULSE_CLIENTCONFIG=~/.x2go/C-"+ + resumingSession.sessionId+"/.pulse-client.conf DISPLAY=:"+ + resumingSession.display+ +- " setsid "+exec+">& /dev/null & exit"); ++ " setsid "+exec+" 1> /dev/null 2>/dev/null & exit"); + } + + void ONMainWindow::slotRetRunCommand ( bool result, QString output, +@@ -10265,7 +10265,7 @@ + QString scmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ + resumingSession.sessionId+ + "/.pulse-client.conf "+ +- "parec > /dev/null &sleep 1 && kill %1"; ++ "parec 1> /dev/null & sleep 1 && kill %1"; + + paProc=new SshProcess ( sshConnection, this ); + paProc->startNormal ( scmd ); +--- a/sshprocess.cpp ++++ b/sshprocess.cpp +@@ -130,7 +130,11 @@ + + void SshProcess::startNormal(const QString& cmd) + { +- masterCon->addChannelConnection(this, cmd); ++ QString shcmd = "sh -c \""+cmd+"\""; ++// #ifdef DEBUG ++ x2goDebug<<"executing remote command: "<<shcmd<<endl; ++// #endif ++ masterCon->addChannelConnection(this, shcmd); + connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); + connect(masterCon,SIGNAL(channelClosed(SshProcess*)), this,SLOT(slotChannelClosed(SshProcess*))); + } diff -Nru x2goclient-3.99.2.1/debian/patches/005_xinerama-for-non-sh-users.patch x2goclient-3.99.2.1/debian/patches/005_xinerama-for-non-sh-users.patch --- x2goclient-3.99.2.1/debian/patches/005_xinerama-for-non-sh-users.patch 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-3.99.2.1/debian/patches/005_xinerama-for-non-sh-users.patch 2012-12-16 12:20:39.000000000 +0100 @@ -0,0 +1,23 @@ +Description: Use ,,printf'' instead of ,,echo -e'' (Bashism). Fixes faulty creation of xinerama.conf files. +Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> +Date: Thu, 11 Oct 2012 13:10:48 +0000 (+0200) +Source: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=cae4f4d7dbacc720ee1e064441af82667b4f040f +Abstract: + Use ,,printf'' instead of ,,echo -e'' (Bashism) when creating xinerama.conf + files on X2Go Server. Fixes occurences of faulty xinerama.conf files. Without + this patch, the xinerama.conf files do contain \n instead of real new lines + at EOL and are misinterpreted by x2goagent. + . + This patch is a follow-up fix for 004_allow-login-to-non-sh-users.patch. + +--- a/onmainwindow.cpp ++++ b/onmainwindow.cpp +@@ -9118,7 +9118,7 @@ + foreach (QRect disp, xineramaScreens) + screens<<QString::number(disp.x())+" "+QString::number(disp.y())+" "+QString::number(disp.width())+ + " "+QString::number(disp.height()); +- QString cmd="export DISPLAY=:"+resumingSession.display+";echo -e "+screens.join("\\\\n")+" > ~/.x2go/C-"+ ++ QString cmd="export DISPLAY=:"+resumingSession.display+";printf "+screens.join("\\\\n")+" > ~/.x2go/C-"+ + resumingSession.sessionId+"/xinerama.conf"; + + x2goDebug<<cmd<<endl; diff -Nru x2goclient-3.99.2.1/debian/patches/006_fix-x2goplugin.patch x2goclient-3.99.2.1/debian/patches/006_fix-x2goplugin.patch --- x2goclient-3.99.2.1/debian/patches/006_fix-x2goplugin.patch 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-3.99.2.1/debian/patches/006_fix-x2goplugin.patch 2012-12-22 11:59:02.000000000 +0100 @@ -0,0 +1,51 @@ +Description: Fix issues in x2goplugin that make the plugin unusable. +Author: Oleksandr Shneyder <o.shney...@phoca-gmbh.de> +Date: Wed, 7 Nov 2012 09:36:40 +0000 (+0100) +Source: + http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=f1fb104bc7ce1a3d93792b3594566a8870d139a3 + http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 + http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=9aa8514c8a39b4c144fede0e8369962a618f9ddf +Abstract: + - Fix error "Failed to resolve hostname" when X2Go Client runs in browser + plugin mode. + - Fix crash of the plugin container at session startup. + - Tolerate whitespaces at the beginning of session configs provided via + html pages. + +--- a/onmainwindow.cpp ++++ b/onmainwindow.cpp +@@ -3030,8 +3030,11 @@ + X2goSettings st ( "sessions" ); + + passForm->setEnabled ( false ); +- host=st.setting()->value ( sid+"/host", +- ( QVariant ) QString::null ).toString(); ++ if(!embedMode) ++ host=st.setting()->value ( sid+"/host", ++ ( QVariant ) QString::null ).toString(); ++ else ++ host=config.server; + QString cmd=st.setting()->value ( sid+"/command", + ( QVariant ) QString::null ).toString(); + autologin=st.setting()->value ( sid+"/autologin", +@@ -8944,6 +8947,8 @@ + + void ONMainWindow::setProxyWinTitle() + { ++ if(embedMode) ++ return; + + QString title; + +@@ -9364,6 +9369,11 @@ + for ( int i=0;i<lines.count();++i ) + { + QString line = lines[i]; ++ ++ // strip left/right whitespaces, important for plugin settings via x2goconfig ++ line.remove(QRegExp("^\\s+")); ++ line.remove(QRegExp("\\s+$")); ++ + if ( ( line=="-----BEGIN DSA PRIVATE KEY-----" ) || + ( line=="-----BEGIN RSA PRIVATE KEY-----" ) ) + { diff -Nru x2goclient-3.99.2.1/debian/patches/series x2goclient-3.99.2.1/debian/patches/series --- x2goclient-3.99.2.1/debian/patches/series 2012-06-08 21:59:24.000000000 +0200 +++ x2goclient-3.99.2.1/debian/patches/series 2012-12-22 12:02:48.000000000 +0100 @@ -1,3 +1,6 @@ 001_hardening-x2goclient.patch 002_remove-encoding-from-desktop-entry.patch 003_fix-spelling-error-authentication.patch +004_allow-login-to-non-sh-users.patch +005_xinerama-for-non-sh-users.patch +006_fix-x2goplugin.patch diff -Nru x2goclient-3.99.2.1/debian/x2goplugin.examples x2goclient-3.99.2.1/debian/x2goplugin.examples --- x2goclient-3.99.2.1/debian/x2goplugin.examples 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-3.99.2.1/debian/x2goplugin.examples 2012-12-22 14:20:33.000000000 +0100 @@ -0,0 +1 @@ +debian/examples/* -- System Information: Debian Release: 6.0.6 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-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
--- End Message ---
--- Begin Message ---On Wed, 2012-12-26 at 21:29 +0100, Mike Gabriel wrote: > On Mo 24 Dez 2012 20:58:33 CET "Adam D. Barratt" wrote: > > > > On 22.12.2012 20:58, Mike Gabriel wrote: > >> This is a pre-upload approval for transition of x2goclient src:package > >> 3.99.2.1-2 to wheezy. The package has not been uploaded, yet. > >> > >> The upload closes two RC bugs (grave) and closes two other important bugs. > >> > >> The upload also fixes the hardening compiler/linker options in the > >> project's > >> main Makefile. > >> > >> As bonus an example file has been added that shows the usage of x2goplugin: > >> /debian/examples/x2goplugin.html. > > > > These all sound like changes that, according to your descriptions, > > meet the currently published criteria so don't really need any sort > > of pre-approval? [...] > Package has been uploaded. Unblocked; thanks. Regards, Adam
--- End Message ---
