This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 3ae95bc src/x2goclient.cpp: fix array length calculation. new 3265475 Windows: Update PuTTY from 0.70 to 0.71. new 485c876 Windows: upgrade bundled VcXsrv to 1.20.1.4. new 03bedb7 src/sshmasterconnection.cpp: use info (protocol) log level with --libssh-debug and debug (packet) log level with --libssh-packetlog. new b54ff5b src/sshmasterconnection.cpp: fix compiler warning due to mismatching argument with older libssh versions. The 4 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: copy-deps-win32.bat | 4 ++-- debian/changelog | 8 ++++++++ src/sshmasterconnection.cpp | 12 ++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 master in repository x2goclient. commit 3265475896db8e8266204770fbdca4ba650e30b0 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 22 22:25:54 2019 +0200 Windows: Update PuTTY from 0.70 to 0.71. Fixes quite a list of issues discovered through the EU-funded bug bounty programme. Not all are relevant to X2Go Client. --- copy-deps-win32.bat | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat index a5c3a2e..a389d2b 100755 --- a/copy-deps-win32.bat +++ b/copy-deps-win32.bat @@ -11,7 +11,7 @@ xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++ xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\MSVC-DLLs\2013-12.0.21005.1-x86\msvcr120.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\pulse\7.1-2.2_bin %3\ || exit /b %errorlevel% -xcopy /E /Y %1\PuTTY\0.70_bin %3\ || exit /b %errorlevel% +xcopy /E /Y %1\PuTTY\0.71_bin %3\ || exit /b %errorlevel% xcopy /E /Y /I %1\VcXsrv\1.20.0.0_bin %3\VcXsrv || exit /b %errorlevel% xcopy /E /Y %1\zlib\1.2.8_bin\zlib1.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %3\ || exit /b %errorlevel% diff --git a/debian/changelog b/debian/changelog index 0969312..37accc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,9 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium but really based upon 0.7.x and still has/needs a libssh_threads library. Big "Wat?" to you, Canonical. - src/x2goclient.cpp: fix array length calculation. + - Windows: Update PuTTY from 0.70 to 0.71. Fixes quite a list of issues + discovered through the EU-funded bug bounty programme. Not all are + relevant to X2Go Client. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: -- Alioth's /home/x2go-admin/maintenancescripts/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 master in repository x2goclient. commit 485c876c325811a6adfd993b5a5808a0665b4235 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu May 23 02:20:55 2019 +0200 Windows: upgrade bundled VcXsrv to 1.20.1.4. --- copy-deps-win32.bat | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat index a389d2b..d686cc5 100755 --- a/copy-deps-win32.bat +++ b/copy-deps-win32.bat @@ -12,7 +12,7 @@ xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpth xcopy /E /Y %1\MSVC-DLLs\2013-12.0.21005.1-x86\msvcr120.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\pulse\7.1-2.2_bin %3\ || exit /b %errorlevel% xcopy /E /Y %1\PuTTY\0.71_bin %3\ || exit /b %errorlevel% -xcopy /E /Y /I %1\VcXsrv\1.20.0.0_bin %3\VcXsrv || exit /b %errorlevel% +xcopy /E /Y /I %1\VcXsrv\1.20.1.4_bin %3\VcXsrv || exit /b %errorlevel% xcopy /E /Y %1\zlib\1.2.8_bin\zlib1.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %3\ || exit /b %errorlevel% xcopy /E /Y %2\bin\ssleay32.dll %3\ || exit /b %errorlevel% diff --git a/debian/changelog b/debian/changelog index 37accc6..dfbbaa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Windows: Update PuTTY from 0.70 to 0.71. Fixes quite a list of issues discovered through the EU-funded bug bounty programme. Not all are relevant to X2Go Client. + - Windows: upgrade bundled VcXsrv to 1.20.1.4. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: -- Alioth's /home/x2go-admin/maintenancescripts/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 master in repository x2goclient. commit 03bedb71a31aeca9a987ced7fc92a4d77be95524 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu May 23 02:37:55 2019 +0200 src/sshmasterconnection.cpp: use info (protocol) log level with --libssh-debug and debug (packet) log level with --libssh-packetlog. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dfbbaa8..08e7e1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium discovered through the EU-funded bug bounty programme. Not all are relevant to X2Go Client. - Windows: upgrade bundled VcXsrv to 1.20.1.4. + - src/sshmasterconnection.cpp: use info (protocol) log level with + --libssh-debug and debug (packet) log level with --libssh-packetlog. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 6a1bc86..8909a06 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -531,11 +531,19 @@ void SshMasterConnection::run() int verbosity = SSH_LOG_NOLOG; if (ONMainWindow::libssh_debugging) { - verbosity = SSH_LOG_DEBUG; +#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0) + verbosity = SSH_LOG_INFO; +#else + verbosity = SSH_LOG_PROTOCOL; +#endif } if (ONMainWindow::libssh_packetlog) { +#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0) + verbosity = SSH_LOG_DEBUG; +#else verbosity = SSH_LOG_PACKET; +#endif } long timeout = 60; -- Alioth's /home/x2go-admin/maintenancescripts/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 master in repository x2goclient. commit b54ff5b1370e0e6be98c24146c0e2babeb30b6d5 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu May 23 02:43:14 2019 +0200 src/sshmasterconnection.cpp: fix compiler warning due to mismatching argument with older libssh versions. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 08e7e1f..c8ad23c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Windows: upgrade bundled VcXsrv to 1.20.1.4. - src/sshmasterconnection.cpp: use info (protocol) log level with --libssh-debug and debug (packet) log level with --libssh-packetlog. + - src/sshmasterconnection.cpp: fix compiler warning due to mismatching + argument with older libssh versions. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 8909a06..eb163f0 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1403,7 +1403,7 @@ bool SshMasterConnection::userAuthWithKey() priv_key = NULL; } #else - priv_key = privatekey_from_file (my_ssh_session, tmp_ba.data (), NULL, tmp_ba_passphrase.data ()); + priv_key = privatekey_from_file (my_ssh_session, tmp_ba.data (), 0, tmp_ba_passphrase.data ()); #endif if(i++==2) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org