1 |
polynomial-c 11/12/30 08:26:50 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: zabbix-1.8.10.ebuild |
5 |
Removed: zabbix-1.8.10_rc1.ebuild |
6 |
Log: |
7 |
Version bump. Removed old. (bug #395975 and bug #396495) |
8 |
|
9 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.70 net-analyzer/zabbix/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.70&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.70&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?r1=1.69&r2=1.70 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v |
21 |
retrieving revision 1.69 |
22 |
retrieving revision 1.70 |
23 |
diff -u -r1.69 -r1.70 |
24 |
--- ChangeLog 16 Dec 2011 23:14:31 -0000 1.69 |
25 |
+++ ChangeLog 30 Dec 2011 08:26:50 -0000 1.70 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for net-analyzer/zabbix |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.69 2011/12/16 23:14:31 mattm Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.70 2011/12/30 08:26:50 polynomial-c Exp $ |
31 |
+ |
32 |
+*zabbix-1.8.10 (30 Dec 2011) |
33 |
+ |
34 |
+ 30 Dec 2011; Lars Wendler <polynomial-c@g.o> |
35 |
+ -zabbix-1.8.10_rc1.ebuild, +zabbix-1.8.10.ebuild: |
36 |
+ non-maintainer commit: Version bump (with kind permission from bonsaikitten). |
37 |
+ Removed old. This fixes bug #395975 and should help solving bug #396495. |
38 |
|
39 |
*zabbix-1.8.10_rc1 (16 Dec 2011) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 net-analyzer/zabbix/zabbix-1.8.10.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.10.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.10.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: zabbix-1.8.10.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.10.ebuild,v 1.1 2011/12/30 08:26:50 polynomial-c Exp $ |
54 |
|
55 |
EAPI="2" |
56 |
|
57 |
# needed to make webapp-config dep optional |
58 |
WEBAPP_OPTIONAL="yes" |
59 |
inherit eutils flag-o-matic webapp depend.php autotools |
60 |
|
61 |
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." |
62 |
HOMEPAGE="http://www.zabbix.com/" |
63 |
MY_P=${P/_/} |
64 |
SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" |
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
WEBAPP_MANUAL_SLOT="yes" |
68 |
KEYWORDS="~amd64 ~x86" |
69 |
IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite3" |
70 |
|
71 |
COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
72 |
ldap? ( |
73 |
net-nds/openldap |
74 |
=dev-libs/cyrus-sasl-2* |
75 |
net-libs/gnutls |
76 |
) |
77 |
mysql? ( virtual/mysql ) |
78 |
sqlite3? ( =dev-db/sqlite-3* ) |
79 |
postgres? ( dev-db/postgresql-base ) |
80 |
oracle? ( dev-db/oracle-instantclient-basic ) |
81 |
jabber? ( dev-libs/iksemel ) |
82 |
curl? ( net-misc/curl ) |
83 |
openipmi? ( sys-libs/openipmi ) |
84 |
ssh? ( net-libs/libssh2 )" |
85 |
|
86 |
RDEPEND="${COMMON_DEPEND} |
87 |
proxy? ( net-analyzer/fping ) |
88 |
server? ( net-analyzer/fping |
89 |
app-admin/webapp-config ) |
90 |
frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] |
91 |
media-libs/gd[png] |
92 |
app-admin/webapp-config )" |
93 |
DEPEND="${COMMON_DEPEND} |
94 |
dev-util/pkgconfig" |
95 |
|
96 |
use frontend && need_php_httpd |
97 |
|
98 |
src_prepare() { |
99 |
epatch "${FILESDIR}/${PN}-1.8.9-as-needed.patch" |
100 |
eautoreconf |
101 |
} |
102 |
|
103 |
pkg_setup() { |
104 |
if use server || use proxy ; then |
105 |
local dbnum dbtypes="mysql oracle postgres sqlite3" 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 |
# repeat fowners/fperms functionality from src_install() |
200 |
# here to catch wrong permissions on existing files in |
201 |
# the live filesystem (yeah, that sucks). |
202 |
chown -R zabbix:zabbix \ |
203 |
"${ROOT}"/etc/zabbix \ |
204 |
"${ROOT}"/var/lib/zabbix \ |
205 |
"${ROOT}"/var/lib/zabbix/home \ |
206 |
"${ROOT}"/var/lib/zabbix/scripts \ |
207 |
"${ROOT}"/var/log/zabbix \ |
208 |
"${ROOT}"/var/run/zabbix |
209 |
chmod 0750 \ |
210 |
"${ROOT}"/etc/zabbix \ |
211 |
"${ROOT}"/var/lib/zabbix \ |
212 |
"${ROOT}"/var/lib/zabbix/home \ |
213 |
"${ROOT}"/var/lib/zabbix/scripts \ |
214 |
"${ROOT}"/var/log/zabbix \ |
215 |
"${ROOT}"/var/run/zabbix |
216 |
|
217 |
chmod 0640 \ |
218 |
"${ROOT}"/etc/zabbix/zabbix_* |
219 |
|
220 |
if use server || use proxy ; then |
221 |
# check for fping |
222 |
fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) |
223 |
case "${fping_perms}" in |
224 |
4[157][157][157]) |
225 |
;; |
226 |
*) |
227 |
ewarn |
228 |
ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," |
229 |
ewarn "you have to make /usr/sbin/fping setuid root and executable" |
230 |
ewarn "by everyone. Run the following command to fix it:" |
231 |
ewarn |
232 |
ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" |
233 |
ewarn |
234 |
ewarn "Please be aware that this might impose a security risk," |
235 |
ewarn "depending on the code quality of fping." |
236 |
ewarn |
237 |
ebeep 3 |
238 |
epause 5 |
239 |
;; |
240 |
esac |
241 |
fi |
242 |
} |
243 |
|
244 |
src_configure() { |
245 |
econf \ |
246 |
$(use_enable server) \ |
247 |
$(use_enable proxy) \ |
248 |
$(use_enable agent) \ |
249 |
$(use_enable ipv6) \ |
250 |
$(use_with ldap) \ |
251 |
$(use_with snmp net-snmp) \ |
252 |
$(use_with mysql) \ |
253 |
$(use_with postgres pgsql) \ |
254 |
$(use_with oracle) \ |
255 |
$(use_with sqlite3) \ |
256 |
$(use_with jabber) \ |
257 |
$(use_with curl libcurl) \ |
258 |
$(use_with openipmi openipmi) \ |
259 |
$(use_with ssh ssh2) \ |
260 |
|| die "econf failed" |
261 |
} |
262 |
|
263 |
src_install() { |
264 |
dodir \ |
265 |
/etc/zabbix \ |
266 |
/var/lib/zabbix \ |
267 |
/var/lib/zabbix/home \ |
268 |
/var/lib/zabbix/scripts \ |
269 |
/var/log/zabbix \ |
270 |
/var/run/zabbix |
271 |
|
272 |
keepdir \ |
273 |
/etc/zabbix \ |
274 |
/var/lib/zabbix \ |
275 |
/var/lib/zabbix/home \ |
276 |
/var/lib/zabbix/scripts \ |
277 |
/var/log/zabbix \ |
278 |
/var/run/zabbix |
279 |
|
280 |
if use server; then |
281 |
insinto /etc/zabbix |
282 |
doins \ |
283 |
"${FILESDIR}/1.6.6"/zabbix_server.conf \ |
284 |
"${FILESDIR}/1.6.6"/zabbix_trapper.conf |
285 |
doinitd \ |
286 |
"${FILESDIR}/1.6.6"/init.d/zabbix-server |
287 |
dosbin \ |
288 |
src/zabbix_server/zabbix_server |
289 |
dodir \ |
290 |
/usr/share/zabbix/database |
291 |
insinto /usr/share/zabbix/database |
292 |
doins -r \ |
293 |
upgrades \ |
294 |
create |
295 |
fowners zabbix:zabbix \ |
296 |
/etc/zabbix/zabbix_server.conf \ |
297 |
/etc/zabbix/zabbix_trapper.conf |
298 |
fperms 0640 \ |
299 |
/etc/zabbix/zabbix_server.conf \ |
300 |
/etc/zabbix/zabbix_trapper.conf |
301 |
fi |
302 |
|
303 |
if use proxy; then |
304 |
doinitd \ |
305 |
"${FILESDIR}/1.6.6"/init.d/zabbix-proxy |
306 |
dosbin \ |
307 |
src/zabbix_proxy/zabbix_proxy |
308 |
insinto /etc/zabbix |
309 |
doins \ |
310 |
"${FILESDIR}/1.6.6"/zabbix_proxy.conf |
311 |
dodir \ |
312 |
/usr/share/zabbix/database |
313 |
insinto /usr/share/zabbix/database |
314 |
doins -r \ |
315 |
upgrades \ |
316 |
create |
317 |
fi |
318 |
|
319 |
if use agent; then |
320 |
insinto /etc/zabbix |
321 |
doins \ |
322 |
"${FILESDIR}/1.6.6"/zabbix_agent.conf \ |
323 |
"${FILESDIR}/1.6.6"/zabbix_agentd.conf |
324 |
doinitd \ |
325 |
"${FILESDIR}/1.6.6"/init.d/zabbix-agentd |
326 |
dosbin \ |
327 |
src/zabbix_agent/zabbix_agent \ |
328 |
src/zabbix_agent/zabbix_agentd |
329 |
dobin \ |
330 |
src/zabbix_sender/zabbix_sender \ |
331 |
src/zabbix_get/zabbix_get |
332 |
fowners zabbix:zabbix \ |
333 |
/etc/zabbix/zabbix_agent.conf \ |
334 |
/etc/zabbix/zabbix_agentd.conf |
335 |
fperms 0640 \ |
336 |
/etc/zabbix/zabbix_agent.conf \ |
337 |
/etc/zabbix/zabbix_agentd.conf |
338 |
fi |
339 |
|
340 |
fowners zabbix:zabbix \ |
341 |
/etc/zabbix \ |
342 |
/var/lib/zabbix \ |
343 |
/var/lib/zabbix/home \ |
344 |
/var/lib/zabbix/scripts \ |
345 |
/var/log/zabbix \ |
346 |
/var/run/zabbix |
347 |
fperms 0750 \ |
348 |
/etc/zabbix \ |
349 |
/var/lib/zabbix \ |
350 |
/var/lib/zabbix/home \ |
351 |
/var/lib/zabbix/scripts \ |
352 |
/var/log/zabbix \ |
353 |
/var/run/zabbix |
354 |
|
355 |
dodoc README INSTALL NEWS ChangeLog |
356 |
|
357 |
if use frontend; then |
358 |
webapp_src_preinst |
359 |
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" |
360 |
webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt |
361 |
webapp_configfile \ |
362 |
"${MY_HTDOCSDIR}"/include/db.inc.php \ |
363 |
"${MY_HTDOCSDIR}"/include/config.inc.php |
364 |
webapp_src_install |
365 |
fi |
366 |
} |