[check-mk] New upstream release: 1.2.4p1
averi
averi at fedoraproject.org
Wed Apr 2 15:51:43 UTC 2014
commit 5ec49238424dd3203aee44ddb61a7ab245643d02
Author: Andrea Veri <av at gnome.org>
Date: Wed Apr 2 17:51:10 2014 +0200
New upstream release: 1.2.4p1
.gitignore | 1 +
First-Installation.txt | 8 ++++++++
check-mk.spec | 19 ++++++++++++++-----
defaults | 2 +-
defaults.py | 2 +-
sources | 2 +-
6 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe71c2e..cb7e293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/check_mk-1.2.2.tar.gz
/check_mk-1.2.2p2.tar.gz
/check_mk-1.2.4.tar.gz
+/check_mk-1.2.4p1.tar.gz
diff --git a/First-Installation.txt b/First-Installation.txt
index 2dd20c2..73c5810 100644
--- a/First-Installation.txt
+++ b/First-Installation.txt
@@ -8,3 +8,11 @@ cfg_file=/etc/nagios/conf.d/check_mk_objects.cfg
2. Edit /etc/check_mk/main.mk and add the hostnames / IPs of the machines you want to monitor.
3. Run check_mk -I and check_mk -O, this will run an inventory check and rebuild your Nagios configuration files.
+
+Additional notes:
+
+The WATO interface is currently not available on Fedora 1X - 2X series given the lack of the mod_python package in favor of mod_wsgi. Mod_python is still installable by manual compiling it and that should be the only current way for WATO to work properly on Fedora installations.
+
+The Check-MK upstream is working on porting WATO to mod_wsgi. [1]
+
+[1] http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-February/011450.html
diff --git a/check-mk.spec b/check-mk.spec
index aadd5ed..e7534c1 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -1,7 +1,7 @@
%define _requires_exceptions pear(default.php)
Name: check-mk
-Version: 1.2.4
+Version: 1.2.4p1
Release: 1%{?dist}
Summary: A new general purpose Nagios-plugin for retrieving data
Group: Applications/Internet
@@ -175,7 +175,11 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.netbsd
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openbsd
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openvms
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.solaris
+# No need to ship the check_mk_agent for Linux given that's what we install by default.
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.linux
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
rm -rf %{buildroot}%{_datadir}/check_mk/agents/solaris/
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/hpux/
# Remove Windows files.
rm -rf %{buildroot}%{_docdir}/check_mk/windows/
@@ -185,6 +189,7 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
# built and installed into the check-mk-agent's package already.
rm %{buildroot}%{_datadir}/check_mk/agents/waitmax
rm %{buildroot}%{_datadir}/check_mk/agents/waitmax.c
+rm %{buildroot}%{_datadir}/check_mk/agents/Makefile
# Remove the packages and modbus directories.
rm -rf %{buildroot}%{_localstatedir}/lib/check_mk/packages/
@@ -207,7 +212,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_bindir}/mkp
%{_bindir}/check_mk
%config(noreplace) %{_sysconfdir}/check_mk/main.mk
-%config(noreplace) %{_sysconfdir}/check_mk/main.mk-1.2.4
+%config(noreplace) %{_sysconfdir}/check_mk/main.mk-1.2.4p1
%{_sysconfdir}/check_mk/First-Installation.txt
%{_sysconfdir}/check_mk/conf.d
%{_sysconfdir}/nagios/auth.serials
@@ -236,7 +241,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%files multisite
%{_datadir}/check_mk/web
%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk
-%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.4
+%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.4p1
%{_sysconfdir}/check_mk/multisite.d
%attr(660, apache, nagios) %{_sysconfdir}/check_mk/conf.d/wato
@@ -246,11 +251,15 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%changelog
+* Wed Apr 02 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p1-1
+- New upstream release. Fixes the missing two CVEs that were still
+ left unfixed on 1.2.4:
+ - CVE-2014-2330
+ - CVE-2014-2331
+
* Tue Mar 25 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4-1
- New upstream release. Fixes the following CVEs:
- CVE-2014-2329
- - CVE-2014-2330
- - CVE-2014-2331
- CVE-2014-2332
* Wed Oct 02 2013 Andrea Veri <averi at fedoraproject.org> - 1.2.2p2-2
diff --git a/defaults b/defaults
index 066a915..5ee40df 100644
--- a/defaults
+++ b/defaults
@@ -7,7 +7,7 @@
# and enter new values when asked, or edit ~/.check_mk_setup.conf and
# run ./setup.sh --yes.
-check_mk_version = '1.2.2'
+check_mk_version = '1.2.4p1'
default_config_dir = '/etc/check_mk'
check_mk_configdir = '/etc/check_mk/conf.d'
share_dir = '/usr/share/check_mk'
diff --git a/defaults.py b/defaults.py
index 066a915..5ee40df 100644
--- a/defaults.py
+++ b/defaults.py
@@ -7,7 +7,7 @@
# and enter new values when asked, or edit ~/.check_mk_setup.conf and
# run ./setup.sh --yes.
-check_mk_version = '1.2.2'
+check_mk_version = '1.2.4p1'
default_config_dir = '/etc/check_mk'
check_mk_configdir = '/etc/check_mk/conf.d'
share_dir = '/usr/share/check_mk'
diff --git a/sources b/sources
index 30806c7..308a3e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09f34a193cc65a68bc8ff96b20396a0d check_mk-1.2.4.tar.gz
+31605df7d8812ad6f3e7e5430b95fcb3 check_mk-1.2.4p1.tar.gz
More information about the scm-commits
mailing list