* [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix: zabbix-2.2.0.ebuild ChangeLog
@ 2013-11-16 0:37 Matthew Marlow (mattm)
0 siblings, 0 replies; 2+ messages in thread
From: Matthew Marlow (mattm) @ 2013-11-16 0:37 UTC (permalink / raw
To: gentoo-commits
mattm 13/11/16 00:37:43
Modified: zabbix-2.2.0.ebuild ChangeLog
Log:
Zabbix-2.2.0 no longer happy with old zbx282 patch.
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 786037A7)
Revision Changes Path
1.2 net-analyzer/zabbix/zabbix-2.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild?r1=1.1&r2=1.2
Index: zabbix-2.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-2.2.0.ebuild 15 Nov 2013 20:46:37 -0000 1.1
+++ zabbix-2.2.0.ebuild 16 Nov 2013 00:37:43 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild,v 1.1 2013/11/15 20:46:37 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild,v 1.2 2013/11/16 00:37:43 mattm Exp $
EAPI="5"
@@ -69,7 +69,7 @@
}
src_prepare() {
- epatch "${FILESDIR}/2.0/patches/zbx282.patch"
+# Add any patches here
eautoreconf
}
1.142 net-analyzer/zabbix/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?r1=1.141&r2=1.142
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ChangeLog 15 Nov 2013 20:46:37 -0000 1.141
+++ ChangeLog 16 Nov 2013 00:37:43 -0000 1.142
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/zabbix
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.141 2013/11/15 20:46:37 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.142 2013/11/16 00:37:43 mattm Exp $
+
+ 16 Nov 2013; Matthew Marlowe <mattm@gentoo.org> zabbix-2.2.0.ebuild:
+ Zabbix-2.2.0 no longer happy with old zbx282 patch.
*zabbix-2.2.0 (15 Nov 2013)
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix: zabbix-2.2.0.ebuild ChangeLog
@ 2013-11-15 20:46 Matthew Marlow (mattm)
0 siblings, 0 replies; 2+ messages in thread
From: Matthew Marlow (mattm) @ 2013-11-15 20:46 UTC (permalink / raw
To: gentoo-commits
mattm 13/11/15 20:46:37
Modified: ChangeLog
Added: zabbix-2.2.0.ebuild
Log:
Major version bump zabbix 2.2.0, Minor ebuild cleanups, no keywords until testing complete
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 786037A7)
Revision Changes Path
1.141 net-analyzer/zabbix/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 14 Oct 2013 15:50:09 -0000 1.140
+++ ChangeLog 15 Nov 2013 20:46:37 -0000 1.141
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/zabbix
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.140 2013/10/14 15:50:09 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.141 2013/11/15 20:46:37 mattm Exp $
+
+*zabbix-2.2.0 (15 Nov 2013)
+
+ 15 Nov 2013; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.2.0.ebuild:
+ Major version bump zabbix 2.2.0, Minor ebuild cleanups, no keywords until
+ testing complete
14 Oct 2013; Matthew Marlowe <mattm@gentoo.org> -zabbix-2.0.8.ebuild:
Removing older ebuilds affected by 486696.
1.1 net-analyzer/zabbix/zabbix-2.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild?rev=1.1&content-type=text/plain
Index: zabbix-2.2.0.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild,v 1.1 2013/11/15 20:46:37 mattm Exp $
EAPI="5"
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
HOMEPAGE="http://www.zabbix.com/"
MY_P=${P/_/}
MY_PV=${PV/_/}
SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
KEYWORDS=""
IUSE="agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static"
COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
ldap? (
net-nds/openldap
=dev-libs/cyrus-sasl-2*
net-libs/gnutls
)
mysql? ( >=virtual/mysql-5.0.3 )
sqlite? ( >=dev-db/sqlite-3.3.5 )
postgres? ( >=dev-db/postgresql-base-8.3.0 )
oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
jabber? ( dev-libs/iksemel )
curl? ( net-misc/curl )
openipmi? ( sys-libs/openipmi )
ssh? ( net-libs/libssh2 )
java? ( >=virtual/jdk-1.4 )
odbc? (
iodbc? ( dev-db/libiodbc )
!iodbc? ( dev-db/unixODBC )
)"
RDEPEND="${COMMON_DEPEND}
proxy? ( <=net-analyzer/fping-2.9 )
server? ( <=net-analyzer/fping-2.9
app-admin/webapp-config )
java? (
>=virtual/jre-1.4
dev-java/slf4j-api
dev-java/json-simple
)
frontend? (
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
media-libs/gd[png]
app-admin/webapp-config )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
S=${WORKDIR}/${MY_P}
ZABBIXJAVA_BASE="opt/zabbix_java"
java_prepare() {
cd "${S}/src/zabbix_java/lib"
rm -v *.jar || die
java-pkg_jar-from slf4j-api
java-pkg_jar-from json-simple
}
src_prepare() {
epatch "${FILESDIR}/2.0/patches/zbx282.patch"
eautoreconf
}
pkg_setup() {
if use server || use proxy ; then
local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
declare -i dbnum=0
for dbtype in ${dbtypes}; do
use ${dbtype} && let dbnum++
done
if [ ${dbnum} -gt 1 ]; then
eerror
eerror "You can't use more than one database type in Zabbix."
eerror "Select exactly one database type out of these: ${dbtypes}"
eerror
die "Multiple database types selected."
elif [ ${dbnum} -lt 1 ]; then
eerror
eerror "Select exactly one database type out of these: ${dbtypes}"
eerror
die "No database type selected."
fi
if use oracle; then
if [ -z "${ORACLE_HOME}" ]; then
eerror
eerror "The environment variable ORACLE_HOME must be set"
eerror "and point to the correct location."
eerror "It looks like you don't have Oracle installed."
eerror
die "Environment variable ORACLE_HOME is not set"
fi
if has_version 'dev-db/oracle-instantclient-basic'; then
ewarn
ewarn "Please ensure you have a full install of the Oracle client."
ewarn "dev-db/oracle-instantclient* is NOT sufficient."
ewarn
fi
fi
fi
if use frontend; then
webapp_pkg_setup
fi
enewgroup zabbix
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
}
pkg_postinst() {
if use server || use proxy ; then
elog
elog "You may need to configure your database for Zabbix,"
elog "if you have not already done so. "
elog
zabbix_homedir=$(egethome zabbix)
if [ -n "${zabbix_homedir}" ] && \
[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
ewarn
ewarn "The user 'zabbix' should have his homedir changed"
ewarn "to /var/lib/zabbix/home if you want to use"
ewarn "custom alert scripts."
ewarn
ewarn "A real homedir might be needed for configfiles"
ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
ewarn "using sendxmpp for Jabber alerts)."
ewarn
ewarn "To change the homedir use:"
ewarn " usermod -d /var/lib/zabbix/home zabbix"
ewarn
fi
fi
if use server; then
elog
elog "For distributed monitoring you have to run:"
elog
elog "zabbix_server -n <nodeid>"
elog
elog "This will convert database data for use with Node ID"
elog "and also adds a local node."
elog
fi
elog "--"
elog
elog "You may need to add these lines to /etc/services:"
elog
elog "zabbix-agent 10050/tcp Zabbix Agent"
elog "zabbix-agent 10050/udp Zabbix Agent"
elog "zabbix-trapper 10051/tcp Zabbix Trapper"
elog "zabbix-trapper 10051/udp Zabbix Trapper"
elog
elog "Feel free to download or contribute gentoo specific zabbix templates"
elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
# repeat fowners/fperms functionality from src_install()
# here to catch wrong permissions on existing files in
# the live filesystem (yeah, that sucks).
chown -R zabbix:zabbix \
"${ROOT}"/etc/zabbix \
"${ROOT}"/var/lib/zabbix \
"${ROOT}"/var/lib/zabbix/home \
"${ROOT}"/var/lib/zabbix/scripts \
"${ROOT}"/var/log/zabbix
chmod 0750 \
"${ROOT}"/etc/zabbix \
"${ROOT}"/var/lib/zabbix \
"${ROOT}"/var/lib/zabbix/home \
"${ROOT}"/var/lib/zabbix/scripts \
"${ROOT}"/var/log/zabbix
chmod 0640 \
"${ROOT}"/etc/zabbix/zabbix_*
if use server || use proxy ; then
# check for fping
fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
case "${fping_perms}" in
4[157][157][157])
;;
*)
ewarn
ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
ewarn "you have to make /usr/sbin/fping setuid root and executable"
ewarn "by everyone. Run the following command to fix it:"
ewarn
ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
ewarn
ewarn "Please be aware that this might impose a security risk,"
ewarn "depending on the code quality of fping."
ewarn
;;
esac
fi
}
src_configure() {
local myconf
if use odbc && use iodbc ; then
myconf="${myconf} --with-iodbc --without-unixodbc"
elif use odbc && ! use iodbc; then
myconf="${myconf} --with-unixodbc --without-iodbc"
else
myconf="${myconf} --without-unixodbc --without-iodbc"
fi
econf \
$myconf \
$(use_enable server) \
$(use_enable proxy) \
$(use_enable agent) \
$(use_enable ipv6) \
$(use_enable static) \
$(use_enable java) \
$(use_with ldap) \
$(use_with snmp net-snmp) \
$(use_with mysql) \
$(use_with postgres postgresql) \
$(use_with oracle) \
$(use_with sqlite sqlite3) \
$(use_with jabber) \
$(use_with curl libcurl) \
$(use_with openipmi openipmi) \
$(use_with ssh ssh2) \
|| die "econf failed"
}
src_install() {
dodir \
/etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
/var/log/zabbix
keepdir \
/etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
/var/log/zabbix
if use server; then
insinto /etc/zabbix
doins \
"${FILESDIR}/1.6.6"/zabbix_server.conf \
"${FILESDIR}/1.6.6"/zabbix_trapper.conf
doinitd \
"${FILESDIR}/2.0"/init.d/zabbix-server
dosbin \
src/zabbix_server/zabbix_server
fowners zabbix:zabbix \
/etc/zabbix/zabbix_server.conf \
/etc/zabbix/zabbix_trapper.conf
fperms 0640 \
/etc/zabbix/zabbix_server.conf \
/etc/zabbix/zabbix_trapper.conf
fi
if use proxy; then
doinitd \
"${FILESDIR}/2.0"/init.d/zabbix-proxy
dosbin \
src/zabbix_proxy/zabbix_proxy
insinto /etc/zabbix
doins \
"${FILESDIR}/2.0"/zabbix_proxy.conf
fi
if use agent; then
insinto /etc/zabbix
doins \
"${FILESDIR}/1.6.6"/zabbix_agent.conf \
"${FILESDIR}/1.6.6"/zabbix_agentd.conf
doinitd \
"${FILESDIR}/2.0"/init.d/zabbix-agentd
dosbin \
src/zabbix_agent/zabbix_agent \
src/zabbix_agent/zabbix_agentd
dobin \
src/zabbix_sender/zabbix_sender \
src/zabbix_get/zabbix_get
fowners zabbix:zabbix \
/etc/zabbix/zabbix_agent.conf \
/etc/zabbix/zabbix_agentd.conf
fperms 0640 \
/etc/zabbix/zabbix_agent.conf \
/etc/zabbix/zabbix_agentd.conf
fi
fowners zabbix:zabbix \
/etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
/var/log/zabbix
fperms 0750 \
/etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
/var/log/zabbix
dodoc README INSTALL NEWS ChangeLog \
conf/zabbix_agent.conf \
conf/zabbix_agentd.conf \
conf/zabbix_proxy.conf \
conf/zabbix_agentd/userparameter_examples.conf \
conf/zabbix_agentd/userparameter_mysql.conf \
conf/zabbix_server.conf
if use frontend; then
webapp_src_preinst
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
webapp_configfile \
"${MY_HTDOCSDIR}"/include/db.inc.php \
"${MY_HTDOCSDIR}"/include/config.inc.php
webapp_src_install
fi
if use java; then
dodir \
/${ZABBIXJAVA_BASE} \
/${ZABBIXJAVA_BASE}/bin \
/${ZABBIXJAVA_BASE}/lib
keepdir /${ZABBIXJAVA_BASE}
exeinto /${ZABBIXJAVA_BASE}/bin
doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
exeinto /${ZABBIXJAVA_BASE}/lib
doexe \
src/zabbix_java/lib/logback-classic-0.9.27.jar \
src/zabbix_java/lib/logback-console.xml \
src/zabbix_java/lib/logback-core-0.9.27.jar \
src/zabbix_java/lib/logback.xml \
src/zabbix_java/lib/org-json-2010-12-28.jar \
src/zabbix_java/lib/slf4j-api-1.6.1.jar
exeinto /${ZABBIXJAVA_BASE}/
doexe \
src/zabbix_java/settings.sh \
src/zabbix_java/startup.sh \
src/zabbix_java/shutdown.sh
fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
fi
}
src_compile() {
if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-16 0:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-16 0:37 [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix: zabbix-2.2.0.ebuild ChangeLog Matthew Marlow (mattm)
-- strict thread matches above, loose matches on Subject: below --
2013-11-15 20:46 Matthew Marlow (mattm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox