pacho 14/04/13 11:55:26 Modified: ChangeLog Added: zabbix-2.2.2-r1.ebuild Removed: zabbix-2.2.2.ebuild Log: Don't use USE flag to control file installation (#502224) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.159 net-analyzer/zabbix/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.159&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?rev=1.159&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/ChangeLog?r1=1.158&r2=1.159 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- ChangeLog 24 Feb 2014 04:55:05 -0000 1.158 +++ ChangeLog 13 Apr 2014 11:55:26 -0000 1.159 @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/zabbix # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.158 2014/02/24 04:55:05 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.159 2014/04/13 11:55:26 pacho Exp $ + +*zabbix-2.2.2-r1 (13 Apr 2014) + + 13 Apr 2014; Pacho Ramos <pa...@gentoo.org> +zabbix-2.2.2-r1.ebuild, + -zabbix-2.2.2.ebuild: + Don't use USE flag to control file installation (#502224) *zabbix-2.2.2 (24 Feb 2014) 1.1 net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild?rev=1.1&content-type=text/plain Index: zabbix-2.2.2-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild,v 1.1 2014/04/13 11:55:26 pacho 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 systemd 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="~amd64 ~x86" IUSE="agent java curl frontend ipv6 jabber ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite 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 ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( 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() { 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() { econf \ $(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) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ || die "econf failed" } src_install() { dodir \ /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ /var/lib/zabbix/alertscripts \ /var/lib/zabbix/externalscripts \ /var/log/zabbix keepdir \ /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ /var/lib/zabbix/alertscripts \ /var/lib/zabbix/externalscripts \ /var/log/zabbix if use server; then insinto /etc/zabbix doins "${FILESDIR}/2.2"/zabbix_server.conf doinitd "${FILESDIR}/2.2"/init.d/zabbix-server dosbin src/zabbix_server/zabbix_server fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf systemd_dounit "${FILESDIR}/zabbix-server.service" systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf fi if use proxy; then doinitd \ "${FILESDIR}/2.2"/init.d/zabbix-proxy dosbin \ src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix doins \ "${FILESDIR}/2.2"/zabbix_proxy.conf systemd_dounit "${FILESDIR}/zabbix-proxy.service" systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf fi if use agent; then insinto /etc/zabbix doins \ "${FILESDIR}/2.2"/zabbix_agent.conf \ "${FILESDIR}/2.2"/zabbix_agentd.conf doinitd "${FILESDIR}/2.2"/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 systemd_dounit "${FILESDIR}/zabbix-agentd.service" systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf fi fowners zabbix:zabbix \ /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ /var/lib/zabbix/alertscripts \ /var/lib/zabbix/externalscripts \ /var/log/zabbix fperms 0750 \ /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ /var/lib/zabbix/alertscripts \ /var/lib/zabbix/externalscripts \ /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 }
