This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from 73af76e macbuild.sh: add usage message obtainable via -h or --help. new 4e35da3 debian/changelog: move changelog entries for this branch to the correct, unreleased version 4.0.4.0. new afedea1 x2goclient.pro.maemo: cleanup. new f4e0c64 x2goclient.pro: move OS X-specific stuff from general section to macx section. The 3 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. Summary of changes: debian/changelog | 192 ++++++++++++++++++++++++++------------------------ x2goclient.pro | 22 +++--- x2goclient.pro.maemo | 134 ++++++++++++++++++----------------- 3 files changed, 178 insertions(+), 170 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.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 feature/cleanup in repository x2goclient. commit 4e35da33a3ad460e87e46e43a2da7e96180ffef3 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 00:50:26 2015 +0100 debian/changelog: move changelog entries for this branch to the correct, unreleased version 4.0.4.0. --- debian/changelog | 186 +++++++++++++++++++++++++++--------------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/debian/changelog b/debian/changelog index f17a690..114be2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,100 +23,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low that we are distributing the exact DLLs that the Cygwin project provides, which is desirable for security. - -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 - -x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - - [ Oleksandr Shneyder ] - * New upstream release (4.0.3.2): - - Fix placement of session folders in session card column. (Fixes: #681). - - Send empty message in x2gohelper to stop AppStarting cursor. (Fixes: #616). - - Fix multiple creations of modmap timer (OS_DARWIN). - - [ Mike Gabriel ] - * New upstream release (4.0.3.2): - - 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). - - Be more exact when reporting rev forwarding tunnel request failures to - the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) - in the error message. - - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if - --debug is given. - - sshmasterconnection.cpp: Fix several grammar issues in error messages. - - When sharing a client-side folder, do not write the SSH pub key to - client-side authorized_keys file if the folder-to-be-shared does not - exist on the client. (Partially solves #405). - - 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). - - FIXME: Disable PubkeyAuthentication _and_ PasswordAuthentication if - GSSAPI authentication is activated. This is counter intuitive, though, - and requires several other fixes in the authentication code. - * x2goclient.spec: - - Always set BuildRoot: parameter. - - [ Sergey Savko ] - * New upstream release (4.0.3.2): - - Prevent passwordless re-logins into X2Go Session Broker if - --broker-autologoff is used on the cmdline. (Fixes: #782). - - Add new cmdline option --broker-noauth-use-session-username. - When --broker-noauth is used, the broker does not know on behalf - of which user to operate. This new option enables username syncing. - When logging into X2Go Server, that username will be sent to the - broker and be used for querying X2Go Broker Agents etc. (Fixes: #781). - - [ Heinrich Schuchardt ] - * New upstream release (4.0.3.2): - - Base the layout dialogue "Session ID" (which shows up when starting a - connection) on typographic points (instead of pixels). (Fixes: #713). - - [ Jason Alavaliant ] - * New upstream verson (4.0.3.2): - - Use QUrl::toPercentEncoding() method to properly encode passwords sent - to X2Go Session Broker. (Fixes: #705). - - [ Mike DePaulo ] - * New upstream release (4.0.3.2): - - Windows: Win32 OpenSSL updates from 1.0.1j to 1.0.1L, which - fixes the CVEs announced on 2015-01-08. - - Windows: Cygwin OpenSSL updated from 1.0.1j-1 to 1.0.1k-1, which - fixes the CVEs announced on 2015-01-08. - - Windows: Bundle new version of VcXsrv: 1.15.2.2-xp+vc2013+x2go1. - The differences from 1.15.2.1-xp+vc2013+x2go1 are that its bundled - OpenSSL has been updated to 1.0.1k, and that xorg-server - CVE-2014-8091..8103 have been fixed. - - Windows: Update libssh from 0.6.3 to 0.6.4 (while maintaining - Pageant support). This fixes CVE-2014-8132, which shouldn't - affect x2goclient because x2goclient uses the SSH client - functionality, not the SSH server functionality. - 0.6.4 also added 4 features related to ECDSA keys. - - Windows: Fix compatibility with PulseAudio 6.0 - - Windows: Remove workaround for audio input with old versions of - PulseAudio (calling parec once per second) - (Fixes: #742) - Thanks George Trakatelis (uom.edu.gr) for submitting this change. - - Windows: Enable X2Go Client for Windows to build under VS2010 nmake - (but not the VS2010 IDE due to a Qt4 Visual Studio Add-in limitation) - Note that the official builds are still build under MinGW. - (Fixes: #642) - Thanks George Trakatelis (uom.edu.gr) for submitting this feature. - - Windows: Make builds easier, and updating bundled dependencies - easier, by adding copy-deps-win32.bat. It copies the exact - version of each dependency (DLL, executable, data, folder, etc) - from x2goclient-contrib.git. - - [ Kaan Ozdincer ] - * New upstream version (4.0.3.2): - - Add Turkish translation file. - [ Mihai Moldovan ] - * New upstream version (4.0.3.2): + * New upstream version (4.0.4.0): - Move *.cpp and *.h files to src/ and *.ts files to src/i18n/. - Reference src/ in Doxyfile. - Reference src/ and src/i18n/ in x2goclient.pro. @@ -259,6 +167,98 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium and x86 (UNIVERSAL=1). - Add usage message to macbuild.sh obtainable via -h or --help. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 + +x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium + + [ Oleksandr Shneyder ] + * New upstream release (4.0.3.2): + - Fix placement of session folders in session card column. (Fixes: #681). + - Send empty message in x2gohelper to stop AppStarting cursor. (Fixes: #616). + - Fix multiple creations of modmap timer (OS_DARWIN). + + [ Mike Gabriel ] + * New upstream release (4.0.3.2): + - 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). + - Be more exact when reporting rev forwarding tunnel request failures to + the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) + in the error message. + - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if + --debug is given. + - sshmasterconnection.cpp: Fix several grammar issues in error messages. + - When sharing a client-side folder, do not write the SSH pub key to + client-side authorized_keys file if the folder-to-be-shared does not + exist on the client. (Partially solves #405). + - 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). + - FIXME: Disable PubkeyAuthentication _and_ PasswordAuthentication if + GSSAPI authentication is activated. This is counter intuitive, though, + and requires several other fixes in the authentication code. + * x2goclient.spec: + - Always set BuildRoot: parameter. + + [ Sergey Savko ] + * New upstream release (4.0.3.2): + - Prevent passwordless re-logins into X2Go Session Broker if + --broker-autologoff is used on the cmdline. (Fixes: #782). + - Add new cmdline option --broker-noauth-use-session-username. + When --broker-noauth is used, the broker does not know on behalf + of which user to operate. This new option enables username syncing. + When logging into X2Go Server, that username will be sent to the + broker and be used for querying X2Go Broker Agents etc. (Fixes: #781). + + [ Heinrich Schuchardt ] + * New upstream release (4.0.3.2): + - Base the layout dialogue "Session ID" (which shows up when starting a + connection) on typographic points (instead of pixels). (Fixes: #713). + + [ Jason Alavaliant ] + * New upstream verson (4.0.3.2): + - Use QUrl::toPercentEncoding() method to properly encode passwords sent + to X2Go Session Broker. (Fixes: #705). + + [ Mike DePaulo ] + * New upstream release (4.0.3.2): + - Windows: Win32 OpenSSL updates from 1.0.1j to 1.0.1L, which + fixes the CVEs announced on 2015-01-08. + - Windows: Cygwin OpenSSL updated from 1.0.1j-1 to 1.0.1k-1, which + fixes the CVEs announced on 2015-01-08. + - Windows: Bundle new version of VcXsrv: 1.15.2.2-xp+vc2013+x2go1. + The differences from 1.15.2.1-xp+vc2013+x2go1 are that its bundled + OpenSSL has been updated to 1.0.1k, and that xorg-server + CVE-2014-8091..8103 have been fixed. + - Windows: Update libssh from 0.6.3 to 0.6.4 (while maintaining + Pageant support). This fixes CVE-2014-8132, which shouldn't + affect x2goclient because x2goclient uses the SSH client + functionality, not the SSH server functionality. + 0.6.4 also added 4 features related to ECDSA keys. + - Windows: Fix compatibility with PulseAudio 6.0 + - Windows: Remove workaround for audio input with old versions of + PulseAudio (calling parec once per second) + (Fixes: #742) + Thanks George Trakatelis (uom.edu.gr) for submitting this change. + - Windows: Enable X2Go Client for Windows to build under VS2010 nmake + (but not the VS2010 IDE due to a Qt4 Visual Studio Add-in limitation) + Note that the official builds are still build under MinGW. + (Fixes: #642) + Thanks George Trakatelis (uom.edu.gr) for submitting this feature. + - Windows: Make builds easier, and updating bundled dependencies + easier, by adding copy-deps-win32.bat. It copies the exact + version of each dependency (DLL, executable, data, folder, etc) + from x2goclient-contrib.git. + + [ Kaan Ozdincer ] + * New upstream version (4.0.3.2): + - Add Turkish translation file. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 x2goclient (4.0.3.1-0x2go1) unstable; urgency=medium -- Alioth's /srv/git/code.x2go.org/x2goclient.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 feature/cleanup in repository x2goclient. commit afedea142248472035d741917b22353a952160ea Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 00:51:21 2015 +0100 x2goclient.pro.maemo: cleanup. - Reorder sections so that they match x2goclient.pro. - Adapt to new directory structure. - Various whitespace fixes. --- debian/changelog | 4 ++ x2goclient.pro.maemo | 134 +++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 66 deletions(-) diff --git a/debian/changelog b/debian/changelog index 114be2f..ffa0d70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -166,6 +166,10 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). - Add usage message to macbuild.sh obtainable via -h or --help. + - x2goclient.pro.maemo: cleanup. + + Reorder sections so that they match x2goclient.pro. + + Adapt to new directory structure. + + Various whitespace fixes. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/x2goclient.pro.maemo b/x2goclient.pro.maemo index cf09e02..c900228 100644 --- a/x2goclient.pro.maemo +++ b/x2goclient.pro.maemo @@ -1,73 +1,75 @@ -# Diese Datei wurde mit dem qmake-Manager von KDevelop erstellt. -# ------------------------------------------- -# Unterordner relativ zum Projektordner: . -# Das Target ist eine Anwendung: +# This file was created by KDevelop. +# ------------------------------------------- +# +FORMS += src/ui/cupsprintsettingsdialog.ui \ + src/ui/cupsprintwidget.ui \ + src/ui/printwidget.ui \ + src/ui/printercmddialog.ui \ + src/ui/printdialog.ui + +TRANSLATIONS += res/i18n/x2goclient_de.ts \ + res/i18n/x2goclient_ru.ts + +HEADERS += src/configdialog.h \ + src/editconnectiondialog.h \ + src/exportdialog.h \ + src/imgframe.h \ + src/LDAPSession.h \ + src/onmainwindow.h \ + src/sessionbutton.h \ + src/sessionmanagedialog.h \ + src/sshprocess.h \ + src/SVGFrame.h \ + src/userbutton.h \ + src/x2goclientconfig.h \ + src/x2gologdebug.h \ + src/printprocess.h \ + src/printwidget.h \ + src/printercmddialog.h \ + src/printdialog.h \ + src/embedwidget.h \ + src/wapi.h \ + src/sessionwidget.h \ + src/configwidget.h \ + src/connectionwidget.h \ + src/settingswidget.h \ + src/sharewidget.h \ + src/clicklineedit.h + +SOURCES += src/sharewidget.cpp \ + src/settingswidget.cpp \ + src/configwidget.cpp \ + src/sessionwidget.cpp \ + src/connectionwidget.cpp \ + src/configdialog.cpp \ + src/editconnectiondialog.cpp \ + src/exportdialog.cpp \ + src/imgframe.cpp \ + src/LDAPSession.cpp \ + src/ongetpass.cpp \ + src/onmainwindow.cpp \ + src/sessionbutton.cpp \ + src/sessionmanagedialog.cpp \ + src/sshprocess.cpp \ + src/SVGFrame.cpp \ + src/userbutton.cpp \ + src/x2gologdebug.cpp \ + src/printprocess.cpp \ + src/printwidget.cpp \ + src/printercmddialog.cpp \ + src/printdialog.cpp \ + src/embedwidget.cpp \ + src/wapi.cpp \ + src/clicklineedit.cpp -TRANSLATIONS += x2goclient_de.ts -TRANSLATIONS += x2goclient_ru.ts -HEADERS += configdialog.h \ - editconnectiondialog.h \ - exportdialog.h \ - imgframe.h \ - LDAPSession.h \ - onmainwindow.h \ - sessionbutton.h \ - sessionmanagedialog.h \ - sshprocess.h \ - SVGFrame.h \ - userbutton.h \ - x2goclientconfig.h \ - x2gologdebug.h \ - printprocess.h \ - printwidget.h \ - printercmddialog.h \ - printdialog.h \ - embedwidget.h \ - wapi.h \ - sessionwidget.h \ - configwidget.h \ - connectionwidget.h \ - settingswidget.h \ - sharewidget.h \ - clicklineedit.h -SOURCES += sharewidget.cpp \ - settingswidget.cpp\ - configwidget.cpp \ - sessionwidget.cpp \ - connectionwidget.cpp \ - configdialog.cpp \ - editconnectiondialog.cpp \ - exportdialog.cpp \ - imgframe.cpp \ - LDAPSession.cpp \ - ongetpass.cpp \ - onmainwindow.cpp \ - sessionbutton.cpp \ - sessionmanagedialog.cpp \ - sshprocess.cpp \ - SVGFrame.cpp \ - userbutton.cpp \ - x2gologdebug.cpp \ - printprocess.cpp \ - printwidget.cpp \ - printercmddialog.cpp \ - printdialog.cpp \ - embedwidget.cpp \ - wapi.cpp \ - clicklineedit.cpp TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . -RESOURCES += resources.rcc -RC_FILE = x2goclient.rc +RESOURCES += res/resources.rcc +RC_FILE = res/x2goclient.rc QT += svg network -ICON =icons/x2go-mac.icns -QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk -CONFIG +=x86 ppc -FORMS += cupsprintsettingsdialog.ui \ -cupsprintwidget.ui \ -printwidget.ui \ -printercmddialog.ui \ -printdialog.ui +ICON = $${PWD}/res/img/icons/x2go-mac.icns +QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk +CONFIG += x86 ppc -- Alioth's /srv/git/code.x2go.org/x2goclient.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 feature/cleanup in repository x2goclient. commit f4e0c64a99bf3b106e64968210d7b528a05dfe45 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 16:23:43 2015 +0100 x2goclient.pro: move OS X-specific stuff from general section to macx section. --- debian/changelog | 2 ++ x2goclient.pro | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index ffa0d70..e2419a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -170,6 +170,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low + Reorder sections so that they match x2goclient.pro. + Adapt to new directory structure. + Various whitespace fixes. + - Move OS X-specific stuff from general section to macx section in + x2goclient.pro. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 4c2cdd4..122122a 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -190,6 +190,17 @@ macx { !isEmpty(OSX_STDLIB) { QMAKE_CXXFLAGS += --stdlib=$${OSX_STDLIB} } + + # Strictly speaking, this is a bug in qmake and we should neither need $${PWD} + # nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS nor QMAKE_POST_LINK. + # Not defining the latter two will however lead to it being empty and no + # Info.plist file being created in the first place. + # The last command takes care of actually putting the icon in place - yet + # another bug in qmake. Bummer. + QMAKE_INFO_PLIST = $${PWD}/res/osxbundle/Info.plist + QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist + PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist + QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ } win32-* { message("building $$TARGET for windows without ldap and cups") @@ -199,17 +210,6 @@ win32-* { QT += svg network ICON = $${PWD}/res/img/icons/x2go-mac.icns -# Strictly speaking, this is a bug in qmake and we should neither need $${PWD} -# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS nor QMAKE_POST_LINK. -# Not defining the latter two will however lead to it being empty and no -# Info.plist file being created in the first place. -# The last command takes care of actually putting the icon in place - yet -# another bug in qmake. Bummer. -QMAKE_INFO_PLIST = $${PWD}/res/osxbundle/Info.plist -QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist -PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist -QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ - QMAKE_CXXFLAGS_DEBUG -= -g QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4 -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git