1 |
mattm 12/06/29 14:24:47 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: zabbix-1.8.14.ebuild |
5 |
Log: |
6 |
Bump for Zabbix 1.8.14 - Bug fixes for legacy 1.8.x tree. |
7 |
|
8 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.102 net-analyzer/zabbix/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.102&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.102&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?r1=1.101&r2=1.102 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v |
20 |
retrieving revision 1.101 |
21 |
retrieving revision 1.102 |
22 |
diff -u -r1.101 -r1.102 |
23 |
--- ChangeLog 20 Jun 2012 20:22:22 -0000 1.101 |
24 |
+++ ChangeLog 29 Jun 2012 14:24:47 -0000 1.102 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-analyzer/zabbix |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.101 2012/06/20 20:22:22 mattm Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.102 2012/06/29 14:24:47 mattm Exp $ |
30 |
+ |
31 |
+*zabbix-1.8.14 (29 Jun 2012) |
32 |
+ |
33 |
+ 29 Jun 2012; Matthew Marlowe <mattm@g.o> +zabbix-1.8.14.ebuild: |
34 |
+ Bump for Zabbix 1.8.14 which seems to be just bug fixes for legacy 1.8.x tree |
35 |
|
36 |
20 Jun 2012; Matthew Marlowe <mattm@g.o> -zabbix-1.8.10-r1.ebuild, |
37 |
-zabbix-1.8.10-r2.ebuild, -zabbix-1.8.11.ebuild, -zabbix-1.8.11-r1.ebuild, |
38 |
|
39 |
|
40 |
|
41 |
1.1 net-analyzer/zabbix/zabbix-1.8.14.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.14.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.14.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: zabbix-1.8.14.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2012 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.14.ebuild,v 1.1 2012/06/29 14:24:47 mattm Exp $ |
51 |
|
52 |
EAPI="2" |
53 |
|
54 |
# needed to make webapp-config dep optional |
55 |
WEBAPP_OPTIONAL="yes" |
56 |
inherit flag-o-matic webapp depend.php autotools user |
57 |
|
58 |
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." |
59 |
HOMEPAGE="http://www.zabbix.com/" |
60 |
MY_P=${P/_/} |
61 |
SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" |
62 |
LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
WEBAPP_MANUAL_SLOT="yes" |
65 |
KEYWORDS="~amd64 ~x86" |
66 |
IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp +sqlite iodbc odbc static" |
67 |
|
68 |
COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
69 |
ldap? ( |
70 |
net-nds/openldap |
71 |
=dev-libs/cyrus-sasl-2* |
72 |
net-libs/gnutls |
73 |
) |
74 |
mysql? ( virtual/mysql ) |
75 |
sqlite? ( =dev-db/sqlite-3* ) |
76 |
postgres? ( dev-db/postgresql-base ) |
77 |
oracle? ( dev-db/oracle-instantclient-basic ) |
78 |
jabber? ( dev-libs/iksemel ) |
79 |
curl? ( net-misc/curl ) |
80 |
openipmi? ( sys-libs/openipmi ) |
81 |
ssh? ( net-libs/libssh2 ) |
82 |
odbc? ( |
83 |
iodbc? ( dev-db/libiodbc ) |
84 |
!iodbc? ( dev-db/unixODBC ) |
85 |
)" |
86 |
|
87 |
RDEPEND="${COMMON_DEPEND} |
88 |
proxy? ( <=net-analyzer/fping-2.9 ) |
89 |
server? ( <=net-analyzer/fping-2.9 |
90 |
app-admin/webapp-config ) |
91 |
frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] |
92 |
media-libs/gd[png] |
93 |
app-admin/webapp-config )" |
94 |
DEPEND="${COMMON_DEPEND} |
95 |
virtual/pkgconfig" |
96 |
|
97 |
use frontend && need_php_httpd |
98 |
|
99 |
src_prepare() { |
100 |
eautoreconf |
101 |
} |
102 |
|
103 |
pkg_setup() { |
104 |
if use server || use proxy ; then |
105 |
local dbnum dbtypes="mysql oracle postgres sqlite" dbtype |
106 |
declare -i dbnum=0 |
107 |
for dbtype in ${dbtypes}; do |
108 |
use ${dbtype} && let dbnum++ |
109 |
done |
110 |
if [ ${dbnum} -gt 1 ]; then |
111 |
eerror |
112 |
eerror "You can't use more than one database type in Zabbix." |
113 |
eerror "Select exactly one database type out of these: ${dbtypes}" |
114 |
eerror |
115 |
die "Multiple database types selected." |
116 |
elif [ ${dbnum} -lt 1 ]; then |
117 |
eerror |
118 |
eerror "Select exactly one database type out of these: ${dbtypes}" |
119 |
eerror |
120 |
die "No database type selected." |
121 |
fi |
122 |
if use oracle; then |
123 |
if [ -z "${ORACLE_HOME}" ]; then |
124 |
eerror |
125 |
eerror "The environment variable ORACLE_HOME must be set" |
126 |
eerror "and point to the correct location." |
127 |
eerror "It looks like you don't have Oracle installed." |
128 |
eerror |
129 |
die "Environment variable ORACLE_HOME is not set" |
130 |
fi |
131 |
if has_version 'dev-db/oracle-instantclient-basic'; then |
132 |
ewarn |
133 |
ewarn "Please ensure you have a full install of the Oracle client." |
134 |
ewarn "dev-db/oracle-instantclient* is NOT sufficient." |
135 |
ewarn |
136 |
fi |
137 |
fi |
138 |
fi |
139 |
|
140 |
if use frontend; then |
141 |
webapp_pkg_setup |
142 |
fi |
143 |
|
144 |
enewgroup zabbix |
145 |
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix |
146 |
} |
147 |
|
148 |
pkg_postinst() { |
149 |
if use server || use proxy ; then |
150 |
elog |
151 |
elog "You need to configure your database for Zabbix." |
152 |
elog |
153 |
elog "Have a look at /usr/share/zabbix/database for" |
154 |
elog "database creation and upgrades." |
155 |
elog |
156 |
elog "For more info read the Zabbix manual at" |
157 |
elog "http://www.zabbix.com/documentation.php" |
158 |
elog |
159 |
|
160 |
zabbix_homedir=$(egethome zabbix) |
161 |
if [ -n "${zabbix_homedir}" ] && \ |
162 |
[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then |
163 |
ewarn |
164 |
ewarn "The user 'zabbix' should have his homedir changed" |
165 |
ewarn "to /var/lib/zabbix/home if you want to use" |
166 |
ewarn "custom alert scripts." |
167 |
ewarn |
168 |
ewarn "A real homedir might be needed for configfiles" |
169 |
ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" |
170 |
ewarn "using sendxmpp for Jabber alerts)." |
171 |
ewarn |
172 |
ewarn "To change the homedir use:" |
173 |
ewarn " usermod -d /var/lib/zabbix/home zabbix" |
174 |
ewarn |
175 |
fi |
176 |
fi |
177 |
|
178 |
if use server; then |
179 |
elog |
180 |
elog "For distributed monitoring you have to run:" |
181 |
elog |
182 |
elog "zabbix_server -n <nodeid>" |
183 |
elog |
184 |
elog "This will convert database data for use with Node ID" |
185 |
elog "and also adds a local node." |
186 |
elog |
187 |
fi |
188 |
|
189 |
elog "--" |
190 |
elog |
191 |
elog "Add these lines in the /etc/services :" |
192 |
elog |
193 |
elog "zabbix-agent 10050/tcp Zabbix Agent" |
194 |
elog "zabbix-agent 10050/udp Zabbix Agent" |
195 |
elog "zabbix-trapper 10051/tcp Zabbix Trapper" |
196 |
elog "zabbix-trapper 10051/udp Zabbix Trapper" |
197 |
elog |
198 |
|
199 |
elog "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)." |
200 |
elog |
201 |
|
202 |
# repeat fowners/fperms functionality from src_install() |
203 |
# here to catch wrong permissions on existing files in |
204 |
# the live filesystem (yeah, that sucks). |
205 |
chown -R zabbix:zabbix \ |
206 |
"${ROOT}"/etc/zabbix \ |
207 |
"${ROOT}"/var/lib/zabbix \ |
208 |
"${ROOT}"/var/lib/zabbix/home \ |
209 |
"${ROOT}"/var/lib/zabbix/scripts \ |
210 |
"${ROOT}"/var/log/zabbix \ |
211 |
"${ROOT}"/var/run/zabbix |
212 |
chmod 0750 \ |
213 |
"${ROOT}"/etc/zabbix \ |
214 |
"${ROOT}"/var/lib/zabbix \ |
215 |
"${ROOT}"/var/lib/zabbix/home \ |
216 |
"${ROOT}"/var/lib/zabbix/scripts \ |
217 |
"${ROOT}"/var/log/zabbix \ |
218 |
"${ROOT}"/var/run/zabbix |
219 |
|
220 |
chmod 0640 \ |
221 |
"${ROOT}"/etc/zabbix/zabbix_* |
222 |
|
223 |
if use server || use proxy ; then |
224 |
# check for fping |
225 |
fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) |
226 |
case "${fping_perms}" in |
227 |
4[157][157][157]) |
228 |
;; |
229 |
*) |
230 |
ewarn |
231 |
ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," |
232 |
ewarn "you have to make /usr/sbin/fping setuid root and executable" |
233 |
ewarn "by everyone. Run the following command to fix it:" |
234 |
ewarn |
235 |
ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" |
236 |
ewarn |
237 |
ewarn "Please be aware that this might impose a security risk," |
238 |
ewarn "depending on the code quality of fping." |
239 |
ewarn |
240 |
ebeep 3 |
241 |
epause 5 |
242 |
;; |
243 |
esac |
244 |
fi |
245 |
} |
246 |
|
247 |
src_configure() { |
248 |
|
249 |
local myconf |
250 |
|
251 |
if use odbc && use iodbc ; then |
252 |
myconf="${myconf} --with-iodbc --without-unixodbc" |
253 |
elif use odbc && ! use iodbc; then |
254 |
myconf="${myconf} --with-unixodbc --without-iodbc" |
255 |
else |
256 |
myconf="${myconf} --without-unixodbc --without-iodbc" |
257 |
fi |
258 |
|
259 |
econf \ |
260 |
$myconf \ |
261 |
$(use_enable server) \ |
262 |
$(use_enable proxy) \ |
263 |
$(use_enable agent) \ |
264 |
$(use_enable ipv6) \ |
265 |
$(use_enable static) \ |
266 |
$(use_with ldap) \ |
267 |
$(use_with snmp net-snmp) \ |
268 |
$(use_with mysql) \ |
269 |
$(use_with postgres pgsql) \ |
270 |
$(use_with oracle) \ |
271 |
$(use_with sqlite sqlite3) \ |
272 |
$(use_with jabber) \ |
273 |
$(use_with curl libcurl) \ |
274 |
$(use_with openipmi openipmi) \ |
275 |
$(use_with ssh ssh2) \ |
276 |
|| die "econf failed" |
277 |
} |
278 |
|
279 |
src_install() { |
280 |
dodir \ |
281 |
/etc/zabbix \ |
282 |
/var/lib/zabbix \ |
283 |
/var/lib/zabbix/home \ |
284 |
/var/lib/zabbix/scripts \ |
285 |
/var/log/zabbix \ |
286 |
/var/run/zabbix |
287 |
|
288 |
keepdir \ |
289 |
/etc/zabbix \ |
290 |
/var/lib/zabbix \ |
291 |
/var/lib/zabbix/home \ |
292 |
/var/lib/zabbix/scripts \ |
293 |
/var/log/zabbix \ |
294 |
/var/run/zabbix |
295 |
|
296 |
if use server; then |
297 |
insinto /etc/zabbix |
298 |
doins \ |
299 |
"${FILESDIR}/1.6.6"/zabbix_server.conf \ |
300 |
"${FILESDIR}/1.6.6"/zabbix_trapper.conf |
301 |
doinitd \ |
302 |
"${FILESDIR}/1.6.6"/init.d/zabbix-server |
303 |
dosbin \ |
304 |
src/zabbix_server/zabbix_server |
305 |
dodir \ |
306 |
/usr/share/zabbix/database |
307 |
insinto /usr/share/zabbix/database |
308 |
doins -r \ |
309 |
upgrades \ |
310 |
create |
311 |
fowners zabbix:zabbix \ |
312 |
/etc/zabbix/zabbix_server.conf \ |
313 |
/etc/zabbix/zabbix_trapper.conf |
314 |
fperms 0640 \ |
315 |
/etc/zabbix/zabbix_server.conf \ |
316 |
/etc/zabbix/zabbix_trapper.conf |
317 |
fi |
318 |
|
319 |
if use proxy; then |
320 |
doinitd \ |
321 |
"${FILESDIR}/1.6.6"/init.d/zabbix-proxy |
322 |
dosbin \ |
323 |
src/zabbix_proxy/zabbix_proxy |
324 |
insinto /etc/zabbix |
325 |
doins \ |
326 |
"${FILESDIR}/1.6.6"/zabbix_proxy.conf |
327 |
dodir \ |
328 |
/usr/share/zabbix/database |
329 |
insinto /usr/share/zabbix/database |
330 |
doins -r \ |
331 |
upgrades \ |
332 |
create |
333 |
fi |
334 |
|
335 |
if use agent; then |
336 |
insinto /etc/zabbix |
337 |
doins \ |
338 |
"${FILESDIR}/1.6.6"/zabbix_agent.conf \ |
339 |
"${FILESDIR}/1.6.6"/zabbix_agentd.conf |
340 |
doinitd \ |
341 |
"${FILESDIR}/1.6.6"/init.d/zabbix-agentd |
342 |
dosbin \ |
343 |
src/zabbix_agent/zabbix_agent \ |
344 |
src/zabbix_agent/zabbix_agentd |
345 |
dobin \ |
346 |
src/zabbix_sender/zabbix_sender \ |
347 |
src/zabbix_get/zabbix_get |
348 |
fowners zabbix:zabbix \ |
349 |
/etc/zabbix/zabbix_agent.conf \ |
350 |
/etc/zabbix/zabbix_agentd.conf |
351 |
fperms 0640 \ |
352 |
/etc/zabbix/zabbix_agent.conf \ |
353 |
/etc/zabbix/zabbix_agentd.conf |
354 |
fi |
355 |
|
356 |
fowners zabbix:zabbix \ |
357 |
/etc/zabbix \ |
358 |
/var/lib/zabbix \ |
359 |
/var/lib/zabbix/home \ |
360 |
/var/lib/zabbix/scripts \ |
361 |
/var/log/zabbix \ |
362 |
/var/run/zabbix |
363 |
fperms 0750 \ |
364 |
/etc/zabbix \ |
365 |
/var/lib/zabbix \ |
366 |
/var/lib/zabbix/home \ |
367 |
/var/lib/zabbix/scripts \ |
368 |
/var/log/zabbix \ |
369 |
/var/run/zabbix |
370 |
|
371 |
dodoc README INSTALL NEWS ChangeLog |
372 |
|
373 |
if use frontend; then |
374 |
webapp_src_preinst |
375 |
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" |
376 |
webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt |
377 |
webapp_configfile \ |
378 |
"${MY_HTDOCSDIR}"/include/db.inc.php \ |
379 |
"${MY_HTDOCSDIR}"/include/config.inc.php |
380 |
webapp_src_install |
381 |
fi |
382 |
} |