1 |
commit: 51d4359a74518591e91dd37d9edb71cd3cc143dd |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 27 12:30:16 2018 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 27 13:29:05 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d4359a |
7 |
|
8 |
net-analyzer/check_mk_agent: bump 1.2.8 to p27, add 1.4.0_p31 |
9 |
|
10 |
Upstream has changed packaging to now include yet another layer of tarball, |
11 |
so ebuilds now install check_mk_agent out of the full "Raw" OMD release. |
12 |
|
13 |
Other than that, the only new thing is that the inventory plugin can be |
14 |
auto-installed via the new 'inventory' use flag. |
15 |
|
16 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
17 |
|
18 |
net-analyzer/check_mk_agent/Manifest | 3 +- |
19 |
..._p16.ebuild => check_mk_agent-1.2.8_p27.ebuild} | 36 +++++----------------- |
20 |
..._p16.ebuild => check_mk_agent-1.4.0_p31.ebuild} | 36 +++++----------------- |
21 |
net-analyzer/check_mk_agent/metadata.xml | 1 + |
22 |
4 files changed, 19 insertions(+), 57 deletions(-) |
23 |
|
24 |
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest |
25 |
index 919f615de24..d378a34fa03 100644 |
26 |
--- a/net-analyzer/check_mk_agent/Manifest |
27 |
+++ b/net-analyzer/check_mk_agent/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
-DIST check_mk-1.2.8p16.tar.gz 16298683 BLAKE2B 5023719c3e2e56807900ccb204862eccb73706bb23dfa3dfb4f30cb6fa592828e2d81aef12dd5129b280c37ca8d700c982f3b29469fd5ec0328e91e414b8c624 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb |
30 |
+DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f |
31 |
+DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b |
32 |
|
33 |
diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild |
34 |
similarity index 71% |
35 |
copy from net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild |
36 |
copy to net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild |
37 |
index 0bb80b3ddcd..c41c9b1f348 100644 |
38 |
--- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild |
39 |
+++ b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild |
40 |
@@ -1,4 +1,4 @@ |
41 |
-# Copyright 1999-2017 Gentoo Foundation |
42 |
+# Copyright 1999-2018 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
EAPI=6 |
46 |
@@ -9,12 +9,12 @@ DESCRIPTION="Agent to report data to Check_MK for monitoring" |
47 |
HOMEPAGE="http://mathias-kettner.de/check_mk.html" |
48 |
|
49 |
MY_PV="${PV/_p/p}" |
50 |
-MY_P="check_mk-${MY_PV}" |
51 |
+MY_P="check-mk-raw-${MY_PV}.cre" |
52 |
|
53 |
LICENSE="GPL-2" |
54 |
SLOT="0" |
55 |
KEYWORDS="~amd64 ~x86" |
56 |
-IUSE="apache_status logwatch mysql nfsexports oracle postgres smart +xinetd zypper" |
57 |
+IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper" |
58 |
|
59 |
RDEPEND="!!net-analyzer/check_mk |
60 |
app-shells/bash:* |
61 |
@@ -22,44 +22,23 @@ RDEPEND="!!net-analyzer/check_mk |
62 |
" |
63 |
DEPEND="${RDEPEND}" |
64 |
|
65 |
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" |
66 |
+SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz" |
67 |
|
68 |
src_unpack() { |
69 |
# check_mk is a tarball containing tarballs |
70 |
unpack ${A} |
71 |
+ unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz |
72 |
mkdir -p "${S}" || die |
73 |
cd "${S}" || die |
74 |
- unpack "${WORKDIR}"/${MY_P}/agents.tar.gz |
75 |
+ unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz |
76 |
mkdir -p "${S}"/doc || die |
77 |
cd "${S}"/doc || die |
78 |
- unpack "${WORKDIR}"/${MY_P}/doc.tar.gz |
79 |
-} |
80 |
- |
81 |
-src_prepare() { |
82 |
- cat <<EOF >Makefile |
83 |
-all: waitmax |
84 |
- |
85 |
-waitmax: waitmax.c |
86 |
- \$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS) |
87 |
- |
88 |
-EOF |
89 |
- |
90 |
- if [[ -f waitmax ]]; then |
91 |
- rm waitmax || die "Couldn't delete precompiled waitmax file" |
92 |
- fi |
93 |
- |
94 |
- default |
95 |
-} |
96 |
- |
97 |
-src_compile() { |
98 |
- # compile waitmax |
99 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" |
100 |
+ unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz |
101 |
} |
102 |
|
103 |
src_install() { |
104 |
# Install agent related files |
105 |
newbin check_mk_agent.linux check_mk_agent |
106 |
- dobin waitmax |
107 |
|
108 |
keepdir /usr/lib/check_mk_agent/local |
109 |
dodir /usr/lib/check_mk_agent/plugins |
110 |
@@ -84,6 +63,7 @@ src_install() { |
111 |
|
112 |
# Install any other useflag-enabled agent plugins |
113 |
exeinto /usr/lib/check_mk_agent/plugins |
114 |
+ use inventory && newexe plugins/mk_inventory.linux mk_inventory |
115 |
use smart && doexe plugins/smart |
116 |
use mysql && doexe plugins/mk_mysql |
117 |
use postgres && doexe plugins/mk_postgres |
118 |
|
119 |
diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild |
120 |
similarity index 71% |
121 |
rename from net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild |
122 |
rename to net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild |
123 |
index 0bb80b3ddcd..c41c9b1f348 100644 |
124 |
--- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild |
125 |
+++ b/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild |
126 |
@@ -1,4 +1,4 @@ |
127 |
-# Copyright 1999-2017 Gentoo Foundation |
128 |
+# Copyright 1999-2018 Gentoo Foundation |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
|
131 |
EAPI=6 |
132 |
@@ -9,12 +9,12 @@ DESCRIPTION="Agent to report data to Check_MK for monitoring" |
133 |
HOMEPAGE="http://mathias-kettner.de/check_mk.html" |
134 |
|
135 |
MY_PV="${PV/_p/p}" |
136 |
-MY_P="check_mk-${MY_PV}" |
137 |
+MY_P="check-mk-raw-${MY_PV}.cre" |
138 |
|
139 |
LICENSE="GPL-2" |
140 |
SLOT="0" |
141 |
KEYWORDS="~amd64 ~x86" |
142 |
-IUSE="apache_status logwatch mysql nfsexports oracle postgres smart +xinetd zypper" |
143 |
+IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper" |
144 |
|
145 |
RDEPEND="!!net-analyzer/check_mk |
146 |
app-shells/bash:* |
147 |
@@ -22,44 +22,23 @@ RDEPEND="!!net-analyzer/check_mk |
148 |
" |
149 |
DEPEND="${RDEPEND}" |
150 |
|
151 |
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" |
152 |
+SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz" |
153 |
|
154 |
src_unpack() { |
155 |
# check_mk is a tarball containing tarballs |
156 |
unpack ${A} |
157 |
+ unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz |
158 |
mkdir -p "${S}" || die |
159 |
cd "${S}" || die |
160 |
- unpack "${WORKDIR}"/${MY_P}/agents.tar.gz |
161 |
+ unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz |
162 |
mkdir -p "${S}"/doc || die |
163 |
cd "${S}"/doc || die |
164 |
- unpack "${WORKDIR}"/${MY_P}/doc.tar.gz |
165 |
-} |
166 |
- |
167 |
-src_prepare() { |
168 |
- cat <<EOF >Makefile |
169 |
-all: waitmax |
170 |
- |
171 |
-waitmax: waitmax.c |
172 |
- \$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS) |
173 |
- |
174 |
-EOF |
175 |
- |
176 |
- if [[ -f waitmax ]]; then |
177 |
- rm waitmax || die "Couldn't delete precompiled waitmax file" |
178 |
- fi |
179 |
- |
180 |
- default |
181 |
-} |
182 |
- |
183 |
-src_compile() { |
184 |
- # compile waitmax |
185 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" |
186 |
+ unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz |
187 |
} |
188 |
|
189 |
src_install() { |
190 |
# Install agent related files |
191 |
newbin check_mk_agent.linux check_mk_agent |
192 |
- dobin waitmax |
193 |
|
194 |
keepdir /usr/lib/check_mk_agent/local |
195 |
dodir /usr/lib/check_mk_agent/plugins |
196 |
@@ -84,6 +63,7 @@ src_install() { |
197 |
|
198 |
# Install any other useflag-enabled agent plugins |
199 |
exeinto /usr/lib/check_mk_agent/plugins |
200 |
+ use inventory && newexe plugins/mk_inventory.linux mk_inventory |
201 |
use smart && doexe plugins/smart |
202 |
use mysql && doexe plugins/mk_mysql |
203 |
use postgres && doexe plugins/mk_postgres |
204 |
|
205 |
diff --git a/net-analyzer/check_mk_agent/metadata.xml b/net-analyzer/check_mk_agent/metadata.xml |
206 |
index 8cdfbbe9f07..1a171aa481a 100644 |
207 |
--- a/net-analyzer/check_mk_agent/metadata.xml |
208 |
+++ b/net-analyzer/check_mk_agent/metadata.xml |
209 |
@@ -10,6 +10,7 @@ |
210 |
Nagios/Icigna centralized monitoring servers. |
211 |
</longdescription> |
212 |
<use> |
213 |
+ <flag name="inventory">Install check_mk-agent linux inventory plugin.</flag> |
214 |
<flag name="logwatch">Install check_mk-agent logwatch plugin.</flag> |
215 |
<flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag> |
216 |
<flag name="mysql">Install check_mk-agent mysql plugin.</flag> |