Module: check_mk
Branch: master
Commit: ba2e4cfb39b52802acda45f518352ea3de330484
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba2e4cfb39b528…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 12 14:17:17 2011 +0200
Switched version to 1.1.11i2
---
Makefile | 6 ++++--
agents/check_mk_agent.aix | 2 +-
agents/check_mk_agent.freebsd | 2 +-
agents/check_mk_agent.hpux | 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 96768 -> 96768 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
debian/files | 2 +-
livestatus/configure.ac | 2 +-
scripts/install_nagios.sh | 2 +-
scripts/setup.sh | 2 +-
13 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 86ffc02..ca7bfe6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
# Boston, MA 02110-1301 USA.
SHELL = /bin/bash
-VERSION = 1.1.11i1
+VERSION = 1.1.11i2
NAME = check_mk
RPM_TOPDIR = rpm.topdir
RPM_BUILDROOT = rpm.buildroot
@@ -100,7 +100,9 @@ mk-livestatus:
version:
- [ "$$(head -c 12 /etc/issue)" = "Ubuntu 10.10" ] || { echo 'You
are not on the reference system!' ; exit 1; }
+ [ "$$(head -c 12 /etc/issue)" = "Ubuntu 10.10" \
+ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.04" ] \
+ || { echo 'You are not on the reference system!' ; exit 1; }
@newversion=$$(dialog --stdout --inputbox "New Version:" 0 0
"$(VERSION)") ; \
if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ;
fi
diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix
index a43b451..2da06e9 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.11i1
+echo Version: 1.1.11i2
echo AgentOS: aix
echo '<<<df>>>'
diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd
index 2d31c2c..421690e 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.11i1
+echo Version: 1.1.11i2
echo AgentOS: freebsd
# Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten)
diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux
index 9c73029..728cb31 100755
--- a/agents/check_mk_agent.hpux
+++ b/agents/check_mk_agent.hpux
@@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local
exec <&- 2>/dev/null
echo '<<<check_mk>>>'
-echo Version: 1.1.11i1
+echo Version: 1.1.11i2
echo AgentOS: hpux
echo PluginsDirectory: $PLUGINSDIR
echo LocalDirectory: $LOCALDIR
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 336579f..445cbbf 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.11i1
+echo Version: 1.1.11i2
echo AgentOS: linux
echo PluginsDirectory: $PLUGINSDIR
echo LocalDirectory: $LOCALDIR
diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris
index b3126e1..544842b 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.11i1
+echo Version: 1.1.11i2
echo AgentOS: solaris
echo '<<<df>>>'
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 0fec8e6..9b77d34 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.11i1"
+#define CHECK_MK_VERSION "1.1.11i2"
#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 89afa3d..e30b479 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 8a2346d..085c008 100755
Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ
diff --git a/debian/files b/debian/files
index ef7580e..3daa160 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-check-mk_$newversion-1_all.deb net optional
+check-mk_1.1.11i2-1_all.deb net optional
diff --git a/livestatus/configure.ac b/livestatus/configure.ac
index aa40b3e..881e14f 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.11i1], [mk(a)mathias-kettner.de])
+AC_INIT([MK Livestatus], [1.1.11i2], [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 59e36d3..7d514d2 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.11i1
+CHECK_MK_VERSION=1.1.11i2
PNP_VERSION=0.6.6
NAGVIS_VERSION=1.5.6
diff --git a/scripts/setup.sh b/scripts/setup.sh
index eb58144..bffa0e0 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -24,7 +24,7 @@
# Boston, MA 02110-1301 USA.
-VERSION=1.1.11i1
+VERSION=1.1.11i2
NAME=check_mk
LANG=
LC_ALL=