[X2Go-Commits] [x2goclient] 01/01: Windows: Only bundle msvcr120.dll

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 97ecd0a9a8deee7248737f5786a21ade8f411660
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sun Jul 26 18:27:52 2015 -0400

    Windows: Only bundle msvcr120.dll
    
    The other 2 MSVC DLLs aren't needed by Win32 OpenSSL.
---
 copy-deps-win32.bat |    2 +-
 debian/changelog    |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index 9437381..03d0862 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -9,7 +9,7 @@ xcopy /E /Y    %1\libzip\0.9.3_bin\bin\libzip.dll %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++-6.dll %3\ || exit /b  %errorlevel%
 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 %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\6.0-11.1_bin %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\PuTTY\0.64_bin %3\ || exit /b  %errorlevel%
 xcopy /E /Y /I %1\VcXsrv\1.17.0.0-3_bin %3\VcXsrv || exit /b  %errorlevel%
diff --git a/debian/changelog b/debian/changelog
index 61412cc..ab4dad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
       CVE-2015-1793 (announced on 2015-07-09).
     - Windows: Upgrade the MSVC 2008 DLLs (9.0.21022.8) to the
       MSVC 2013 DLLs (12.0.21005.1), which Win32 OpenSSL now requires.
+    - Windows: Only bundle msvcr120.dll; The other 2 MSVC DLLs aren't
+      needed by Win32 OpenSSL.
     - Windows: Update bundled Cygwin OpenSSL from 1.0.2a-1 to 1.0.2d-1, which
       which fixes the multiple CVEs announced on 2015-06-11 and
       CVE-2015-1793 (announced on 2015-07-09).

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git