Module: check_mk Branch: master Commit: c1963977a32d4f11c81a9a4929059f284efc3fbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1963977a32d4f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 9 10:20:27 2015 +0200 #2307 FIX: Windows Agent MSI installer: removed version information from product name --- .werks/2306 | 10 ++++++++++ .werks/2307 | 12 ++++++++++++ ChangeLog | 2 +- 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 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734208 -> 734208 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 178941 -> 178942 bytes agents/windows/install_agent.exe | Bin 159862 -> 159862 bytes agents/windows/msibuild/msi-update | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 14 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.werks/2306 b/.werks/2306 new file mode 100644 index 0000000..437209d --- /dev/null +++ b/.werks/2306 @@ -0,0 +1,10 @@ +Title: windows agent: made 32 bit version working again (used old 32 bit crosscompiler) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1p2 +Date: 1433834306 +Class: fix + +Introducing a new crosscompiler for the 32 bit version broke a few things - the agent crashed.. +With this werk the old crosscompiler is used again. diff --git a/.werks/2307 b/.werks/2307 new file mode 100644 index 0000000..0497cf0 --- /dev/null +++ b/.werks/2307 @@ -0,0 +1,12 @@ +Title: Windows Agent MSI installer: removed version information from product name +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433835402 + +The agent version is no longer displayed in the product name. +This is because some software management tools have troubles to detect the same +product family if the name differs. diff --git a/ChangeLog b/ChangeLog index 38e0e59..a954f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.7i2: Core & Setup: * 2339 FIX: Discovery service: Fixed handling of agent / SNMP communication errors... + * 2307 FIX: Windows Agent MSI installer: removed version information from product name... Checks & Agents: * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well @@ -14,7 +15,6 @@ * 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/build_version b/agents/windows/build_version index b34c321..f07e286 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -171 +175 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 3e7f98b..ede8c61 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 95e2381..ecd9866 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 3435213..27f1f02 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 117e44c..faccffc 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 358a053..e2b1594 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 de363b2..7d93369 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 53bd16c..cf1d178 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 7d7a4a0..fbc2fe1 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 993309c..2da2e51 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -160,7 +160,7 @@ try: for line in lines_property_idt[3:]: tokens = line.split("\t") if tokens[0] == "ProductName": - tokens[1] = "Check_MK Agent MSI %s Rev %s\r\n" % (new_version_name, new_version_build.split(".")[-1]) + tokens[1] = "Check_MK Agent\r\n" # The upgrade code defines the product family. Do not change it! # elif tokens[0] == "UpgradeCode": # tokens[1] = upgrade_code diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 1762fbf..f7242cb 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ