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