Module: check_mk Branch: master Commit: cf97b49dc39c342e111c6e33309bc5bd309c98c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf97b49dc39c34… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sun Dec 26 14:04:30 2010 +0100 Set version to 1.1.9i4 --- Makefile | 4 +++- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9ad879c..99b28d5 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i3 +VERSION = 1.1.9i4 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -100,6 +100,7 @@ mk-livestatus: version: + [ "$$(head -c 14 /etc/issue)" = "Ubuntu 10.04.1" ] || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ if [ -n "$$newversion" ] ; then \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$$newversion/" Makefile ; \ @@ -114,6 +115,7 @@ version: echo 'check-mk_$$newversion-1_all.deb net optional' > debian/files ; \ sed -i 's/^CHECK_MK_VERSION=.*/CHECK_MK_VERSION='$$newversion/ scripts/install_nagios.sh ; \ fi ; \ + cd agents/windows ; rm *.exe ; make headers: ./headrify diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 5bd4c2a..6b564c5 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 28b3d82..0e89b1d 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0bac8f5..2a07606 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index ccfb6bc..c9d46ca 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ad723b7..2189c8a 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i3" +#define CHECK_MK_VERSION "1.1.9i4" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4691058..818b05f 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index dc96b21..8fa12a6 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 59c466a..725bf98 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i4], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index a55dcd3..a0d668d 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i3 +CHECK_MK_VERSION=1.1.9i4 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index cd54855..a356062 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i3 +VERSION=1.1.9i4 NAME=check_mk LANG= LC_ALL=