averi pushed to check-mk (el6). "Merge changes from master"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 10:47:55 UTC 2015
>From db6cec346d3b935ac48b065ed2165deacd408e26 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Wed, 28 May 2014 00:05:33 +0200
Subject: Do not include the target suite on the changelog
diff --git a/check-mk.spec b/check-mk.spec
index fcc90e6..6853849 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -306,11 +306,11 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
* Fri Aug 02 2013 Petr Pisar <ppisar at redhat.com> - 1.2.2-5
- Do not provide from a documentation
-* Sun Apr 28 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-5.fc20
+* Sun Apr 28 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-5
- Make sure the Nagios library path on the check_mk_templates.cfg file
is correct on both x86_64 and i686 systems.
-* Sat Apr 27 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-4.fc20
+* Sat Apr 27 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-4
- Change check-mk-agent's binary name to check_mk_agent to match xinetd's file. (BZ: #956489)
- Remove other operating systems agents, we definitely don't need them on this package.
- Make sure that check_mk_templates gets shipped into /etc/nagios/conf.d. (BZ: #956492)
@@ -321,10 +321,10 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
* Fri Apr 12 2013 Dan Horák <dan[at]danny.cz> - 1.2.2-3
- fix for 64-bit arches
-* Wed Apr 10 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-2.fc20
+* Wed Apr 10 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-2
- Remove the extra % on the Requires field for multisite.
-* Tue Apr 09 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-1.fc20
+* Tue Apr 09 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-1
- New upstream release.
- Added a depends on Nagios.
- Start shipping the docs, multisite, livestatus packages.
@@ -337,5 +337,5 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
- Include an handy First-Installation.txt file with instructions about what
steps you should follow right after installing the check-mk's package.
-* Fri Apr 05 2013 Andrea Veri <averi at fedoraproject.org> 1.2.0p4-1.fc20
+* Fri Apr 05 2013 Andrea Veri <averi at fedoraproject.org> 1.2.0p4-1
- First package release.
--
cgit v0.10.2
>From 0be338c60d7e543763496b824872d87d470b1192 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 6 Jun 2014 23:33:10 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/check-mk.spec b/check-mk.spec
index 6853849..d5bf510 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -2,7 +2,7 @@
Name: check-mk
Version: 1.2.4p2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A new general purpose Nagios-plugin for retrieving data
Group: Applications/Internet
License: GPLv2 and GPLv3
@@ -263,6 +263,9 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_libdir}/check_mk
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4p2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Tue May 27 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p2-2
- Install the mk-job binary on /usr/bin.
- Make sure the proper permissions are given to /var/lib/check_mk_agent/job
--
cgit v0.10.2
>From a4f2f1ff74428fc7ea126ae7caa686019011c6fd Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 16 Aug 2014 00:00:54 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/check-mk.spec b/check-mk.spec
index d5bf510..fbc96ef 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -2,7 +2,7 @@
Name: check-mk
Version: 1.2.4p2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A new general purpose Nagios-plugin for retrieving data
Group: Applications/Internet
License: GPLv2 and GPLv3
@@ -263,6 +263,9 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_libdir}/check_mk
%changelog
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4p2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4p2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>From 58485a22c59551dba2bfe51b1e2e09e95ea0156e Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Wed, 17 Sep 2014 16:28:10 +0200
Subject: Stop shipping the j4p_performance plugin as it's deprecated now.
Additionally move all agents to the -agent subpackage
diff --git a/check-mk.spec b/check-mk.spec
index 6853849..dbaeaa9 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -96,7 +96,8 @@ install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent
install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/plugins
install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/local
install -m 644 plugins/mk_logwatch %{buildroot}%{_datadir}/check-mk-agent/plugins
-install -m 644 plugins/j4p_performance %{buildroot}%{_datadir}/check-mk-agent/plugins
+# The j4p_performance plugin has been deprecated.
+# install -m 644 plugins/j4p_performance %{buildroot}%{_datadir}/check-mk-agent/plugins
install -m 644 plugins/mk_oracle %{buildroot}%{_datadir}/check-mk-agent/plugins
install -m 644 plugins/sylo %{buildroot}%{_datadir}/check-mk-agent/plugins
@@ -185,6 +186,9 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/solaris/
rm -rf %{buildroot}%{_datadir}/check_mk/agents/hpux/
rm -rf %{buildroot}%{_datadir}/check_mk/agents/sap/
+# Remove deprecated agent plugins.
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/plugins/j4p_performance
+
# Remove Windows files.
rm -rf %{buildroot}%{_docdir}/check_mk/windows/
rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
@@ -227,7 +231,6 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_sysconfdir}/check_mk/First-Installation.txt
%{_sysconfdir}/check_mk/conf.d
%{_sysconfdir}/nagios/auth.serials
-%{_datadir}/check_mk/agents
%{_datadir}/check_mk/modules
%{_datadir}/check_mk/checks
%{_datadir}/check_mk/pnp-templates
@@ -239,6 +242,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%doc COPYING ChangeLog AUTHORS
%files agent
+%{_datadir}/check_mk/agents
%{_bindir}/check_mk_agent
%{_bindir}/waitmax
%{_bindir}/mk-job
--
cgit v0.10.2
>From 243df9c985426fa8801be176c5d8a99de3898051 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Wed, 17 Sep 2014 16:39:22 +0200
Subject: Prepare for the new upstream release, fixes CVEs: CVE-2014-5338,
CVE-2014-5339, CVE-2014-5340
diff --git a/check-mk.spec b/check-mk.spec
index ad25bb2..0bff6f4 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -1,8 +1,8 @@
%define _requires_exceptions pear(default.php)
Name: check-mk
-Version: 1.2.4p2
-Release: 4%{?dist}
+Version: 1.2.4p5
+Release: 1%{?dist}
Summary: A new general purpose Nagios-plugin for retrieving data
Group: Applications/Internet
License: GPLv2 and GPLv3
@@ -227,7 +227,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.4p2
+%config(noreplace) %{_sysconfdir}/check_mk/main.mk-1.2.4p5
%{_sysconfdir}/check_mk/First-Installation.txt
%{_sysconfdir}/check_mk/conf.d
%{_sysconfdir}/nagios/auth.serials
@@ -258,7 +258,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.4p2
+%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.4p5
%{_sysconfdir}/check_mk/multisite.d
%attr(660, apache, nagios) %{_sysconfdir}/check_mk/conf.d/wato
@@ -267,6 +267,13 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_libdir}/check_mk
%changelog
+* Wed Sep 17 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-1
+- New upstream release. Fixes CVEs:
+ - CVE-2014-5338
+ - CVE-2014-5339
+ - CVE-2014-5340
+- Stop shipping the j4p_performance plugin as it's deprecated.
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4p2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
--
cgit v0.10.2
>From 8036622f7e3e6c5c2e20efb53bead346b87fb875 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Wed, 17 Sep 2014 20:36:38 +0200
Subject: Add 01-Set-Legacy-Eval-True.patch
Turn Wato_Legacy_Eval as True as we want to prevent breakages
between machines running different Python and/or check-mk releases.
This is necessary after the 'ast' move from 'pickle' (that was
generating a insecure API call), however the 'ast' module is still
not available for RHEL / CentOS 5 machines. The patch is there to
avoid miscommunications between different distribution releases. More
information is available at: http://mathias-kettner.com/check_mk_werks.php?werk_id=984.
diff --git a/.gitignore b/.gitignore
index 49d8d19..e534987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/check_mk-1.2.4.tar.gz
/check_mk-1.2.4p1.tar.gz
/check_mk-1.2.4p2.tar.gz
+/check_mk-1.2.4p5.tar.gz
diff --git a/01-Set-Legacy-Eval-True.patch b/01-Set-Legacy-Eval-True.patch
new file mode 100644
index 0000000..526fc7d
--- /dev/null
+++ b/01-Set-Legacy-Eval-True.patch
@@ -0,0 +1,11 @@
+--- plugins/config/wato.py 2014-09-17 16:45:20.548080345 +0200
++++ plugins/config/wato.py.patched 2014-09-17 16:45:34.604504277 +0200
+@@ -39,7 +39,7 @@
+ wato_use_git = False
+ wato_hidden_users = []
+ wato_user_attrs = []
+-wato_legacy_eval = False
++wato_legacy_eval = True
+
+ def tag_alias(tag):
+ for entry in wato_host_tags:
diff --git a/check-mk.spec b/check-mk.spec
index 0bff6f4..c04594b 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -15,6 +15,7 @@ Requires: mod_python
Source1: First-Installation.txt
Source2: defaults
Source3: defaults.py
+Patch0: 01-Set-Legacy-Eval-True.patch
AutoReq: 0
# Do not provide from a documentation
@@ -71,6 +72,9 @@ This package contains the check-mk's web interface aka WATO.
%prep
%setup -q -n check_mk-%{version}
tar xf agents.tar.gz
+tar xf web.tar.gz && rm -f web.tar.gz
+%patch0 -p0
+tar zcf web.tar.gz htdocs plugins
%build
rm -f waitmax
@@ -269,10 +273,18 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%changelog
* Wed Sep 17 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-1
- New upstream release. Fixes CVEs:
- - CVE-2014-5338
+ - CVE-2014-5338
- CVE-2014-5339
- - CVE-2014-5340
-- Stop shipping the j4p_performance plugin as it's deprecated.
+ - CVE-2014-5340 (BZ: #1132337, #1132339, #1132341)
+- Stop shipping the j4p_performance plugin as it's deprecated. (BZ: #1133068)
+- Turn Wato_Legacy_Eval as True as we want to prevent breakages
+ between machines running different Python and/or check-mk releases.
+ This is necessary after the 'ast' move from 'pickle' (that was
+ generating a insecure API call), however the 'ast' module is still
+ not available for RHEL / CentOS 5 machines. The patch is there to
+ avoid miscommunications between different distribution releases. More
+ information is available at:
+ http://mathias-kettner.com/check_mk_werks.php?werk_id=984.
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4p2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 2153953..6d6a60d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1162c007d89558bc20c5655e35a0ba94 check_mk-1.2.4p2.tar.gz
+ef3055d191bd38295d1716b3f7824115 check_mk-1.2.4p5.tar.gz
--
cgit v0.10.2
>From 0d1df8a8b9823524c960ffcbc30bf60ad5785a16 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Tue, 30 Sep 2014 01:48:29 +0200
Subject: Do not require any other shell than bash since that's the default
shell for the Fedora / RHEL distributions'
diff --git a/check-mk.spec b/check-mk.spec
index c04594b..e95775b 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -2,7 +2,7 @@
Name: check-mk
Version: 1.2.4p5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A new general purpose Nagios-plugin for retrieving data
Group: Applications/Internet
License: GPLv2 and GPLv3
@@ -15,12 +15,24 @@ Requires: mod_python
Source1: First-Installation.txt
Source2: defaults
Source3: defaults.py
-Patch0: 01-Set-Legacy-Eval-True.patch
+Patch0: 01-Set-Legacy-Eval-True.patch
AutoReq: 0
# Do not provide from a documentation
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}/.*$
+# Do not require any other shell than bash since that's the default Fedora / RHEL shell
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global __requires_exclude %{?__requires_exclude}|^/bin/sh$
+%global __requires_exclude %{?__requires_exclude}|^/usr/bin/ksh$
+%endif
+
+%if 0%{?rhel} == 6
+%filter_from_requires /^\/bin\/sh/d
+%filter_from_requires /^\/usr\/bin\/ksh/d
+%filter_setup
+%endif
+
%description
check-mk is a general purpose Nagios-plugin for retrieving data. It adopts a
new approach for collecting data from operating systems and network components.
@@ -271,6 +283,10 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_libdir}/check_mk
%changelog
+* Tue Sep 30 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-2
+- Do not require any other shell than bash since that's the default
+ shell for the Fedora / RHEL distributions.
+
* Wed Sep 17 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-1
- New upstream release. Fixes CVEs:
- CVE-2014-5338
--
cgit v0.10.2
>From b2059405c5176359c1a04a3f7c4f7ef3e4a40d7b Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 12:24:53 +0200
Subject: New upstream release: 1.2.6.
diff --git a/check-mk.spec b/check-mk.spec
index e95775b..9e64c53 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -1,24 +1,29 @@
-%define _requires_exceptions pear(default.php)
-
-Name: check-mk
-Version: 1.2.4p5
-Release: 2%{?dist}
-Summary: A new general purpose Nagios-plugin for retrieving data
-Group: Applications/Internet
-License: GPLv2 and GPLv3
-URL: http://mathias-kettner.de/check_mk
-Source: http://mathias-kettner.de/download/check_mk-%{version}.tar.gz
-Requires: nagios
+%global commit c7b28726f7dc36382084a8b9c97c72381a8ff15f
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name: check-mk
+Version: 1.2.6
+Release: 1%{?dist}
+Summary: A new general purpose Nagios-plugin for retrieving data
+Group: Applications/Internet
+License: GPLv2 and GPLv3
+URL: https://mathias-kettner.de/check_mk
+# Produce with 'wget http://git.mathias-kettner.de/git/?p=check_mk.git;a=snapshot;h=%%{commit};sf=tgz -O check_mk-%%{version}.tar.gz}',
+# then "tar xvf check_mk-%%{version}.tar.gz && cd check_mk-%%{short_commit} && sed -i '112d;113d;116d' Makefile". Once
+# done, running 'make dist' on the top level directory will properly generate a tarball. More details about why
+# this was made necessary on the 1.2.6-1 release changelog entry.
+Source: check_mk-%{version}.tar.gz
+Requires: nagios
%if 0%{?rhel}
-Requires: mod_python
+Requires: mod_python
%endif
-Source1: First-Installation.txt
-Source2: defaults
-Source3: defaults.py
-Patch0: 01-Set-Legacy-Eval-True.patch
-AutoReq: 0
+Source1: First-Installation.txt
+Source2: defaults
+Source3: defaults.py
+Patch0: 01-Set-Legacy-Eval-True.patch
+AutoReq: 0
-# Do not provide from a documentation
+# Do not get provides from any of the documentation files
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}/.*$
# Do not require any other shell than bash since that's the default Fedora / RHEL shell
@@ -33,6 +38,11 @@ AutoReq: 0
%filter_setup
%endif
+# Get the revision number and remove the dist from it, we will use
+# this variable later on on the spec to remove the RPM and DEB files
+# included on the generated tarball.
+%global nodistrelease %(r=%{release}; echo ${r:0:1})
+
%description
check-mk is a general purpose Nagios-plugin for retrieving data. It adopts a
new approach for collecting data from operating systems and network components.
@@ -41,42 +51,42 @@ benefits, the most important are a significant reduction of CPU usage on
the Nagios host and an automatic inventory of items to be checked on hosts.
%package agent
-Summary: The check-mk's Agent
-Requires: xinetd
-Group: Applications/Internet
+Summary: The check-mk's Agent
+Requires: xinetd
+Group: Applications/Internet
%description agent
This package contains the check-mk's agent. Install the following
agent on all the machines you plan to monitor with check-mk.
%package docs
-Summary: The check-mk's documentation
-Group: Applications/Internet
-BuildArch: noarch
-AutoReq: 0
+Summary: The check-mk's documentation
+Group: Applications/Internet
+BuildArch: noarch
+AutoReq: 0
%if 0%{?rhel}
-AutoProv: 0
+AutoProv: 0
%endif
%description docs
This package contains the check-mk's documentation files.
%package livestatus
-Summary: The check-mk's Livestatus
-Group: Applications/Internet
-Requires: check-mk
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: The check-mk's Livestatus
+Group: Applications/Internet
+Requires: check-mk
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description livestatus
-This package contains livestatus, the check-mk's plugin for
+This package contains livestatus, the check-mk's plugin for
accessing the relevant Nagios files being responsible of
-listing the hosts and services status.
+listing the hosts and services status.
%package multisite
-Summary: The check-mk's Multisite
-Group: Applications/Internet
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
+Summary: The check-mk's Multisite
+Group: Applications/Internet
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
%description multisite
This package contains the check-mk's web interface aka WATO.
@@ -113,12 +123,12 @@ install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/plugins
install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/local
install -m 644 plugins/mk_logwatch %{buildroot}%{_datadir}/check-mk-agent/plugins
# The j4p_performance plugin has been deprecated.
-# install -m 644 plugins/j4p_performance %{buildroot}%{_datadir}/check-mk-agent/plugins
+# install -m 644 plugins/j4p_performance %%{buildroot}%%{_datadir}/check-mk-agent/plugins
install -m 644 plugins/mk_oracle %{buildroot}%{_datadir}/check-mk-agent/plugins
-install -m 644 plugins/sylo %{buildroot}%{_datadir}/check-mk-agent/plugins
+# Create an /etc/check-mk-agent directory for agent's configuration files. Examples
+# will be then available under the /usr/share/check_mk/agents/cfg_examples directory.
install -d -m 755 %{buildroot}%{_sysconfdir}/check-mk-agent
-install -m 644 logwatch.cfg %{buildroot}%{_sysconfdir}/check-mk-agent
perl -pi \
-e 's|MK_LIBDIR="/usr/lib/check_mk_agent"|MK_LIBDIR="%{_datadir}/check-mk-agent"|;' \
@@ -139,28 +149,24 @@ rm -rf %{buildroot}%{_sysconfdir}/apache2/
# Install the First-Installation.txt file
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/check_mk
-# Make sure all the scripts into /usr/share/check_mk/* and /usr/share/check-mk-agent/* are executable.
+# Make sure all the scripts into /usr/share/check_mk/{modules, inventory}
+# and /usr/share/check-mk-agent/* are executable.
for file in %{buildroot}%{_datadir}/check_mk/checks/* ; do
chmod -R a+x $file
done
-for file in %{buildroot}%{_datadir}/check-mk-agent/plugins/* ; do
- chmod a+x $file
+for file in %{buildroot}%{_datadir}/check_mk/modules/* ; do
+ chmod -R a+x $file
done
-# Fix a few more permissions
-chmod a+x %{buildroot}%{_datadir}/check_mk/agents/hpux/hpux_statgrab
-chmod a+x %{buildroot}%{_datadir}/check_mk/agents/hpux/hpux_lunstats
-chmod a+x %{buildroot}%{_datadir}/check_mk/agents/plugins/db2_mem.sh
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/snmp.py
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/packaging.py
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/agent_simulator.py
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/notify.py
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/automation.py
+for file in %{buildroot}%{_datadir}/check_mk/inventory/* ; do
+ chmod -R a+x $file
+done
+
+# Additional missing executable bit
chmod a+x %{buildroot}%{_datadir}/check_mk/notifications/debug
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/check_mk_base.py
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/prediction.py
-chmod a+x %{buildroot}%{_datadir}/check_mk/modules/localize.py
+chmod a+x %{buildroot}%{_datadir}/check-mk-agent/plugins/mk_logwatch
+chmod a+x %{buildroot}%{_datadir}/check-mk-agent/plugins/mk_oracle
# Web app files are not intended to be run, remove the shebang
# TODO: ask upstream to do the same
@@ -201,14 +207,29 @@ 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/
rm -rf %{buildroot}%{_datadir}/check_mk/agents/sap/
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/special/
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/z_os/
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/mk-job.solaris
-# Remove deprecated agent plugins.
+# Remove deprecated agent plugins and their documentation
rm -rf %{buildroot}%{_datadir}/check_mk/agents/plugins/j4p_performance
+rm -rf %{buildroot}%{_docdir}/check_mk/treasures/deprecated/
+
+# Remove the documentation for agents we are not going to package
+rm -rf %{buildroot}%{_docdir}/check_mk/agents/
# Remove Windows files.
rm -rf %{buildroot}%{_docdir}/check_mk/windows/
+rm -rf %{buildroot}%{_docdir}/check_mk/treasures/windows_msi/
+rm -rf %{buildroot}%{_docdir}/check_mk/treasures/msexchange/
rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
+
+# Remove DEB and RPM files that upstream ships
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent_%{version}-%{nodistrelease}_all.deb
+
# Remove waitmax and its leftarounds from the wrong directory, the binary is being
# built and installed into the check-mk-agent's package already.
rm %{buildroot}%{_datadir}/check_mk/agents/waitmax
@@ -229,6 +250,14 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/check_mk_agent/job
# Remove mk-job from its old location
rm -f %{buildroot}%{_datadir}/check_mk/agents/mk-job
+# Remove files that are present on other subpackages from -doc
+rm -rf %{buildroot}%{_docdir}/check_mk/AUTHORS
+rm -rf %{buildroot}%{_docdir}/check_mk/COPYING
+rm -rf %{buildroot}%{_docdir}/check_mk/ChangeLog
+
+# Remove the OMD-related README file
+rm -rf %{buildroot}%{_docdir}/check_mk/README.setup_in_omd
+
# Fix for 64-bit arches
%if %{_lib} == lib64
@@ -243,7 +272,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.4p5
+%config(noreplace) %{_sysconfdir}/check_mk/main.mk-1.2.6
%{_sysconfdir}/check_mk/First-Installation.txt
%{_sysconfdir}/check_mk/conf.d
%{_sysconfdir}/nagios/auth.serials
@@ -251,11 +280,14 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_datadir}/check_mk/checks
%{_datadir}/check_mk/pnp-templates
%{_datadir}/check_mk/notifications
+%{_datadir}/check_mk/inventory
%{_datadir}/check_mk/check_mk_templates.cfg
%config(noreplace) %{_sysconfdir}/httpd/conf.d/zzz_check_mk.conf
%config(noreplace) %{_sysconfdir}/nagios/conf.d/check_mk_templates.cfg
%attr(755, nagios, nagios) %{_localstatedir}/lib/check_mk/*
%doc COPYING ChangeLog AUTHORS
+%doc %{_docdir}/check_mk/README
+%doc %{_docdir}/check_mk/README.*
%files agent
%{_datadir}/check_mk/agents
@@ -264,25 +296,48 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
%{_bindir}/mk-job
%{_datadir}/check-mk-agent
%config(noreplace) %{_sysconfdir}/xinetd.d/check-mk-agent
-%config(noreplace) %{_sysconfdir}/check-mk-agent
%attr(755, -, -) %{_localstatedir}/lib/check_mk_agent/job
%doc COPYING
%files docs
-%doc %{_docdir}/check_mk
+%doc %{_docdir}/check_mk/checks
+%doc %{_docdir}/check_mk/benchmark
+%doc %{_docdir}/check_mk/drafts
+%doc %{_docdir}/check_mk/helpers
+%doc %{_docdir}/check_mk/jasperreports
+%doc %{_docdir}/check_mk/livestatus
+%doc %{_docdir}/check_mk/mkeventd
+%doc %{_docdir}/check_mk/predictive
+%doc %{_docdir}/check_mk/treasures
+%doc %{_docdir}/check_mk/*.svg
+%doc %{_docdir}/check_mk/*.gif
+%doc %{_docdir}/check_mk/*.png
+%doc %{_docdir}/check_mk/*.mk
+%doc %{_docdir}/check_mk/manpage.template
+%doc %{_docdir}/check_mk/skeleton_check
+%doc COPYING
%files multisite
%{_datadir}/check_mk/web
%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk
-%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.4p5
+%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.6
%{_sysconfdir}/check_mk/multisite.d
%attr(660, apache, nagios) %{_sysconfdir}/check_mk/conf.d/wato
+%doc COPYING
%files livestatus
%{_bindir}/unixcat
%{_libdir}/check_mk
+%doc COPYING
%changelog
+* Tue Apr 07 2015 Andrea Veri <averi at fedoraproject.org> - 1.2.6-1
+- New upstream release. Source0 is now generated directly from Git
+ as Check-Mk's upstream has decided to not include source code files
+ (.cc, .c) for livestatus, mkeventd and waitmax anymore on the tarballs
+ they release. We want to have these binaries built during the RPM build,
+ thus the need to repack the tarball with the procedure outlined above.
+
* Tue Sep 30 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-2
- Do not require any other shell than bash since that's the default
shell for the Fedora / RHEL distributions.
--
cgit v0.10.2
>From c578388170b480fce452b448902a7729418bea33 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 12:33:01 +0200
Subject: Update the defaults and defaults.py files including new variables
diff --git a/defaults b/defaults
index 01b38c8..0bc4f25 100644
--- a/defaults
+++ b/defaults
@@ -1,18 +1,10 @@
-# This file has been created during setup of check_mk at Tue Apr 9 17:15:45 CEST 2013.
-# Do not edit this file. Also do not try to override these settings
-# in main.mk since some of them are hardcoded into several files
-# during setup.
-#
-# If you need to change these settings, you have to re-run setup.sh
-# and enter new values when asked, or edit ~/.check_mk_setup.conf and
-# run ./setup.sh --yes.
-
-check_mk_version = '1.2.4p2'
+check_mk_version = '1.2.6'
default_config_dir = '/etc/check_mk'
check_mk_configdir = '/etc/check_mk/conf.d'
share_dir = '/usr/share/check_mk'
checks_dir = '/usr/share/check_mk/checks'
notifications_dir = '/usr/share/check_mk/notifications'
+inventory_dir = '/usr/share/check_mk/inventory'
check_manpages_dir = '/usr/share/doc/check_mk/checks'
modules_dir = '/usr/share/check_mk/modules'
locale_dir = '/usr/share/check_mk/locale'
diff --git a/defaults.py b/defaults.py
index 01b38c8..0bc4f25 100644
--- a/defaults.py
+++ b/defaults.py
@@ -1,18 +1,10 @@
-# This file has been created during setup of check_mk at Tue Apr 9 17:15:45 CEST 2013.
-# Do not edit this file. Also do not try to override these settings
-# in main.mk since some of them are hardcoded into several files
-# during setup.
-#
-# If you need to change these settings, you have to re-run setup.sh
-# and enter new values when asked, or edit ~/.check_mk_setup.conf and
-# run ./setup.sh --yes.
-
-check_mk_version = '1.2.4p2'
+check_mk_version = '1.2.6'
default_config_dir = '/etc/check_mk'
check_mk_configdir = '/etc/check_mk/conf.d'
share_dir = '/usr/share/check_mk'
checks_dir = '/usr/share/check_mk/checks'
notifications_dir = '/usr/share/check_mk/notifications'
+inventory_dir = '/usr/share/check_mk/inventory'
check_manpages_dir = '/usr/share/doc/check_mk/checks'
modules_dir = '/usr/share/check_mk/modules'
locale_dir = '/usr/share/check_mk/locale'
--
cgit v0.10.2
>From f54a1e585fab0bdd83b309df582b1c16ec2c5eff Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 12:42:23 +0200
Subject: Import the new upstream release tarball
diff --git a/.gitignore b/.gitignore
index e534987..92e9d17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/check_mk-1.2.4p1.tar.gz
/check_mk-1.2.4p2.tar.gz
/check_mk-1.2.4p5.tar.gz
+/check_mk-1.2.6.tar.gz
diff --git a/sources b/sources
index 6d6a60d..195c364 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef3055d191bd38295d1716b3f7824115 check_mk-1.2.4p5.tar.gz
+deaa8891386e4116a85d811c0198d625 check_mk-1.2.6.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=el6&id=172796d3cb4190526556fdae1028a40d3e9e3a17
More information about the scm-commits
mailing list