29 Sep
2016
29 Sep
'16
5:33 p.m.
Module: check_mk
Branch: master
Commit: 016cbd5aa7a043e9684532b8d40a439148ee44ff
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=016cbd5aa7a043…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Sep 29 17:33:20 2016 +0200
Set version to 1.4.0i2
---
ChangeLog | 2 ++
Makefile | 2 +-
agents/Makefile | 2 +-
agents/check-mk-agent-1.4.0i1-1.noarch.rpm | Bin 24876 -> 0 bytes
agents/check-mk-agent-1.4.0i2-1.noarch.rpm | Bin 0 -> 30081 bytes
agents/check-mk-agent_1.4.0i1-1_all.deb | Bin 20784 -> 0 bytes
agents/check-mk-agent_1.4.0i2-1_all.deb | Bin 0 -> 21214 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.openwrt | 2 +-
agents/check_mk_agent.solaris | 2 +-
agents/windows/Makefile | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1324544 bytes
agents/windows/check_mk_agent.exe | Bin 1299456 -> 1299456 bytes
agents/windows/check_mk_agent.msi | Bin 2893824 -> 2893824 bytes
agents/windows/install_agent-64.exe | Bin 584735 -> 584740 bytes
agents/windows/install_agent.exe | Bin 581433 -> 581434 bytes
agents/windows/installer-64.nsi | 2 +-
agents/windows/installer.nsi | 2 +-
bin/mkeventd | 2 +-
debian/files | 2 +-
lib/__init__.py | 2 +-
livestatus/configure.ac | 2 +-
scripts/setup.sh | 2 +-
30 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d830312..65f8335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.4.0i2:
+
1.4.0i1:
Core & Setup:
* 3342 MKP: local/lib and local/bin of sites can now be packed...
diff --git a/Makefile b/Makefile
index 5bf1583..037dc34 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
# Boston, MA 02110-1301 USA.
SHELL := /bin/bash
-VERSION := 1.4.0i1
+VERSION := 1.4.0i2
NAME := check_mk
PREFIX := /usr
BINDIR := $(PREFIX)/bin
diff --git a/agents/Makefile b/agents/Makefile
index 1e8c007..b2decd4 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -23,7 +23,7 @@
# Boston, MA 02110-1301 USA.
SHELL = /bin/bash
-VERSION = 1.4.0i1
+VERSION = 1.4.0i2
RPM_VERSION = $(subst -,_,$(VERSION))
NAME = check-mk-agent
DISTNAME = $(NAME)-$(VERSION)
diff --git a/agents/check-mk-agent-1.4.0i1-1.noarch.rpm
b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm
deleted file mode 100644
index b27490d..0000000
Binary files a/agents/check-mk-agent-1.4.0i1-1.noarch.rpm and /dev/null differ
diff --git a/agents/check-mk-agent-1.4.0i2-1.noarch.rpm
b/agents/check-mk-agent-1.4.0i2-1.noarch.rpm
new file mode 100644
index 0000000..86137ca
Binary files /dev/null and b/agents/check-mk-agent-1.4.0i2-1.noarch.rpm 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
deleted file mode 100644
index 26629d1..0000000
Binary files a/agents/check-mk-agent_1.4.0i1-1_all.deb and /dev/null differ
diff --git a/agents/check-mk-agent_1.4.0i2-1_all.deb
b/agents/check-mk-agent_1.4.0i2-1_all.deb
new file mode 100644
index 0000000..bfd1053
Binary files /dev/null and b/agents/check-mk-agent_1.4.0i2-1_all.deb differ
diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix
index 6dd5136..194a017 100755
--- a/agents/check_mk_agent.aix
+++ b/agents/check_mk_agent.aix
@@ -121,7 +121,7 @@ function run_cached {
}
echo '<<<check_mk>>>'
-echo Version: 1.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: aix
echo Hostname: $(hostname)
diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd
index 31448b7..9a00794 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.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: freebsd
diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux
index 18a2b1a..d821a06 100755
--- a/agents/check_mk_agent.hpux
+++ b/agents/check_mk_agent.hpux
@@ -49,7 +49,7 @@ fi
echo '<<<check_mk>>>'
-echo Version: 1.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: hpux
echo PluginsDirectory: $PLUGINSDIR
echo LocalDirectory: $LOCALDIR
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 9a23a93..72b2e45 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -239,7 +239,7 @@ function run_real_time_checks()
}
echo '<<<check_mk>>>'
-echo Version: 1.4.0i1
+echo Version: 1.4.0i2
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 42b2f33..df08794 100755
--- a/agents/check_mk_agent.macosx
+++ b/agents/check_mk_agent.macosx
@@ -44,7 +44,7 @@ fi
echo '<<<check_mk>>>'
-echo Version: 1.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: macosx
osver="$(uname -r)"
diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd
index 3b13967..bf67bc6 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.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: netbsd
osver="$(uname -r)"
diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd
index b055814..0b41211 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.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: openbsd
osver="$(uname -r)"
diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms
index c302707..a3f1bad 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.4.0i1"
+$say "Version: 1.4.0i2"
$say "AgentOS: openvms"
$say "Nodename: ",f$getsyi("nodename")
$say "Architecture: ''HWinfo'"
diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt
index 7de8a06..dfbb1f9 100755
--- a/agents/check_mk_agent.openwrt
+++ b/agents/check_mk_agent.openwrt
@@ -220,7 +220,7 @@ run_real_time_checks()
}
echo '<<<check_mk>>>'
-echo Version: 1.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: openwrt
echo Hostname: $HOSTNAME
echo AgentDirectory: $MK_CONFDIR
diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris
index 839432e..c071fbf 100755
--- a/agents/check_mk_agent.solaris
+++ b/agents/check_mk_agent.solaris
@@ -124,7 +124,7 @@ function run_cached () {
echo '<<<check_mk>>>'
-echo Version: 1.4.0i1
+echo Version: 1.4.0i2
echo AgentOS: solaris
diff --git a/agents/windows/Makefile b/agents/windows/Makefile
index d22a575..bd19e24 100644
--- a/agents/windows/Makefile
+++ b/agents/windows/Makefile
@@ -24,7 +24,7 @@
SHELL = /bin/bash
-VERSION = 1.4.0i1
+VERSION = 1.4.0i2
VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@
WINDRES = i686-w64-mingw32-windres
GIT_REV = $(shell git describe --abbrev=4 --dirty --always --tags)
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index aec1135..d4f5a86 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 5e20dcf..da1a840 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 48608e1..60a16d6 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 484b236..b62a8b2 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 ac7994f..aa5dc93 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 02640ac..6e50c75 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.4.0i1"
+!define CHECK_MK_VERSION "1.4.0i2"
!define NAME "Check_MK Agent ${CHECK_MK_VERSION}"
XPStyle on
diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi
index 82fe295..abd0444 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.4.0i1"
+!define CHECK_MK_VERSION "1.4.0i2"
!define NAME "Check_MK Agent ${CHECK_MK_VERSION}"
XPStyle on
diff --git a/bin/mkeventd b/bin/mkeventd
index a76e69b..fcf730a 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -45,7 +45,7 @@ try:
except ImportError:
import json
-VERSION="1.4.0i1"
+VERSION="1.4.0i2"
# .--Declarations--------------------------------------------------------.
# | ____ _ _ _ |
diff --git a/debian/files b/debian/files
index ac3492a..8527c58 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-check-mk_1.4.0i1-1_all.deb net optional
+check-mk_1.4.0i2-1_all.deb net optional
diff --git a/lib/__init__.py b/lib/__init__.py
index 03ea453..dad38dd 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -29,4 +29,4 @@
This library is currently handled as internal module of Check_MK and
does not offer stable APIs. The code may change at any time."""
-__version__ = "1.4.0i1"
+__version__ = "1.4.0i2"
diff --git a/livestatus/configure.ac b/livestatus/configure.ac
index 9928e12..b8516c0 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.4.0i1], [mk(a)mathias-kettner.de])
+AC_INIT([MK Livestatus], [1.4.0i2], [mk(a)mathias-kettner.de])
AM_INIT_AUTOMAKE([-Wall foreign])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([config.h.in])
diff --git a/scripts/setup.sh b/scripts/setup.sh
index cabe2fe..067ad70 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -24,7 +24,7 @@
# Boston, MA 02110-1301 USA.
-VERSION=1.4.0i1
+VERSION=1.4.0i2
NAME=check_mk
LANG=
LC_ALL=