Module: check_mk
Branch: master
Commit: 35dd83b34429319d1096555b6392e1e6dac48963
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35dd83b3442931…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Jun 9 09:25:43 2015 +0200
#2306 FIX: windows agent: made 32 bit version working again (used old 32 bit
crosscompiler)
---
ChangeLog | 1 +
agents/windows/Makefile | 4 ++--
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 301568 -> 301568 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 301568 -> 301568 bytes
agents/windows/check_mk_agent.exe | Bin 216064 -> 183808 bytes
agents/windows/check_mk_agent.msi | Bin 766464 -> 734208 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 216064 -> 183808 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
agents/windows/install_agent-64.exe | Bin 178937 -> 178941 bytes
agents/windows/install_agent.exe | Bin 166095 -> 159862 bytes
agents/windows/nowin.exe | Bin 22511 -> 22511 bytes
12 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b28d9be..38e0e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
* 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with
various AIX versions...
* 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices
* 2217 FIX: md: Fix handling of found and expected disks
+ * 2306 FIX: windows agent: made 32 bit version working again (used old 32 bit
crosscompiler)...
Multisite:
* 2260 Improved load time of Check_MK GUI...
diff --git a/agents/windows/Makefile b/agents/windows/Makefile
index 68c2cfa..3c16182 100644
--- a/agents/windows/Makefile
+++ b/agents/windows/Makefile
@@ -26,11 +26,11 @@
SHELL = /bin/bash
VERSION = 1.2.7i2
VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@
-WINDRES = i686-w64-mingw32-windres
+WINDRES = i586-mingw32msvc-windres
COPTIONS = -s -O2 -Wall -Werror -static
-DCHECK_MK_VERSION='"$(VERSION_DUMMY)"'
ifeq ($(shell uname),Linux)
- CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own
risk!\n\n" ; i686-w64-mingw32-g++
+ CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own
risk!\n\n" ; i586-mingw32msvc-g++
CXX_64 = x86_64-w64-mingw32-g++
WINDRES_64 = x86_64-w64-mingw32-windres
else
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 9e42f3e..b34c321 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-165
+171
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 770eb0b..3e7f98b 100755
Binary files a/agents/windows/check_mk_agent-64.exe and
b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index 02db491..95e2381 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and
b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 960aef6..3435213 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index ed06d6f..117e44c 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index b9a1485..358a053 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and
b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe
index e31db71..de363b2 100755
Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 3d4fe55..53bd16c 100755
Binary files a/agents/windows/install_agent-64.exe and
b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 67ec1f7..7d7a4a0 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe
index ce16891..1762fbf 100755
Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ