11 Apr
2016
11 Apr
'16
1:34 a.m.
Module: check_mk
Branch: master
Commit: 439ebbcf8883e7ca10d34803f90dc27abd983485
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439ebbcf8883e7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Apr 11 08:33:44 2016 +0200
Set new future version 1.4.0i1
---
Makefile | 2 +-
agents/Makefile | 2 +-
agents/check-mk-agent-1.2.9i1-1.noarch.rpm | Bin 28336 -> 0 bytes
agents/check-mk-agent-1.4.0i1-1.noarch.rpm | Bin 0 -> 28690 bytes
agents/check-mk-agent_1.2.9i1-1_all.deb | Bin 20214 -> 0 bytes
agents/check-mk-agent_1.4.0i1-1_all.deb | Bin 0 -> 20512 bytes
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.macosx | 2 +-
agents/check_mk_agent.netbsd | 2 +-
agents/check_mk_agent.openbsd | 2 +-
agents/check_mk_agent.openvms | 2 +-
agents/check_mk_agent.solaris | 2 +-
agents/windows/Makefile | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 940544 -> 940544 bytes
agents/windows/check_mk_agent.exe | Bin 868352 -> 868352 bytes
agents/windows/check_mk_agent.msi | Bin 2070528 -> 2070528 bytes
agents/windows/install_agent-64.exe | Bin 431814 -> 431814 bytes
agents/windows/install_agent.exe | Bin 422666 -> 422666 bytes
agents/windows/installer-64.nsi | 2 +-
agents/windows/installer.nsi | 2 +-
bin/mkeventd | 2 +-
debian/files | 2 +-
livestatus/configure.ac | 2 +-
scripts/setup.sh | 2 +-
27 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 4956bb5..d43c30c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
# Boston, MA 02110-1301 USA.
SHELL := /bin/bash
-VERSION := 1.2.9i1
+VERSION := 1.4.0i1
NAME := check_mk
PREFIX := /usr
BINDIR := $(PREFIX)/bin
diff --git a/agents/Makefile b/agents/Makefile
index 9d38264..1e8c007 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -23,7 +23,7 @@
# Boston, MA 02110-1301 USA.
SHELL = /bin/bash
-VERSION = 1.2.9i1
+VERSION = 1.4.0i1
RPM_VERSION = $(subst -,_,$(VERSION))
NAME = check-mk-agent
DISTNAME = $(NAME)-$(VERSION)
diff --git a/agents/check-mk-agent-1.2.9i1-1.noarch.rpm
b/agents/check-mk-agent-1.2.9i1-1.noarch.rpm
deleted file mode 100644
index 19fc1b8..0000000
Binary files a/agents/check-mk-agent-1.2.9i1-1.noarch.rpm and /dev/null differ
diff --git a/agents/check-mk-agent-1.4.0i1-1.noarch.rpm
b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm
new file mode 100644
index 0000000..6b872ad
Binary files /dev/null and b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm differ
diff --git a/agents/check-mk-agent_1.2.9i1-1_all.deb
b/agents/check-mk-agent_1.2.9i1-1_all.deb
deleted file mode 100644
index 4e39ed8..0000000
Binary files a/agents/check-mk-agent_1.2.9i1-1_all.deb and /dev/null differ
diff --git a/agents/check-mk-agent_1.4.0i1-1_all.deb
b/agents/check-mk-agent_1.4.0i1-1_all.deb
new file mode 100644
index 0000000..9eeda0f
Binary files /dev/null and b/agents/check-mk-agent_1.4.0i1-1_all.deb differ
diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix
index 15da341..db5e022 100755
--- a/agents/check_mk_agent.aix
+++ b/agents/check_mk_agent.aix
@@ -119,7 +119,7 @@ function run_cached {
}
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: aix
echo Hostname: $(hostname)
diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd
index 4b5ded9..a1b1100 100755
--- a/agents/check_mk_agent.freebsd
+++ b/agents/check_mk_agent.freebsd
@@ -105,7 +105,7 @@ function run_cached() {
}
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: freebsd
diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux
index 98f95da..18a2b1a 100755
--- a/agents/check_mk_agent.hpux
+++ b/agents/check_mk_agent.hpux
@@ -49,7 +49,7 @@ fi
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: hpux
echo PluginsDirectory: $PLUGINSDIR
echo LocalDirectory: $LOCALDIR
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index ba4d933..cfd6f80 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -226,7 +226,7 @@ function run_real_time_checks()
}
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: linux
echo Hostname: $HOSTNAME
echo AgentDirectory: $MK_CONFDIR
diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx
index a3a7530..42b2f33 100755
--- a/agents/check_mk_agent.macosx
+++ b/agents/check_mk_agent.macosx
@@ -44,7 +44,7 @@ fi
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: macosx
osver="$(uname -r)"
diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd
index 8f18d74..3b13967 100755
--- a/agents/check_mk_agent.netbsd
+++ b/agents/check_mk_agent.netbsd
@@ -60,7 +60,7 @@ else
fi
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: netbsd
osver="$(uname -r)"
diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd
index 287c195..0bcfbd0 100755
--- a/agents/check_mk_agent.openbsd
+++ b/agents/check_mk_agent.openbsd
@@ -60,7 +60,7 @@ else
fi
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: openbsd
osver="$(uname -r)"
diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms
index 1de6a42..c302707 100755
--- a/agents/check_mk_agent.openvms
+++ b/agents/check_mk_agent.openvms
@@ -163,7 +163,7 @@ $set noVerify
$define sys$output "''cacheFile'_new"
$on error then goto WCFdone
$say "<<<check_mk>>>"
-$say "Version: 1.2.9i1"
+$say "Version: 1.4.0i1"
$say "AgentOS: openvms"
$say "Nodename: ",f$getsyi("nodename")
$say "Architecture: ''HWinfo'"
diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris
index 038ab04..da5b85c 100755
--- a/agents/check_mk_agent.solaris
+++ b/agents/check_mk_agent.solaris
@@ -114,7 +114,7 @@ function run_cached () {
echo '<<<check_mk>>>'
-echo Version: 1.2.9i1
+echo Version: 1.4.0i1
echo AgentOS: solaris
diff --git a/agents/windows/Makefile b/agents/windows/Makefile
index 7f72771..f6fa516 100644
--- a/agents/windows/Makefile
+++ b/agents/windows/Makefile
@@ -24,7 +24,7 @@
SHELL = /bin/bash
-VERSION = 1.2.9i1
+VERSION = 1.4.0i1
VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@
WINDRES = i686-w64-mingw32-windres
COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++
-fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"'
-D__USE_MINGW_ANSI_STDIO
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 85ed24c..d72398a 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.exe b/agents/windows/check_mk_agent.exe
index c728f22..af2a2e4 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 938691b..38001c9 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 52132fe..51cc6bb 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 ec1bae5..0698ef7 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi
index 8e56529..02640ac 100644
--- a/agents/windows/installer-64.nsi
+++ b/agents/windows/installer-64.nsi
@@ -4,7 +4,7 @@
; Useful sources:
; http://nsis.sourceforge.net/Reusable_installer_script
-!define CHECK_MK_VERSION "1.2.9i1"
+!define CHECK_MK_VERSION "1.4.0i1"
!define NAME "Check_MK Agent ${CHECK_MK_VERSION}"
XPStyle on
diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi
index 1eb58c9..82fe295 100644
--- a/agents/windows/installer.nsi
+++ b/agents/windows/installer.nsi
@@ -4,7 +4,7 @@
; Useful sources:
; http://nsis.sourceforge.net/Reusable_installer_script
-!define CHECK_MK_VERSION "1.2.9i1"
+!define CHECK_MK_VERSION "1.4.0i1"
!define NAME "Check_MK Agent ${CHECK_MK_VERSION}"
XPStyle on
diff --git a/bin/mkeventd b/bin/mkeventd
index dbe74b7..7d2a696 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \
from pwd import getpwnam
from grp import getgrnam
-VERSION="1.2.9i1"
+VERSION="1.4.0i1"
# .--Declarations--------------------------------------------------------.
# | ____ _ _ _ |
diff --git a/debian/files b/debian/files
index 2aa41ea..ac3492a 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-check-mk_1.2.9i1-1_all.deb net optional
+check-mk_1.4.0i1-1_all.deb net optional
diff --git a/livestatus/configure.ac b/livestatus/configure.ac
index 01a8d5e..b5f6064 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.2.9i1], [mk(a)mathias-kettner.de])
+AC_INIT([MK Livestatus], [1.4.0i1], [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/setup.sh b/scripts/setup.sh
index c243567..a6ed4ac 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -24,7 +24,7 @@
# Boston, MA 02110-1301 USA.
-VERSION=1.2.9i1
+VERSION=1.4.0i1
NAME=check_mk
LANG=
LC_ALL=