Gentoo Archives: gentoo-commits

From: "罗百科" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/
Date: Sun, 27 Oct 2019 13:04:19
Message-Id: 1572181409.b57e63a1f026822b8969b965ed6db975b3df8542.patrick@gentoo
1 commit: b57e63a1f026822b8969b965ed6db975b3df8542
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 27 12:35:21 2019 +0000
4 Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 27 13:03:29 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b57e63a1
7
8 net-analyzer/zabbix: Bump, remove old
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
12
13 net-analyzer/zabbix/Manifest | 3 +
14 net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild | 2 +-
15 net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild | 341 ---------------------
16 net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild | 341 ---------------------
17 .../{zabbix-3.0.26.ebuild => zabbix-3.0.28.ebuild} | 2 +-
18 net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild | 328 --------------------
19 net-analyzer/zabbix/zabbix-3.4.15.ebuild | 4 +-
20 .../{zabbix-4.0.7.ebuild => zabbix-4.0.13.ebuild} | 2 +-
21 net-analyzer/zabbix/zabbix-4.0.6.ebuild | 333 --------------------
22 net-analyzer/zabbix/zabbix-4.2.3.ebuild | 333 --------------------
23 .../{zabbix-4.0.9.ebuild => zabbix-4.2.7.ebuild} | 2 +-
24 11 files changed, 9 insertions(+), 1682 deletions(-)
25
26 diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
27 index 8ad8b16abba..8ca2cdf0888 100644
28 --- a/net-analyzer/zabbix/Manifest
29 +++ b/net-analyzer/zabbix/Manifest
30 @@ -2,9 +2,12 @@ DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1f
31 DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
32 DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd SHA512 178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
33 DIST zabbix-3.0.26.tar.gz 14724426 BLAKE2B d887f0dd77cf051e2b6ae16221c02c20aa3a7b8bee07eaff5a0837eb25962a4d0b42a9adace4d68d5e141fcd89a0896e3e2f64b6af5e28b2e63109a89791ced3 SHA512 de3ebee12a4be3b81d64fd0ce718866d55c9696da97f54c546c882f0e70656066c825c9383caf80fdf5ea6a6ac4801cb8ae88c1a83d9be051935111a72e31917
34 +DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46
35 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
36 DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
37 +DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
38 DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 8f03830d5493719cbabd770527dfc99e1bd2d80a3eaeb691e07cd7d8bfe587317ee045ed13a297494539d3cc2e3a26bafe29cd6eb6126c7fe74ee5de44e98b39 SHA512 43b7ccadfaebc34098a827ef7e27c2c637d4bb74db4d06cdaee7650171b7b5e14787a473a66b638a252c1342e841b546e089bd762de703e99e0a34b0549393ca
39 DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802 SHA512 67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8
40 DIST zabbix-4.0.9.tar.gz 17118478 BLAKE2B 0b3761085c9fac577061ca3a0e5839c3d33f13802ff4e752c575f4428339dfbc7e02e5ae8abbf7870a0286c45777c670aa74cd93b2cdbf9cf62961e4723aa0ae SHA512 4e04d80490f43d2e7833a4e11dbc7ce0ed70dc1f43653eeff923f5bfa16bbeedf37597599d68e0de3194820501d896d785a20d6ae0dce9328c458fd711a6a7bf
41 DIST zabbix-4.2.3.tar.gz 18241315 BLAKE2B 38f9e61ccfe68de553e115e35466430b9f8b4211ca72b3c0265a9c9e5494575d8b026cda11cb7ef10644df35b8f168b7e5ca72ace8a412445008299c6c513877 SHA512 2e7d7372d5ce84798743d3c10fea0230aac470b0d9936a722687eefbe818b51e16f5dc64040b8b1b1189f64e8785ceca108914534efecd152473d213b15f7e07
42 +DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
43
44 diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
45 index 6449f4cd9d5..5af1a7ad360 100644
46 --- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
47 +++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
48 @@ -70,7 +70,7 @@ DEPEND="${COMMON_DEPEND}
49 postgres? ( dev-db/postgresql:*[static-libs] )
50 libxml2? ( dev-libs/libxml2[static-libs] )
51 curl? ( net-misc/curl[static-libs] )
52 - ssh? ( net-libs/libssh2[static-libs] )
53 + ssh? ( net-libs/libssh2 )
54 odbc? ( dev-db/unixODBC[static-libs] )
55 )
56 virtual/pkgconfig"
57
58 diff --git a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
59 deleted file mode 100644
60 index 5cf01256455..00000000000
61 --- a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
62 +++ /dev/null
63 @@ -1,341 +0,0 @@
64 -# Copyright 1999-2019 Gentoo Authors
65 -# Distributed under the terms of the GNU General Public License v2
66 -
67 -EAPI="6"
68 -
69 -# needed to make webapp-config dep optional
70 -WEBAPP_OPTIONAL="yes"
71 -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
72 -
73 -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
74 -HOMEPAGE="https://www.zabbix.com/"
75 -MY_P=${P/_/}
76 -MY_PV=${PV/_/}
77 -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
78 -LICENSE="GPL-2"
79 -SLOT="0"
80 -WEBAPP_MANUAL_SLOT="yes"
81 -KEYWORDS="~amd64 ~x86"
82 -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
83 -REQUIRED_USE="|| ( agent frontend proxy server )
84 - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
85 - server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
86 - static? ( !oracle !snmp )"
87 -
88 -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
89 - ldap? (
90 - net-nds/openldap
91 - =dev-libs/cyrus-sasl-2*
92 - net-libs/gnutls
93 - )
94 - mysql? ( >=virtual/mysql-5.0.3 )
95 - sqlite? ( >=dev-db/sqlite-3.3.5 )
96 - postgres? ( dev-db/postgresql:* )
97 - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
98 - xmpp? ( dev-libs/iksemel )
99 - libxml2? ( dev-libs/libxml2 )
100 - curl? ( net-misc/curl )
101 - openipmi? ( sys-libs/openipmi )
102 - ssh? ( net-libs/libssh2 )
103 - java? ( virtual/jdk:* )
104 - odbc? ( dev-db/unixODBC )"
105 -
106 -RDEPEND="${COMMON_DEPEND}
107 - proxy? ( net-analyzer/fping )
108 - server? ( net-analyzer/fping
109 - app-admin/webapp-config )
110 - java? (
111 - >=virtual/jre-1.4
112 - dev-java/slf4j-api
113 - )
114 - frontend? (
115 - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
116 - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
117 - mysql? ( dev-lang/php[mysqli] )
118 - odbc? ( dev-lang/php[odbc] )
119 - oracle? ( dev-lang/php[oci8-instant-client] )
120 - postgres? ( dev-lang/php[postgres] )
121 - sqlite? ( dev-lang/php[sqlite] )
122 - media-libs/gd[png]
123 - app-admin/webapp-config )"
124 -DEPEND="${COMMON_DEPEND}
125 - static? (
126 - ldap? (
127 - net-nds/openldap[static-libs]
128 - =dev-libs/cyrus-sasl-2*[static-libs]
129 - net-libs/gnutls[static-libs]
130 - )
131 - mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
132 - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
133 - postgres? ( dev-db/postgresql:*[static-libs] )
134 - libxml2? ( dev-libs/libxml2[static-libs] )
135 - curl? ( net-misc/curl[static-libs] )
136 - ssh? ( net-libs/libssh2[static-libs] )
137 - odbc? ( dev-db/unixODBC[static-libs] )
138 - )
139 - virtual/pkgconfig"
140 -
141 -S=${WORKDIR}/${MY_P}
142 -
143 -ZABBIXJAVA_BASE="opt/zabbix_java"
144 -
145 -pkg_setup() {
146 - if use oracle; then
147 - if [ -z "${ORACLE_HOME}" ]; then
148 - eerror
149 - eerror "The environment variable ORACLE_HOME must be set"
150 - eerror "and point to the correct location."
151 - eerror "It looks like you don't have Oracle installed."
152 - eerror
153 - die "Environment variable ORACLE_HOME is not set"
154 - fi
155 - if has_version 'dev-db/oracle-instantclient-basic'; then
156 - ewarn
157 - ewarn "Please ensure you have a full install of the Oracle client."
158 - ewarn "dev-db/oracle-instantclient* is NOT sufficient."
159 - ewarn
160 - fi
161 - fi
162 -
163 - if use frontend; then
164 - webapp_pkg_setup
165 - fi
166 -
167 - enewgroup zabbix
168 - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
169 -}
170 -
171 -java_prepare() {
172 - cd "${S}/src/zabbix_java/lib"
173 - rm -v *.jar || die
174 -
175 - java-pkg_jar-from slf4j-api
176 -}
177 -
178 -src_prepare() {
179 - default
180 -}
181 -
182 -src_configure() {
183 - econf \
184 - $(use_enable server) \
185 - $(use_enable proxy) \
186 - $(use_enable agent) \
187 - $(use_enable ipv6) \
188 - $(use_enable static) \
189 - $(use_enable java) \
190 - $(use_with ldap) \
191 - $(use_with snmp net-snmp) \
192 - $(use_with mysql) \
193 - $(use_with postgres postgresql) \
194 - $(use_with oracle) \
195 - $(use_with sqlite sqlite3) \
196 - $(use_with xmpp jabber) \
197 - $(use_with curl libcurl) \
198 - $(use_with openipmi openipmi) \
199 - $(use_with ssh ssh2) \
200 - $(use_with libxml2) \
201 - $(use_with odbc unixodbc) \
202 - || die "econf failed"
203 -}
204 -
205 -src_compile() {
206 - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
207 - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
208 - fi
209 -}
210 -
211 -src_install() {
212 - dodir \
213 - /etc/zabbix \
214 - /var/lib/zabbix \
215 - /var/lib/zabbix/home \
216 - /var/lib/zabbix/scripts \
217 - /var/lib/zabbix/alertscripts \
218 - /var/lib/zabbix/externalscripts \
219 - /var/log/zabbix
220 -
221 - keepdir \
222 - /etc/zabbix \
223 - /var/lib/zabbix \
224 - /var/lib/zabbix/home \
225 - /var/lib/zabbix/scripts \
226 - /var/lib/zabbix/alertscripts \
227 - /var/lib/zabbix/externalscripts \
228 - /var/log/zabbix
229 -
230 - if use server; then
231 - insinto /etc/zabbix
232 - doins "${FILESDIR}/2.2"/zabbix_server.conf
233 - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
234 - dosbin src/zabbix_server/zabbix_server
235 - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
236 - fperms 0640 /etc/zabbix/zabbix_server.conf
237 - dodir /usr/share/zabbix
238 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
239 - systemd_dounit "${FILESDIR}/zabbix-server.service"
240 - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
241 - fi
242 -
243 - if use proxy; then
244 - doinitd \
245 - "${FILESDIR}/2.2"/init.d/zabbix-proxy
246 - dosbin \
247 - src/zabbix_proxy/zabbix_proxy
248 - insinto /etc/zabbix
249 - doins \
250 - "${FILESDIR}/2.2"/zabbix_proxy.conf
251 - dodir /usr/share/zabbix
252 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
253 - systemd_dounit "${FILESDIR}/zabbix-proxy.service"
254 - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
255 - fi
256 -
257 - if use agent; then
258 - insinto /etc/zabbix
259 - doins \
260 - "${FILESDIR}/2.2"/zabbix_agent.conf \
261 - "${FILESDIR}/2.2"/zabbix_agentd.conf
262 - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
263 - dosbin \
264 - src/zabbix_agent/zabbix_agent \
265 - src/zabbix_agent/zabbix_agentd
266 - dobin \
267 - src/zabbix_sender/zabbix_sender \
268 - src/zabbix_get/zabbix_get
269 - fowners zabbix:zabbix \
270 - /etc/zabbix/zabbix_agent.conf \
271 - /etc/zabbix/zabbix_agentd.conf
272 - fperms 0640 \
273 - /etc/zabbix/zabbix_agent.conf \
274 - /etc/zabbix/zabbix_agentd.conf
275 - systemd_dounit "${FILESDIR}/zabbix-agentd.service"
276 - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
277 - fi
278 -
279 - fowners zabbix:zabbix \
280 - /etc/zabbix \
281 - /var/lib/zabbix \
282 - /var/lib/zabbix/home \
283 - /var/lib/zabbix/scripts \
284 - /var/lib/zabbix/alertscripts \
285 - /var/lib/zabbix/externalscripts \
286 - /var/log/zabbix
287 - fperms 0750 \
288 - /etc/zabbix \
289 - /var/lib/zabbix \
290 - /var/lib/zabbix/home \
291 - /var/lib/zabbix/scripts \
292 - /var/lib/zabbix/alertscripts \
293 - /var/lib/zabbix/externalscripts \
294 - /var/log/zabbix
295 -
296 - dodoc README INSTALL NEWS ChangeLog \
297 - conf/zabbix_agent.conf \
298 - conf/zabbix_agentd.conf \
299 - conf/zabbix_proxy.conf \
300 - conf/zabbix_agentd/userparameter_examples.conf \
301 - conf/zabbix_agentd/userparameter_mysql.conf \
302 - conf/zabbix_server.conf
303 -
304 - if use frontend; then
305 - webapp_src_preinst
306 - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
307 - webapp_configfile \
308 - "${MY_HTDOCSDIR}"/include/db.inc.php \
309 - "${MY_HTDOCSDIR}"/include/config.inc.php
310 - webapp_src_install
311 - fi
312 -
313 - if use java; then
314 - dodir \
315 - /${ZABBIXJAVA_BASE} \
316 - /${ZABBIXJAVA_BASE}/bin \
317 - /${ZABBIXJAVA_BASE}/lib
318 - keepdir /${ZABBIXJAVA_BASE}
319 - exeinto /${ZABBIXJAVA_BASE}/bin
320 - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
321 - exeinto /${ZABBIXJAVA_BASE}/lib
322 - doexe \
323 - src/zabbix_java/lib/logback-classic-0.9.27.jar \
324 - src/zabbix_java/lib/logback-console.xml \
325 - src/zabbix_java/lib/logback-core-0.9.27.jar \
326 - src/zabbix_java/lib/logback.xml \
327 - src/zabbix_java/lib/android-json-4.3_r3.1.jar \
328 - src/zabbix_java/lib/slf4j-api-1.6.1.jar
329 - exeinto /${ZABBIXJAVA_BASE}/
330 - doexe \
331 - src/zabbix_java/settings.sh \
332 - src/zabbix_java/startup.sh \
333 - src/zabbix_java/shutdown.sh
334 - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
335 - fi
336 -}
337 -
338 -pkg_postinst() {
339 - if use server || use proxy ; then
340 - elog
341 - elog "You may need to configure your database for Zabbix,"
342 - elog "if you have not already done so. "
343 - elog
344 -
345 - zabbix_homedir=$(egethome zabbix)
346 - if [ -n "${zabbix_homedir}" ] && \
347 - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
348 - ewarn
349 - ewarn "The user 'zabbix' should have his homedir changed"
350 - ewarn "to /var/lib/zabbix/home if you want to use"
351 - ewarn "custom alert scripts."
352 - ewarn
353 - ewarn "A real homedir might be needed for configfiles"
354 - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
355 - ewarn "using sendxmpp for Jabber alerts)."
356 - ewarn
357 - ewarn "To change the homedir use:"
358 - ewarn " usermod -d /var/lib/zabbix/home zabbix"
359 - ewarn
360 - fi
361 - fi
362 -
363 - if use server; then
364 - elog
365 - elog "For distributed monitoring you have to run:"
366 - elog
367 - elog "zabbix_server -n <nodeid>"
368 - elog
369 - elog "This will convert database data for use with Node ID"
370 - elog "and also adds a local node."
371 - elog
372 - fi
373 -
374 - elog "--"
375 - elog
376 - elog "You may need to add these lines to /etc/services:"
377 - elog
378 - elog "zabbix-agent 10050/tcp Zabbix Agent"
379 - elog "zabbix-agent 10050/udp Zabbix Agent"
380 - elog "zabbix-trapper 10051/tcp Zabbix Trapper"
381 - elog "zabbix-trapper 10051/udp Zabbix Trapper"
382 - elog
383 -
384 - if use server || use proxy ; then
385 - # check for fping
386 - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
387 - case "${fping_perms}" in
388 - 4[157][157][157])
389 - ;;
390 - *)
391 - ewarn
392 - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
393 - ewarn "you have to make /usr/sbin/fping setuid root and executable"
394 - ewarn "by everyone. Run the following command to fix it:"
395 - ewarn
396 - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
397 - ewarn
398 - ewarn "Please be aware that this might impose a security risk,"
399 - ewarn "depending on the code quality of fping."
400 - ewarn
401 - ;;
402 - esac
403 - fi
404 -}
405
406 diff --git a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
407 deleted file mode 100644
408 index 5cf01256455..00000000000
409 --- a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
410 +++ /dev/null
411 @@ -1,341 +0,0 @@
412 -# Copyright 1999-2019 Gentoo Authors
413 -# Distributed under the terms of the GNU General Public License v2
414 -
415 -EAPI="6"
416 -
417 -# needed to make webapp-config dep optional
418 -WEBAPP_OPTIONAL="yes"
419 -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
420 -
421 -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
422 -HOMEPAGE="https://www.zabbix.com/"
423 -MY_P=${P/_/}
424 -MY_PV=${PV/_/}
425 -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
426 -LICENSE="GPL-2"
427 -SLOT="0"
428 -WEBAPP_MANUAL_SLOT="yes"
429 -KEYWORDS="~amd64 ~x86"
430 -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
431 -REQUIRED_USE="|| ( agent frontend proxy server )
432 - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
433 - server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
434 - static? ( !oracle !snmp )"
435 -
436 -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
437 - ldap? (
438 - net-nds/openldap
439 - =dev-libs/cyrus-sasl-2*
440 - net-libs/gnutls
441 - )
442 - mysql? ( >=virtual/mysql-5.0.3 )
443 - sqlite? ( >=dev-db/sqlite-3.3.5 )
444 - postgres? ( dev-db/postgresql:* )
445 - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
446 - xmpp? ( dev-libs/iksemel )
447 - libxml2? ( dev-libs/libxml2 )
448 - curl? ( net-misc/curl )
449 - openipmi? ( sys-libs/openipmi )
450 - ssh? ( net-libs/libssh2 )
451 - java? ( virtual/jdk:* )
452 - odbc? ( dev-db/unixODBC )"
453 -
454 -RDEPEND="${COMMON_DEPEND}
455 - proxy? ( net-analyzer/fping )
456 - server? ( net-analyzer/fping
457 - app-admin/webapp-config )
458 - java? (
459 - >=virtual/jre-1.4
460 - dev-java/slf4j-api
461 - )
462 - frontend? (
463 - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
464 - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
465 - mysql? ( dev-lang/php[mysqli] )
466 - odbc? ( dev-lang/php[odbc] )
467 - oracle? ( dev-lang/php[oci8-instant-client] )
468 - postgres? ( dev-lang/php[postgres] )
469 - sqlite? ( dev-lang/php[sqlite] )
470 - media-libs/gd[png]
471 - app-admin/webapp-config )"
472 -DEPEND="${COMMON_DEPEND}
473 - static? (
474 - ldap? (
475 - net-nds/openldap[static-libs]
476 - =dev-libs/cyrus-sasl-2*[static-libs]
477 - net-libs/gnutls[static-libs]
478 - )
479 - mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
480 - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
481 - postgres? ( dev-db/postgresql:*[static-libs] )
482 - libxml2? ( dev-libs/libxml2[static-libs] )
483 - curl? ( net-misc/curl[static-libs] )
484 - ssh? ( net-libs/libssh2[static-libs] )
485 - odbc? ( dev-db/unixODBC[static-libs] )
486 - )
487 - virtual/pkgconfig"
488 -
489 -S=${WORKDIR}/${MY_P}
490 -
491 -ZABBIXJAVA_BASE="opt/zabbix_java"
492 -
493 -pkg_setup() {
494 - if use oracle; then
495 - if [ -z "${ORACLE_HOME}" ]; then
496 - eerror
497 - eerror "The environment variable ORACLE_HOME must be set"
498 - eerror "and point to the correct location."
499 - eerror "It looks like you don't have Oracle installed."
500 - eerror
501 - die "Environment variable ORACLE_HOME is not set"
502 - fi
503 - if has_version 'dev-db/oracle-instantclient-basic'; then
504 - ewarn
505 - ewarn "Please ensure you have a full install of the Oracle client."
506 - ewarn "dev-db/oracle-instantclient* is NOT sufficient."
507 - ewarn
508 - fi
509 - fi
510 -
511 - if use frontend; then
512 - webapp_pkg_setup
513 - fi
514 -
515 - enewgroup zabbix
516 - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
517 -}
518 -
519 -java_prepare() {
520 - cd "${S}/src/zabbix_java/lib"
521 - rm -v *.jar || die
522 -
523 - java-pkg_jar-from slf4j-api
524 -}
525 -
526 -src_prepare() {
527 - default
528 -}
529 -
530 -src_configure() {
531 - econf \
532 - $(use_enable server) \
533 - $(use_enable proxy) \
534 - $(use_enable agent) \
535 - $(use_enable ipv6) \
536 - $(use_enable static) \
537 - $(use_enable java) \
538 - $(use_with ldap) \
539 - $(use_with snmp net-snmp) \
540 - $(use_with mysql) \
541 - $(use_with postgres postgresql) \
542 - $(use_with oracle) \
543 - $(use_with sqlite sqlite3) \
544 - $(use_with xmpp jabber) \
545 - $(use_with curl libcurl) \
546 - $(use_with openipmi openipmi) \
547 - $(use_with ssh ssh2) \
548 - $(use_with libxml2) \
549 - $(use_with odbc unixodbc) \
550 - || die "econf failed"
551 -}
552 -
553 -src_compile() {
554 - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
555 - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
556 - fi
557 -}
558 -
559 -src_install() {
560 - dodir \
561 - /etc/zabbix \
562 - /var/lib/zabbix \
563 - /var/lib/zabbix/home \
564 - /var/lib/zabbix/scripts \
565 - /var/lib/zabbix/alertscripts \
566 - /var/lib/zabbix/externalscripts \
567 - /var/log/zabbix
568 -
569 - keepdir \
570 - /etc/zabbix \
571 - /var/lib/zabbix \
572 - /var/lib/zabbix/home \
573 - /var/lib/zabbix/scripts \
574 - /var/lib/zabbix/alertscripts \
575 - /var/lib/zabbix/externalscripts \
576 - /var/log/zabbix
577 -
578 - if use server; then
579 - insinto /etc/zabbix
580 - doins "${FILESDIR}/2.2"/zabbix_server.conf
581 - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
582 - dosbin src/zabbix_server/zabbix_server
583 - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
584 - fperms 0640 /etc/zabbix/zabbix_server.conf
585 - dodir /usr/share/zabbix
586 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
587 - systemd_dounit "${FILESDIR}/zabbix-server.service"
588 - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
589 - fi
590 -
591 - if use proxy; then
592 - doinitd \
593 - "${FILESDIR}/2.2"/init.d/zabbix-proxy
594 - dosbin \
595 - src/zabbix_proxy/zabbix_proxy
596 - insinto /etc/zabbix
597 - doins \
598 - "${FILESDIR}/2.2"/zabbix_proxy.conf
599 - dodir /usr/share/zabbix
600 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
601 - systemd_dounit "${FILESDIR}/zabbix-proxy.service"
602 - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
603 - fi
604 -
605 - if use agent; then
606 - insinto /etc/zabbix
607 - doins \
608 - "${FILESDIR}/2.2"/zabbix_agent.conf \
609 - "${FILESDIR}/2.2"/zabbix_agentd.conf
610 - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
611 - dosbin \
612 - src/zabbix_agent/zabbix_agent \
613 - src/zabbix_agent/zabbix_agentd
614 - dobin \
615 - src/zabbix_sender/zabbix_sender \
616 - src/zabbix_get/zabbix_get
617 - fowners zabbix:zabbix \
618 - /etc/zabbix/zabbix_agent.conf \
619 - /etc/zabbix/zabbix_agentd.conf
620 - fperms 0640 \
621 - /etc/zabbix/zabbix_agent.conf \
622 - /etc/zabbix/zabbix_agentd.conf
623 - systemd_dounit "${FILESDIR}/zabbix-agentd.service"
624 - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
625 - fi
626 -
627 - fowners zabbix:zabbix \
628 - /etc/zabbix \
629 - /var/lib/zabbix \
630 - /var/lib/zabbix/home \
631 - /var/lib/zabbix/scripts \
632 - /var/lib/zabbix/alertscripts \
633 - /var/lib/zabbix/externalscripts \
634 - /var/log/zabbix
635 - fperms 0750 \
636 - /etc/zabbix \
637 - /var/lib/zabbix \
638 - /var/lib/zabbix/home \
639 - /var/lib/zabbix/scripts \
640 - /var/lib/zabbix/alertscripts \
641 - /var/lib/zabbix/externalscripts \
642 - /var/log/zabbix
643 -
644 - dodoc README INSTALL NEWS ChangeLog \
645 - conf/zabbix_agent.conf \
646 - conf/zabbix_agentd.conf \
647 - conf/zabbix_proxy.conf \
648 - conf/zabbix_agentd/userparameter_examples.conf \
649 - conf/zabbix_agentd/userparameter_mysql.conf \
650 - conf/zabbix_server.conf
651 -
652 - if use frontend; then
653 - webapp_src_preinst
654 - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
655 - webapp_configfile \
656 - "${MY_HTDOCSDIR}"/include/db.inc.php \
657 - "${MY_HTDOCSDIR}"/include/config.inc.php
658 - webapp_src_install
659 - fi
660 -
661 - if use java; then
662 - dodir \
663 - /${ZABBIXJAVA_BASE} \
664 - /${ZABBIXJAVA_BASE}/bin \
665 - /${ZABBIXJAVA_BASE}/lib
666 - keepdir /${ZABBIXJAVA_BASE}
667 - exeinto /${ZABBIXJAVA_BASE}/bin
668 - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
669 - exeinto /${ZABBIXJAVA_BASE}/lib
670 - doexe \
671 - src/zabbix_java/lib/logback-classic-0.9.27.jar \
672 - src/zabbix_java/lib/logback-console.xml \
673 - src/zabbix_java/lib/logback-core-0.9.27.jar \
674 - src/zabbix_java/lib/logback.xml \
675 - src/zabbix_java/lib/android-json-4.3_r3.1.jar \
676 - src/zabbix_java/lib/slf4j-api-1.6.1.jar
677 - exeinto /${ZABBIXJAVA_BASE}/
678 - doexe \
679 - src/zabbix_java/settings.sh \
680 - src/zabbix_java/startup.sh \
681 - src/zabbix_java/shutdown.sh
682 - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
683 - fi
684 -}
685 -
686 -pkg_postinst() {
687 - if use server || use proxy ; then
688 - elog
689 - elog "You may need to configure your database for Zabbix,"
690 - elog "if you have not already done so. "
691 - elog
692 -
693 - zabbix_homedir=$(egethome zabbix)
694 - if [ -n "${zabbix_homedir}" ] && \
695 - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
696 - ewarn
697 - ewarn "The user 'zabbix' should have his homedir changed"
698 - ewarn "to /var/lib/zabbix/home if you want to use"
699 - ewarn "custom alert scripts."
700 - ewarn
701 - ewarn "A real homedir might be needed for configfiles"
702 - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
703 - ewarn "using sendxmpp for Jabber alerts)."
704 - ewarn
705 - ewarn "To change the homedir use:"
706 - ewarn " usermod -d /var/lib/zabbix/home zabbix"
707 - ewarn
708 - fi
709 - fi
710 -
711 - if use server; then
712 - elog
713 - elog "For distributed monitoring you have to run:"
714 - elog
715 - elog "zabbix_server -n <nodeid>"
716 - elog
717 - elog "This will convert database data for use with Node ID"
718 - elog "and also adds a local node."
719 - elog
720 - fi
721 -
722 - elog "--"
723 - elog
724 - elog "You may need to add these lines to /etc/services:"
725 - elog
726 - elog "zabbix-agent 10050/tcp Zabbix Agent"
727 - elog "zabbix-agent 10050/udp Zabbix Agent"
728 - elog "zabbix-trapper 10051/tcp Zabbix Trapper"
729 - elog "zabbix-trapper 10051/udp Zabbix Trapper"
730 - elog
731 -
732 - if use server || use proxy ; then
733 - # check for fping
734 - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
735 - case "${fping_perms}" in
736 - 4[157][157][157])
737 - ;;
738 - *)
739 - ewarn
740 - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
741 - ewarn "you have to make /usr/sbin/fping setuid root and executable"
742 - ewarn "by everyone. Run the following command to fix it:"
743 - ewarn
744 - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
745 - ewarn
746 - ewarn "Please be aware that this might impose a security risk,"
747 - ewarn "depending on the code quality of fping."
748 - ewarn
749 - ;;
750 - esac
751 - fi
752 -}
753
754 diff --git a/net-analyzer/zabbix/zabbix-3.0.26.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
755 similarity index 99%
756 rename from net-analyzer/zabbix/zabbix-3.0.26.ebuild
757 rename to net-analyzer/zabbix/zabbix-3.0.28.ebuild
758 index 4b96b6154b1..44d389d4f4e 100644
759 --- a/net-analyzer/zabbix/zabbix-3.0.26.ebuild
760 +++ b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
761 @@ -71,7 +71,7 @@ DEPEND="${COMMON_DEPEND}
762 postgres? ( dev-db/postgresql:*[static-libs] )
763 libxml2? ( dev-libs/libxml2[static-libs] )
764 curl? ( net-misc/curl[static-libs] )
765 - ssh? ( net-libs/libssh2[static-libs] )
766 + ssh? ( net-libs/libssh2 )
767 odbc? ( dev-db/unixODBC[static-libs] )
768 )
769 virtual/pkgconfig"
770
771 diff --git a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
772 deleted file mode 100644
773 index 39902958a7e..00000000000
774 --- a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
775 +++ /dev/null
776 @@ -1,328 +0,0 @@
777 -# Copyright 1999-2019 Gentoo Authors
778 -# Distributed under the terms of the GNU General Public License v2
779 -
780 -EAPI="6"
781 -
782 -# needed to make webapp-config dep optional
783 -WEBAPP_OPTIONAL="yes"
784 -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
785 -
786 -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
787 -HOMEPAGE="https://www.zabbix.com/"
788 -MY_P=${P/_/}
789 -MY_PV=${PV/_/}
790 -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
791 -LICENSE="GPL-2"
792 -SLOT="0"
793 -WEBAPP_MANUAL_SLOT="yes"
794 -KEYWORDS="~amd64 ~x86"
795 -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
796 -REQUIRED_USE="|| ( agent frontend proxy server )
797 - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
798 - server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
799 - static? ( !oracle !snmp )"
800 -
801 -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
802 - ldap? (
803 - net-nds/openldap
804 - =dev-libs/cyrus-sasl-2*
805 - net-libs/gnutls
806 - )
807 - mysql? ( >=virtual/mysql-5.0.3 )
808 - sqlite? ( >=dev-db/sqlite-3.3.5 )
809 - postgres? ( dev-db/postgresql:* )
810 - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
811 - xmpp? ( dev-libs/iksemel )
812 - libxml2? ( dev-libs/libxml2 )
813 - curl? ( net-misc/curl )
814 - openipmi? ( sys-libs/openipmi )
815 - ssh? ( net-libs/libssh2 )
816 - java? ( virtual/jdk:* )
817 - odbc? ( dev-db/unixODBC )
818 - ssl? ( dev-libs/openssl:=[-bindist] )"
819 -
820 -RDEPEND="${COMMON_DEPEND}
821 - proxy? ( net-analyzer/fping[suid] )
822 - server? ( net-analyzer/fping[suid]
823 - app-admin/webapp-config )
824 - java? (
825 - >=virtual/jre-1.4
826 - dev-java/slf4j-api
827 - )
828 - frontend? (
829 - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
830 - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
831 - mysql? ( dev-lang/php[mysqli] )
832 - odbc? ( dev-lang/php[odbc] )
833 - oracle? ( dev-lang/php[oci8-instant-client] )
834 - postgres? ( dev-lang/php[postgres] )
835 - sqlite? ( dev-lang/php[sqlite] )
836 - media-libs/gd[png]
837 - app-admin/webapp-config )"
838 -DEPEND="${COMMON_DEPEND}
839 - static? (
840 - ldap? (
841 - net-nds/openldap[static-libs]
842 - =dev-libs/cyrus-sasl-2*[static-libs]
843 - net-libs/gnutls[static-libs]
844 - )
845 - mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
846 - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
847 - postgres? ( dev-db/postgresql:*[static-libs] )
848 - libxml2? ( dev-libs/libxml2[static-libs] )
849 - curl? ( net-misc/curl[static-libs] )
850 - ssh? ( net-libs/libssh2[static-libs] )
851 - odbc? ( dev-db/unixODBC[static-libs] )
852 - )
853 - virtual/pkgconfig"
854 -
855 -S=${WORKDIR}/${MY_P}
856 -
857 -ZABBIXJAVA_BASE="opt/zabbix_java"
858 -
859 -pkg_setup() {
860 - if use oracle; then
861 - if [ -z "${ORACLE_HOME}" ]; then
862 - eerror
863 - eerror "The environment variable ORACLE_HOME must be set"
864 - eerror "and point to the correct location."
865 - eerror "It looks like you don't have Oracle installed."
866 - eerror
867 - die "Environment variable ORACLE_HOME is not set"
868 - fi
869 - if has_version 'dev-db/oracle-instantclient-basic'; then
870 - ewarn
871 - ewarn "Please ensure you have a full install of the Oracle client."
872 - ewarn "dev-db/oracle-instantclient* is NOT sufficient."
873 - ewarn
874 - fi
875 - fi
876 -
877 - if use frontend; then
878 - webapp_pkg_setup
879 - fi
880 -
881 - enewgroup zabbix
882 - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
883 -}
884 -
885 -java_prepare() {
886 - cd "${S}/src/zabbix_java/lib"
887 - rm -v *.jar || die
888 -
889 - java-pkg_jar-from slf4j-api
890 -}
891 -
892 -src_prepare() {
893 - default
894 -}
895 -
896 -src_configure() {
897 - econf \
898 - $(use_enable server) \
899 - $(use_enable proxy) \
900 - $(use_enable agent) \
901 - $(use_enable ipv6) \
902 - $(use_enable static) \
903 - $(use_enable java) \
904 - $(use_with ldap) \
905 - $(use_with snmp net-snmp) \
906 - $(use_with mysql) \
907 - $(use_with postgres postgresql) \
908 - $(use_with oracle) \
909 - $(use_with sqlite sqlite3) \
910 - $(use_with xmpp jabber) \
911 - $(use_with curl libcurl) \
912 - $(use_with openipmi openipmi) \
913 - $(use_with ssh ssh2) \
914 - $(use_with libxml2) \
915 - $(use_with odbc unixodbc) \
916 - $(use_with ssl openssl) \
917 - || die "econf failed"
918 -}
919 -
920 -src_compile() {
921 - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
922 - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
923 - fi
924 -}
925 -
926 -src_install() {
927 - dodir \
928 - /etc/zabbix \
929 - /var/lib/zabbix \
930 - /var/lib/zabbix/home \
931 - /var/lib/zabbix/scripts \
932 - /var/lib/zabbix/alertscripts \
933 - /var/lib/zabbix/externalscripts \
934 - /var/log/zabbix
935 -
936 - keepdir \
937 - /etc/zabbix \
938 - /var/lib/zabbix \
939 - /var/lib/zabbix/home \
940 - /var/lib/zabbix/scripts \
941 - /var/lib/zabbix/alertscripts \
942 - /var/lib/zabbix/externalscripts \
943 - /var/log/zabbix
944 -
945 - if use server; then
946 - insinto /etc/zabbix
947 - doins "${FILESDIR}/3.0"/zabbix_server.conf
948 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
949 - dosbin src/zabbix_server/zabbix_server
950 - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
951 - fperms 0640 /etc/zabbix/zabbix_server.conf
952 - dodir /usr/share/zabbix
953 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
954 - systemd_dounit "${FILESDIR}/zabbix-server.service"
955 - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
956 - fi
957 -
958 - if use proxy; then
959 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
960 - dosbin src/zabbix_proxy/zabbix_proxy
961 - insinto /etc/zabbix
962 - doins "${FILESDIR}/3.0"/zabbix_proxy.conf
963 - dodir /usr/share/zabbix
964 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
965 - systemd_dounit "${FILESDIR}/zabbix-proxy.service"
966 - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
967 - fi
968 -
969 - if use agent; then
970 - insinto /etc/zabbix
971 - doins "${FILESDIR}/3.0"/zabbix_agentd.conf
972 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
973 - dosbin src/zabbix_agent/zabbix_agentd
974 - dobin \
975 - src/zabbix_sender/zabbix_sender \
976 - src/zabbix_get/zabbix_get
977 - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
978 - fperms 0640 /etc/zabbix/zabbix_agentd.conf
979 - systemd_dounit "${FILESDIR}/zabbix-agentd.service"
980 - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
981 - fi
982 -
983 - fowners zabbix:zabbix \
984 - /etc/zabbix \
985 - /var/lib/zabbix \
986 - /var/lib/zabbix/home \
987 - /var/lib/zabbix/scripts \
988 - /var/lib/zabbix/alertscripts \
989 - /var/lib/zabbix/externalscripts \
990 - /var/log/zabbix
991 - fperms 0750 \
992 - /etc/zabbix \
993 - /var/lib/zabbix \
994 - /var/lib/zabbix/home \
995 - /var/lib/zabbix/scripts \
996 - /var/lib/zabbix/alertscripts \
997 - /var/lib/zabbix/externalscripts \
998 - /var/log/zabbix
999 -
1000 - dodoc README INSTALL NEWS ChangeLog \
1001 - conf/zabbix_agentd.conf \
1002 - conf/zabbix_proxy.conf \
1003 - conf/zabbix_agentd/userparameter_examples.conf \
1004 - conf/zabbix_agentd/userparameter_mysql.conf \
1005 - conf/zabbix_server.conf
1006 -
1007 - if use frontend; then
1008 - webapp_src_preinst
1009 - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
1010 - webapp_configfile \
1011 - "${MY_HTDOCSDIR}"/include/db.inc.php \
1012 - "${MY_HTDOCSDIR}"/include/config.inc.php
1013 - webapp_src_install
1014 - fi
1015 -
1016 - if use java; then
1017 - dodir \
1018 - /${ZABBIXJAVA_BASE} \
1019 - /${ZABBIXJAVA_BASE}/bin \
1020 - /${ZABBIXJAVA_BASE}/lib
1021 - keepdir /${ZABBIXJAVA_BASE}
1022 - exeinto /${ZABBIXJAVA_BASE}/bin
1023 - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
1024 - exeinto /${ZABBIXJAVA_BASE}/lib
1025 - doexe \
1026 - src/zabbix_java/lib/logback-classic-0.9.27.jar \
1027 - src/zabbix_java/lib/logback-console.xml \
1028 - src/zabbix_java/lib/logback-core-0.9.27.jar \
1029 - src/zabbix_java/lib/logback.xml \
1030 - src/zabbix_java/lib/android-json-4.3_r3.1.jar \
1031 - src/zabbix_java/lib/slf4j-api-1.6.1.jar
1032 - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
1033 - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
1034 - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
1035 - fi
1036 -}
1037 -
1038 -pkg_postinst() {
1039 - if use server || use proxy ; then
1040 - elog
1041 - elog "You may need to configure your database for Zabbix,"
1042 - elog "if you have not already done so. "
1043 - elog
1044 -
1045 - zabbix_homedir=$(egethome zabbix)
1046 - if [ -n "${zabbix_homedir}" ] && \
1047 - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
1048 - ewarn
1049 - ewarn "The user 'zabbix' should have his homedir changed"
1050 - ewarn "to /var/lib/zabbix/home if you want to use"
1051 - ewarn "custom alert scripts."
1052 - ewarn
1053 - ewarn "A real homedir might be needed for configfiles"
1054 - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
1055 - ewarn "using sendxmpp for Jabber alerts)."
1056 - ewarn
1057 - ewarn "To change the homedir use:"
1058 - ewarn " usermod -d /var/lib/zabbix/home zabbix"
1059 - ewarn
1060 - fi
1061 - fi
1062 -
1063 - if use server; then
1064 - elog
1065 - elog "For distributed monitoring you have to run:"
1066 - elog
1067 - elog "zabbix_server -n <nodeid>"
1068 - elog
1069 - elog "This will convert database data for use with Node ID"
1070 - elog "and also adds a local node."
1071 - elog
1072 - fi
1073 -
1074 - elog "--"
1075 - elog
1076 - elog "You may need to add these lines to /etc/services:"
1077 - elog
1078 - elog "zabbix-agent 10050/tcp Zabbix Agent"
1079 - elog "zabbix-agent 10050/udp Zabbix Agent"
1080 - elog "zabbix-trapper 10051/tcp Zabbix Trapper"
1081 - elog "zabbix-trapper 10051/udp Zabbix Trapper"
1082 - elog
1083 -
1084 - if use server || use proxy ; then
1085 - # check for fping
1086 - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
1087 - case "${fping_perms}" in
1088 - 4[157][157][157])
1089 - ;;
1090 - *)
1091 - ewarn
1092 - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
1093 - ewarn "you have to make /usr/sbin/fping setuid root and executable"
1094 - ewarn "by everyone. Run the following command to fix it:"
1095 - ewarn
1096 - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
1097 - ewarn
1098 - ewarn "Please be aware that this might impose a security risk,"
1099 - ewarn "depending on the code quality of fping."
1100 - ewarn
1101 - ;;
1102 - esac
1103 - fi
1104 -}
1105
1106 diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
1107 index dd57544e3c4..7a28b152327 100644
1108 --- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild
1109 +++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
1110 @@ -1,4 +1,4 @@
1111 -# Copyright 1999-2018 Gentoo Authors
1112 +# Copyright 1999-2019 Gentoo Authors
1113 # Distributed under the terms of the GNU General Public License v2
1114
1115 EAPI="6"
1116 @@ -72,7 +72,7 @@ DEPEND="${COMMON_DEPEND}
1117 postgres? ( dev-db/postgresql:*[static-libs] )
1118 libxml2? ( dev-libs/libxml2[static-libs] )
1119 curl? ( net-misc/curl[static-libs] )
1120 - ssh? ( net-libs/libssh2[static-libs] )
1121 + ssh? ( net-libs/libssh2 )
1122 odbc? ( dev-db/unixODBC[static-libs] )
1123 )
1124 virtual/pkgconfig"
1125
1126 diff --git a/net-analyzer/zabbix/zabbix-4.0.7.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
1127 similarity index 99%
1128 rename from net-analyzer/zabbix/zabbix-4.0.7.ebuild
1129 rename to net-analyzer/zabbix/zabbix-4.0.13.ebuild
1130 index cab89e4b3b1..3aea381b56f 100644
1131 --- a/net-analyzer/zabbix/zabbix-4.0.7.ebuild
1132 +++ b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
1133 @@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
1134 postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
1135 libxml2? ( dev-libs/libxml2[static-libs] )
1136 curl? ( net-misc/curl[static-libs] )
1137 - ssh? ( net-libs/libssh2[static-libs] )
1138 + ssh? ( net-libs/libssh2 )
1139 odbc? ( dev-db/unixODBC[static-libs] )
1140 )
1141 virtual/pkgconfig"
1142
1143 diff --git a/net-analyzer/zabbix/zabbix-4.0.6.ebuild b/net-analyzer/zabbix/zabbix-4.0.6.ebuild
1144 deleted file mode 100644
1145 index cab89e4b3b1..00000000000
1146 --- a/net-analyzer/zabbix/zabbix-4.0.6.ebuild
1147 +++ /dev/null
1148 @@ -1,333 +0,0 @@
1149 -# Copyright 1999-2019 Gentoo Authors
1150 -# Distributed under the terms of the GNU General Public License v2
1151 -
1152 -EAPI="6"
1153 -
1154 -# needed to make webapp-config dep optional
1155 -WEBAPP_OPTIONAL="yes"
1156 -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
1157 -
1158 -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
1159 -HOMEPAGE="https://www.zabbix.com/"
1160 -MY_P=${P/_/}
1161 -MY_PV=${PV/_/}
1162 -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
1163 -LICENSE="GPL-2"
1164 -SLOT="0"
1165 -WEBAPP_MANUAL_SLOT="yes"
1166 -KEYWORDS="~amd64 ~x86"
1167 -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
1168 -REQUIRED_USE="|| ( agent frontend proxy server )
1169 - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
1170 - server? ( ^^ ( mysql oracle postgres odbc ) )
1171 - static? ( !oracle !snmp )"
1172 -
1173 -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
1174 - ldap? (
1175 - net-nds/openldap
1176 - =dev-libs/cyrus-sasl-2*
1177 - net-libs/gnutls
1178 - )
1179 - mysql? ( >=virtual/mysql-5.0.3 )
1180 - sqlite? ( >=dev-db/sqlite-3.3.5 )
1181 - postgres? ( >=dev-db/postgresql-8.1:* )
1182 - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
1183 - xmpp? ( dev-libs/iksemel )
1184 - libxml2? ( dev-libs/libxml2 )
1185 - curl? ( net-misc/curl )
1186 - openipmi? ( sys-libs/openipmi )
1187 - ssh? ( net-libs/libssh2 )
1188 - java? ( virtual/jdk:* )
1189 - odbc? ( dev-db/unixODBC )
1190 - server? ( sys-libs/zlib )
1191 - proxy? ( sys-libs/zlib )
1192 - ssl? ( dev-libs/openssl:=[-bindist] )"
1193 -
1194 -RDEPEND="${COMMON_DEPEND}
1195 - proxy? ( net-analyzer/fping[suid] )
1196 - server? ( net-analyzer/fping[suid]
1197 - app-admin/webapp-config
1198 - dev-libs/libpcre
1199 - dev-libs/libevent )
1200 - java? (
1201 - >=virtual/jre-1.4
1202 - dev-java/slf4j-api
1203 - )
1204 - frontend? (
1205 - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
1206 - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
1207 - mysql? ( dev-lang/php[mysqli] )
1208 - odbc? ( dev-lang/php[odbc] )
1209 - oracle? ( dev-lang/php[oci8-instant-client] )
1210 - postgres? ( dev-lang/php[postgres] )
1211 - sqlite? ( dev-lang/php[sqlite] )
1212 - media-libs/gd[png]
1213 - app-admin/webapp-config )"
1214 -DEPEND="${COMMON_DEPEND}
1215 - static? (
1216 - ldap? (
1217 - net-nds/openldap[static-libs]
1218 - =dev-libs/cyrus-sasl-2*[static-libs]
1219 - net-libs/gnutls[static-libs]
1220 - )
1221 - mysql? ( >=virtual/mysql-5.0.3[static-libs] )
1222 - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
1223 - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
1224 - libxml2? ( dev-libs/libxml2[static-libs] )
1225 - curl? ( net-misc/curl[static-libs] )
1226 - ssh? ( net-libs/libssh2[static-libs] )
1227 - odbc? ( dev-db/unixODBC[static-libs] )
1228 - )
1229 - virtual/pkgconfig"
1230 -
1231 -S=${WORKDIR}/${MY_P}
1232 -
1233 -ZABBIXJAVA_BASE="opt/zabbix_java"
1234 -
1235 -pkg_setup() {
1236 - if use oracle; then
1237 - if [ -z "${ORACLE_HOME}" ]; then
1238 - eerror
1239 - eerror "The environment variable ORACLE_HOME must be set"
1240 - eerror "and point to the correct location."
1241 - eerror "It looks like you don't have Oracle installed."
1242 - eerror
1243 - die "Environment variable ORACLE_HOME is not set"
1244 - fi
1245 - if has_version 'dev-db/oracle-instantclient-basic'; then
1246 - ewarn
1247 - ewarn "Please ensure you have a full install of the Oracle client."
1248 - ewarn "dev-db/oracle-instantclient* is NOT sufficient."
1249 - ewarn
1250 - fi
1251 - fi
1252 -
1253 - if use frontend; then
1254 - webapp_pkg_setup
1255 - fi
1256 -
1257 - enewgroup zabbix
1258 - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
1259 -}
1260 -
1261 -java_prepare() {
1262 - cd "${S}/src/zabbix_java/lib"
1263 - rm -v *.jar || die
1264 -
1265 - java-pkg_jar-from slf4j-api
1266 -}
1267 -
1268 -src_prepare() {
1269 - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
1270 - eapply_user
1271 -}
1272 -
1273 -src_configure() {
1274 - econf \
1275 - $(use_enable server) \
1276 - $(use_enable proxy) \
1277 - $(use_enable agent) \
1278 - $(use_enable ipv6) \
1279 - $(use_enable static) \
1280 - $(use_enable java) \
1281 - $(use_with ldap) \
1282 - $(use_with snmp net-snmp) \
1283 - $(use_with mysql) \
1284 - $(use_with postgres postgresql) \
1285 - $(use_with oracle) \
1286 - $(use_with sqlite sqlite3) \
1287 - $(use_with xmpp jabber) \
1288 - $(use_with curl libcurl) \
1289 - $(use_with openipmi openipmi) \
1290 - $(use_with ssh ssh2) \
1291 - $(use_with libxml2) \
1292 - $(use_with odbc unixodbc) \
1293 - $(use_with ssl openssl) \
1294 - || die "econf failed"
1295 -}
1296 -
1297 -src_compile() {
1298 - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
1299 - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
1300 - fi
1301 -}
1302 -
1303 -src_install() {
1304 - dodir \
1305 - /etc/zabbix \
1306 - /var/lib/zabbix \
1307 - /var/lib/zabbix/home \
1308 - /var/lib/zabbix/scripts \
1309 - /var/lib/zabbix/alertscripts \
1310 - /var/lib/zabbix/externalscripts \
1311 - /var/log/zabbix
1312 -
1313 - keepdir \
1314 - /etc/zabbix \
1315 - /var/lib/zabbix \
1316 - /var/lib/zabbix/home \
1317 - /var/lib/zabbix/scripts \
1318 - /var/lib/zabbix/alertscripts \
1319 - /var/lib/zabbix/externalscripts \
1320 - /var/log/zabbix
1321 -
1322 - if use server; then
1323 - insinto /etc/zabbix
1324 - doins "${FILESDIR}/3.0"/zabbix_server.conf
1325 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
1326 - dosbin src/zabbix_server/zabbix_server
1327 - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
1328 - fperms 0640 /etc/zabbix/zabbix_server.conf
1329 - dodir /usr/share/zabbix
1330 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
1331 - systemd_dounit "${FILESDIR}/zabbix-server.service"
1332 - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
1333 - fi
1334 -
1335 - if use proxy; then
1336 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
1337 - dosbin src/zabbix_proxy/zabbix_proxy
1338 - insinto /etc/zabbix
1339 - doins "${FILESDIR}/3.0"/zabbix_proxy.conf
1340 - dodir /usr/share/zabbix
1341 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
1342 - systemd_dounit "${FILESDIR}/zabbix-proxy.service"
1343 - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
1344 - fi
1345 -
1346 - if use agent; then
1347 - insinto /etc/zabbix
1348 - doins "${FILESDIR}/3.0"/zabbix_agentd.conf
1349 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
1350 - dosbin src/zabbix_agent/zabbix_agentd
1351 - dobin \
1352 - src/zabbix_sender/zabbix_sender \
1353 - src/zabbix_get/zabbix_get
1354 - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
1355 - fperms 0640 /etc/zabbix/zabbix_agentd.conf
1356 - systemd_dounit "${FILESDIR}/zabbix-agentd.service"
1357 - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
1358 - fi
1359 -
1360 - fowners zabbix:zabbix \
1361 - /etc/zabbix \
1362 - /var/lib/zabbix \
1363 - /var/lib/zabbix/home \
1364 - /var/lib/zabbix/scripts \
1365 - /var/lib/zabbix/alertscripts \
1366 - /var/lib/zabbix/externalscripts \
1367 - /var/log/zabbix
1368 - fperms 0750 \
1369 - /etc/zabbix \
1370 - /var/lib/zabbix \
1371 - /var/lib/zabbix/home \
1372 - /var/lib/zabbix/scripts \
1373 - /var/lib/zabbix/alertscripts \
1374 - /var/lib/zabbix/externalscripts \
1375 - /var/log/zabbix
1376 -
1377 - dodoc README INSTALL NEWS ChangeLog \
1378 - conf/zabbix_agentd.conf \
1379 - conf/zabbix_proxy.conf \
1380 - conf/zabbix_agentd/userparameter_examples.conf \
1381 - conf/zabbix_agentd/userparameter_mysql.conf \
1382 - conf/zabbix_server.conf
1383 -
1384 - if use frontend; then
1385 - webapp_src_preinst
1386 - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
1387 - webapp_configfile \
1388 - "${MY_HTDOCSDIR}"/include/db.inc.php \
1389 - "${MY_HTDOCSDIR}"/include/config.inc.php
1390 - webapp_src_install
1391 - fi
1392 -
1393 - if use java; then
1394 - dodir \
1395 - /${ZABBIXJAVA_BASE} \
1396 - /${ZABBIXJAVA_BASE}/bin \
1397 - /${ZABBIXJAVA_BASE}/lib
1398 - keepdir /${ZABBIXJAVA_BASE}
1399 - exeinto /${ZABBIXJAVA_BASE}/bin
1400 - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
1401 - exeinto /${ZABBIXJAVA_BASE}/lib
1402 - doexe \
1403 - src/zabbix_java/lib/logback-classic-0.9.27.jar \
1404 - src/zabbix_java/lib/logback-console.xml \
1405 - src/zabbix_java/lib/logback-core-0.9.27.jar \
1406 - src/zabbix_java/lib/logback.xml \
1407 - src/zabbix_java/lib/android-json-4.3_r3.1.jar \
1408 - src/zabbix_java/lib/slf4j-api-1.6.1.jar
1409 - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
1410 - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
1411 - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
1412 - fi
1413 -}
1414 -
1415 -pkg_postinst() {
1416 - if use server || use proxy ; then
1417 - elog
1418 - elog "You may need to configure your database for Zabbix,"
1419 - elog "if you have not already done so. "
1420 - elog
1421 -
1422 - zabbix_homedir=$(egethome zabbix)
1423 - if [ -n "${zabbix_homedir}" ] && \
1424 - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
1425 - ewarn
1426 - ewarn "The user 'zabbix' should have his homedir changed"
1427 - ewarn "to /var/lib/zabbix/home if you want to use"
1428 - ewarn "custom alert scripts."
1429 - ewarn
1430 - ewarn "A real homedir might be needed for configfiles"
1431 - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
1432 - ewarn "using sendxmpp for Jabber alerts)."
1433 - ewarn
1434 - ewarn "To change the homedir use:"
1435 - ewarn " usermod -d /var/lib/zabbix/home zabbix"
1436 - ewarn
1437 - fi
1438 - fi
1439 -
1440 - if use server; then
1441 - elog
1442 - elog "For distributed monitoring you have to run:"
1443 - elog
1444 - elog "zabbix_server -n <nodeid>"
1445 - elog
1446 - elog "This will convert database data for use with Node ID"
1447 - elog "and also adds a local node."
1448 - elog
1449 - fi
1450 -
1451 - elog "--"
1452 - elog
1453 - elog "You may need to add these lines to /etc/services:"
1454 - elog
1455 - elog "zabbix-agent 10050/tcp Zabbix Agent"
1456 - elog "zabbix-agent 10050/udp Zabbix Agent"
1457 - elog "zabbix-trapper 10051/tcp Zabbix Trapper"
1458 - elog "zabbix-trapper 10051/udp Zabbix Trapper"
1459 - elog
1460 -
1461 - if use server || use proxy ; then
1462 - # check for fping
1463 - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
1464 - case "${fping_perms}" in
1465 - 4[157][157][157])
1466 - ;;
1467 - *)
1468 - ewarn
1469 - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
1470 - ewarn "you have to make /usr/sbin/fping setuid root and executable"
1471 - ewarn "by everyone. Run the following command to fix it:"
1472 - ewarn
1473 - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
1474 - ewarn
1475 - ewarn "Please be aware that this might impose a security risk,"
1476 - ewarn "depending on the code quality of fping."
1477 - ewarn
1478 - ;;
1479 - esac
1480 - fi
1481 -}
1482
1483 diff --git a/net-analyzer/zabbix/zabbix-4.2.3.ebuild b/net-analyzer/zabbix/zabbix-4.2.3.ebuild
1484 deleted file mode 100644
1485 index cab89e4b3b1..00000000000
1486 --- a/net-analyzer/zabbix/zabbix-4.2.3.ebuild
1487 +++ /dev/null
1488 @@ -1,333 +0,0 @@
1489 -# Copyright 1999-2019 Gentoo Authors
1490 -# Distributed under the terms of the GNU General Public License v2
1491 -
1492 -EAPI="6"
1493 -
1494 -# needed to make webapp-config dep optional
1495 -WEBAPP_OPTIONAL="yes"
1496 -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
1497 -
1498 -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
1499 -HOMEPAGE="https://www.zabbix.com/"
1500 -MY_P=${P/_/}
1501 -MY_PV=${PV/_/}
1502 -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
1503 -LICENSE="GPL-2"
1504 -SLOT="0"
1505 -WEBAPP_MANUAL_SLOT="yes"
1506 -KEYWORDS="~amd64 ~x86"
1507 -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
1508 -REQUIRED_USE="|| ( agent frontend proxy server )
1509 - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
1510 - server? ( ^^ ( mysql oracle postgres odbc ) )
1511 - static? ( !oracle !snmp )"
1512 -
1513 -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
1514 - ldap? (
1515 - net-nds/openldap
1516 - =dev-libs/cyrus-sasl-2*
1517 - net-libs/gnutls
1518 - )
1519 - mysql? ( >=virtual/mysql-5.0.3 )
1520 - sqlite? ( >=dev-db/sqlite-3.3.5 )
1521 - postgres? ( >=dev-db/postgresql-8.1:* )
1522 - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
1523 - xmpp? ( dev-libs/iksemel )
1524 - libxml2? ( dev-libs/libxml2 )
1525 - curl? ( net-misc/curl )
1526 - openipmi? ( sys-libs/openipmi )
1527 - ssh? ( net-libs/libssh2 )
1528 - java? ( virtual/jdk:* )
1529 - odbc? ( dev-db/unixODBC )
1530 - server? ( sys-libs/zlib )
1531 - proxy? ( sys-libs/zlib )
1532 - ssl? ( dev-libs/openssl:=[-bindist] )"
1533 -
1534 -RDEPEND="${COMMON_DEPEND}
1535 - proxy? ( net-analyzer/fping[suid] )
1536 - server? ( net-analyzer/fping[suid]
1537 - app-admin/webapp-config
1538 - dev-libs/libpcre
1539 - dev-libs/libevent )
1540 - java? (
1541 - >=virtual/jre-1.4
1542 - dev-java/slf4j-api
1543 - )
1544 - frontend? (
1545 - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
1546 - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
1547 - mysql? ( dev-lang/php[mysqli] )
1548 - odbc? ( dev-lang/php[odbc] )
1549 - oracle? ( dev-lang/php[oci8-instant-client] )
1550 - postgres? ( dev-lang/php[postgres] )
1551 - sqlite? ( dev-lang/php[sqlite] )
1552 - media-libs/gd[png]
1553 - app-admin/webapp-config )"
1554 -DEPEND="${COMMON_DEPEND}
1555 - static? (
1556 - ldap? (
1557 - net-nds/openldap[static-libs]
1558 - =dev-libs/cyrus-sasl-2*[static-libs]
1559 - net-libs/gnutls[static-libs]
1560 - )
1561 - mysql? ( >=virtual/mysql-5.0.3[static-libs] )
1562 - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
1563 - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
1564 - libxml2? ( dev-libs/libxml2[static-libs] )
1565 - curl? ( net-misc/curl[static-libs] )
1566 - ssh? ( net-libs/libssh2[static-libs] )
1567 - odbc? ( dev-db/unixODBC[static-libs] )
1568 - )
1569 - virtual/pkgconfig"
1570 -
1571 -S=${WORKDIR}/${MY_P}
1572 -
1573 -ZABBIXJAVA_BASE="opt/zabbix_java"
1574 -
1575 -pkg_setup() {
1576 - if use oracle; then
1577 - if [ -z "${ORACLE_HOME}" ]; then
1578 - eerror
1579 - eerror "The environment variable ORACLE_HOME must be set"
1580 - eerror "and point to the correct location."
1581 - eerror "It looks like you don't have Oracle installed."
1582 - eerror
1583 - die "Environment variable ORACLE_HOME is not set"
1584 - fi
1585 - if has_version 'dev-db/oracle-instantclient-basic'; then
1586 - ewarn
1587 - ewarn "Please ensure you have a full install of the Oracle client."
1588 - ewarn "dev-db/oracle-instantclient* is NOT sufficient."
1589 - ewarn
1590 - fi
1591 - fi
1592 -
1593 - if use frontend; then
1594 - webapp_pkg_setup
1595 - fi
1596 -
1597 - enewgroup zabbix
1598 - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
1599 -}
1600 -
1601 -java_prepare() {
1602 - cd "${S}/src/zabbix_java/lib"
1603 - rm -v *.jar || die
1604 -
1605 - java-pkg_jar-from slf4j-api
1606 -}
1607 -
1608 -src_prepare() {
1609 - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
1610 - eapply_user
1611 -}
1612 -
1613 -src_configure() {
1614 - econf \
1615 - $(use_enable server) \
1616 - $(use_enable proxy) \
1617 - $(use_enable agent) \
1618 - $(use_enable ipv6) \
1619 - $(use_enable static) \
1620 - $(use_enable java) \
1621 - $(use_with ldap) \
1622 - $(use_with snmp net-snmp) \
1623 - $(use_with mysql) \
1624 - $(use_with postgres postgresql) \
1625 - $(use_with oracle) \
1626 - $(use_with sqlite sqlite3) \
1627 - $(use_with xmpp jabber) \
1628 - $(use_with curl libcurl) \
1629 - $(use_with openipmi openipmi) \
1630 - $(use_with ssh ssh2) \
1631 - $(use_with libxml2) \
1632 - $(use_with odbc unixodbc) \
1633 - $(use_with ssl openssl) \
1634 - || die "econf failed"
1635 -}
1636 -
1637 -src_compile() {
1638 - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
1639 - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
1640 - fi
1641 -}
1642 -
1643 -src_install() {
1644 - dodir \
1645 - /etc/zabbix \
1646 - /var/lib/zabbix \
1647 - /var/lib/zabbix/home \
1648 - /var/lib/zabbix/scripts \
1649 - /var/lib/zabbix/alertscripts \
1650 - /var/lib/zabbix/externalscripts \
1651 - /var/log/zabbix
1652 -
1653 - keepdir \
1654 - /etc/zabbix \
1655 - /var/lib/zabbix \
1656 - /var/lib/zabbix/home \
1657 - /var/lib/zabbix/scripts \
1658 - /var/lib/zabbix/alertscripts \
1659 - /var/lib/zabbix/externalscripts \
1660 - /var/log/zabbix
1661 -
1662 - if use server; then
1663 - insinto /etc/zabbix
1664 - doins "${FILESDIR}/3.0"/zabbix_server.conf
1665 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
1666 - dosbin src/zabbix_server/zabbix_server
1667 - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
1668 - fperms 0640 /etc/zabbix/zabbix_server.conf
1669 - dodir /usr/share/zabbix
1670 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
1671 - systemd_dounit "${FILESDIR}/zabbix-server.service"
1672 - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
1673 - fi
1674 -
1675 - if use proxy; then
1676 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
1677 - dosbin src/zabbix_proxy/zabbix_proxy
1678 - insinto /etc/zabbix
1679 - doins "${FILESDIR}/3.0"/zabbix_proxy.conf
1680 - dodir /usr/share/zabbix
1681 - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
1682 - systemd_dounit "${FILESDIR}/zabbix-proxy.service"
1683 - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
1684 - fi
1685 -
1686 - if use agent; then
1687 - insinto /etc/zabbix
1688 - doins "${FILESDIR}/3.0"/zabbix_agentd.conf
1689 - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
1690 - dosbin src/zabbix_agent/zabbix_agentd
1691 - dobin \
1692 - src/zabbix_sender/zabbix_sender \
1693 - src/zabbix_get/zabbix_get
1694 - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
1695 - fperms 0640 /etc/zabbix/zabbix_agentd.conf
1696 - systemd_dounit "${FILESDIR}/zabbix-agentd.service"
1697 - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
1698 - fi
1699 -
1700 - fowners zabbix:zabbix \
1701 - /etc/zabbix \
1702 - /var/lib/zabbix \
1703 - /var/lib/zabbix/home \
1704 - /var/lib/zabbix/scripts \
1705 - /var/lib/zabbix/alertscripts \
1706 - /var/lib/zabbix/externalscripts \
1707 - /var/log/zabbix
1708 - fperms 0750 \
1709 - /etc/zabbix \
1710 - /var/lib/zabbix \
1711 - /var/lib/zabbix/home \
1712 - /var/lib/zabbix/scripts \
1713 - /var/lib/zabbix/alertscripts \
1714 - /var/lib/zabbix/externalscripts \
1715 - /var/log/zabbix
1716 -
1717 - dodoc README INSTALL NEWS ChangeLog \
1718 - conf/zabbix_agentd.conf \
1719 - conf/zabbix_proxy.conf \
1720 - conf/zabbix_agentd/userparameter_examples.conf \
1721 - conf/zabbix_agentd/userparameter_mysql.conf \
1722 - conf/zabbix_server.conf
1723 -
1724 - if use frontend; then
1725 - webapp_src_preinst
1726 - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
1727 - webapp_configfile \
1728 - "${MY_HTDOCSDIR}"/include/db.inc.php \
1729 - "${MY_HTDOCSDIR}"/include/config.inc.php
1730 - webapp_src_install
1731 - fi
1732 -
1733 - if use java; then
1734 - dodir \
1735 - /${ZABBIXJAVA_BASE} \
1736 - /${ZABBIXJAVA_BASE}/bin \
1737 - /${ZABBIXJAVA_BASE}/lib
1738 - keepdir /${ZABBIXJAVA_BASE}
1739 - exeinto /${ZABBIXJAVA_BASE}/bin
1740 - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
1741 - exeinto /${ZABBIXJAVA_BASE}/lib
1742 - doexe \
1743 - src/zabbix_java/lib/logback-classic-0.9.27.jar \
1744 - src/zabbix_java/lib/logback-console.xml \
1745 - src/zabbix_java/lib/logback-core-0.9.27.jar \
1746 - src/zabbix_java/lib/logback.xml \
1747 - src/zabbix_java/lib/android-json-4.3_r3.1.jar \
1748 - src/zabbix_java/lib/slf4j-api-1.6.1.jar
1749 - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
1750 - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
1751 - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
1752 - fi
1753 -}
1754 -
1755 -pkg_postinst() {
1756 - if use server || use proxy ; then
1757 - elog
1758 - elog "You may need to configure your database for Zabbix,"
1759 - elog "if you have not already done so. "
1760 - elog
1761 -
1762 - zabbix_homedir=$(egethome zabbix)
1763 - if [ -n "${zabbix_homedir}" ] && \
1764 - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
1765 - ewarn
1766 - ewarn "The user 'zabbix' should have his homedir changed"
1767 - ewarn "to /var/lib/zabbix/home if you want to use"
1768 - ewarn "custom alert scripts."
1769 - ewarn
1770 - ewarn "A real homedir might be needed for configfiles"
1771 - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
1772 - ewarn "using sendxmpp for Jabber alerts)."
1773 - ewarn
1774 - ewarn "To change the homedir use:"
1775 - ewarn " usermod -d /var/lib/zabbix/home zabbix"
1776 - ewarn
1777 - fi
1778 - fi
1779 -
1780 - if use server; then
1781 - elog
1782 - elog "For distributed monitoring you have to run:"
1783 - elog
1784 - elog "zabbix_server -n <nodeid>"
1785 - elog
1786 - elog "This will convert database data for use with Node ID"
1787 - elog "and also adds a local node."
1788 - elog
1789 - fi
1790 -
1791 - elog "--"
1792 - elog
1793 - elog "You may need to add these lines to /etc/services:"
1794 - elog
1795 - elog "zabbix-agent 10050/tcp Zabbix Agent"
1796 - elog "zabbix-agent 10050/udp Zabbix Agent"
1797 - elog "zabbix-trapper 10051/tcp Zabbix Trapper"
1798 - elog "zabbix-trapper 10051/udp Zabbix Trapper"
1799 - elog
1800 -
1801 - if use server || use proxy ; then
1802 - # check for fping
1803 - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
1804 - case "${fping_perms}" in
1805 - 4[157][157][157])
1806 - ;;
1807 - *)
1808 - ewarn
1809 - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
1810 - ewarn "you have to make /usr/sbin/fping setuid root and executable"
1811 - ewarn "by everyone. Run the following command to fix it:"
1812 - ewarn
1813 - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
1814 - ewarn
1815 - ewarn "Please be aware that this might impose a security risk,"
1816 - ewarn "depending on the code quality of fping."
1817 - ewarn
1818 - ;;
1819 - esac
1820 - fi
1821 -}
1822
1823 diff --git a/net-analyzer/zabbix/zabbix-4.0.9.ebuild b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
1824 similarity index 99%
1825 rename from net-analyzer/zabbix/zabbix-4.0.9.ebuild
1826 rename to net-analyzer/zabbix/zabbix-4.2.7.ebuild
1827 index cab89e4b3b1..3aea381b56f 100644
1828 --- a/net-analyzer/zabbix/zabbix-4.0.9.ebuild
1829 +++ b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
1830 @@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
1831 postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
1832 libxml2? ( dev-libs/libxml2[static-libs] )
1833 curl? ( net-misc/curl[static-libs] )
1834 - ssh? ( net-libs/libssh2[static-libs] )
1835 + ssh? ( net-libs/libssh2 )
1836 odbc? ( dev-db/unixODBC[static-libs] )
1837 )
1838 virtual/pkgconfig"