From 1a4dc0076f2541ea01f9c123e04d1955d2abb6f0 Mon Sep 17 00:00:00 2001 From: Matthew Marlowe Date: Tue, 29 Nov 2011 00:08:44 +0000 Subject: [PATCH] Troubleshooted bug #392311 which involved changes to our patches to the automake scripts for zabbix 1.8.9, removed keywords from zabbix-1.8.9, added zabbix-1.8.9-as-needed.patch and zabbix-1.8.9-r1 ebuild which applies our updated patch correctly. Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- net-analyzer/zabbix/ChangeLog | 9 +- net-analyzer/zabbix/Manifest | 20 +- .../zabbix/files/zabbix-1.8.9-as-needed.patch | 83 +++++ net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild | 315 ++++++++++++++++++ net-analyzer/zabbix/zabbix-1.8.9.ebuild | 4 +- 5 files changed, 419 insertions(+), 12 deletions(-) create mode 100644 net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch create mode 100644 net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index d6c34699dcd1..830fee079dc5 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/zabbix # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.67 2011/11/25 02:54:59 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.68 2011/11/29 00:08:44 mattm Exp $ + +*zabbix-1.8.9-r1 (29 Nov 2011) + + 29 Nov 2011; Matthew Marlowe zabbix-1.8.9.ebuild, + +zabbix-1.8.9-r1.ebuild, +files/zabbix-1.8.9-as-needed.patch: + Updated as needed patch for zabbix 1.8.9, deprecated r0 ebuild which uses old + patch, fix in 1.8.9-r1 *zabbix-1.8.9 (25 Nov 2011) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 4f17582c224c..316ed0c4259e 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -26,6 +26,7 @@ AUX 1.6.6/zabbix_server.conf 3933 RMD160 7e0cfe262911d5a42ce590071e2852ec8d76e8b AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8 AUX zabbix-1.8.2-as-needed.patch 2328 RMD160 8a69c4b6267c0e280e0135bbd13915b5d02b6c52 SHA1 e838d87010f9105ab4c0873998575ead783ca8c3 SHA256 6ca4044ba72c7417cb7d6273582d93c4266b3528d77c1c450c12b7d013a6551e AUX zabbix-1.8.3-as-needed.patch 2623 RMD160 a29c220a61686296a03171fe8ef81a559f12a65c SHA1 db14bd8794331f4f15987a9343e6fbb8d6284a0c SHA256 ad9083833a44d2e729b285e485982bc0f5e4b3e7de97035255a0ec1a2828a9b1 +AUX zabbix-1.8.9-as-needed.patch 2737 RMD160 ddeb918ac3f4b297810da105cf2a4cfaa4268fd1 SHA1 278fe59122a90a4b8ccc26e1d722ee107c1e91fb SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 AUX zabbix-as-needed.patch 2296 RMD160 2f369ec35e3245d191433613dc5e82fc4a21f2e0 SHA1 809b8a94e49a9677f520a601b5dc599c33843992 SHA256 7e8d9b6f478c4a2fbfc822400e51dd01dbe46a0c28522520db167e46e36a0c29 DIST zabbix-1.8.3.tar.gz 4106152 RMD160 f0d54c1cd8865c952945a8ec3958e7ebdd9a92d5 SHA1 68f5d1f12897bc69c6ff5deea2bad82b0c1f5761 SHA256 37262d751c9661a361380bf1480d277d81621d8a49c60a81667cbe258021065c DIST zabbix-1.8.5.tar.gz 4184672 RMD160 200e1cdddb0f7149c7cfb62237a46a563054f95e SHA1 655f5c7381139ec97d23df4cce0469e1e032c54d SHA256 885b9f1953c3f6aa1f13760340b3d23d6e01287dc46e6e241c964aec7a38ef32 @@ -42,19 +43,20 @@ EBUILD zabbix-1.8.7-r1.ebuild 8145 RMD160 b449025a7834d74b516cf0afd824e471d712b5 EBUILD zabbix-1.8.7.ebuild 8096 RMD160 87d397d3856f1e440a0adebf3b78f93e366a2ae3 SHA1 264f579bba3f03885df8480939c657ad11dde894 SHA256 3199aa213ae6dd860865fd64bd17301bcb55f58298d2f6feddbd051e7576e23a EBUILD zabbix-1.8.8-r1.ebuild 8147 RMD160 4b16a3304bb3a913855baeca34307afc57131d5a SHA1 1e85f1019a2fd24f665409d4bd1141a68e6cb11f SHA256 1e26f528cc28791a2b69d3df48673d851c2dfd035e465c53a4b9f17f284a206d EBUILD zabbix-1.8.8.ebuild 8097 RMD160 58071c1075a9a7182af6c93cb6033e8468b0c456 SHA1 49223ac82e056c6dafad2db7e6b86406cabac734 SHA256 4ed5ed804a3481221b27bbf79774df8c7a00ffb5a06015306097c06288881cd4 -EBUILD zabbix-1.8.9.ebuild 8143 RMD160 bcdeca49fb3e40dd8f1d22f7a89bb531423ab93a SHA1 86fe5aba93444ccb9615388ed6844d56278170a5 SHA256 f90e9f8411c2759d04c64fae2191df5c649e5c42edbadb6b69a9700b002c2e2a +EBUILD zabbix-1.8.9-r1.ebuild 8146 RMD160 de849ef8d0148b65454ed8da957fd381607ae54a SHA1 86534495d6a5d96ef3c961942cbca16440c70227 SHA256 fbfe63619138bc5f5722475aecd21a324fdca02c9f107baa9947be500bcd5c12 +EBUILD zabbix-1.8.9.ebuild 8132 RMD160 59509d08e0c30bffa46d389f356332401eb20acd SHA1 850029d52cf2d41977b7c6151dc1692dc54938ac SHA256 b64f320d25c953a8f86a8e2459eb6a403f32011e80331a954974e48a82253adb EBUILD zabbix-1.9.4.ebuild 8091 RMD160 2c66f2c64f31923791ed9e1f5f1306e0f5b97df5 SHA1 b56cbffd741c1f6285c8f3ed626243701b683e3e SHA256 5b5eff01b956a9625b30af16fbea9e812fdc5c628c1219a18837c5b7c13f2749 EBUILD zabbix-1.9.5.ebuild 8091 RMD160 791e1baa4f8f1fb696f057cc958a60406267ddd1 SHA1 95369c15a6f6219fdd1dcdd7879c1c5014ac1f83 SHA256 a3152587bc62a7b41bdc67dbfe327ddf1d0ebe0509eae418041de3aad0cc3ac1 -MISC ChangeLog 13795 RMD160 22dfebc12e203c564e7d49bea79e53c1d6d656f5 SHA1 9a928da35d10dc85060f255c66d1f9dc531f016a SHA256 70559ba7d0c46cfb8578133832e47d7b87e0a35ea90d8a163fd9538526705a49 +MISC ChangeLog 14068 RMD160 24e27a6c31eb18781ff8a2b7ed595a14988b1f89 SHA1 1a4bc52b969e7804a9348bf10d2c5f3e38d91f40 SHA256 293a502093d8adf12ba2a74e767928fcff98d92b52db85e2e289009cb819e93f MISC metadata.xml 990 RMD160 edaffb17a34b9015c48eaf1ae61ef676b9bfdf63 SHA1 1eb2d630b542283f5460a49327dc93fee2de5663 SHA256 b5f00181c6943bf7dc15acf9b7dd21453d7cc0402a55bb2385b3fc0de6520f6f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJOzwOPAAoJEC1LWXx4YDenDH8H/AiEw4AhfxyorTceteFxC8Vi -ljdihVlgXDLHR8BlEnG8zFlYbNqPwpnD7PxR2rBMAmCKkh3M1LcTSRval76y3kjq -zvchE91L7rK33Xv4hKDQB0KjODcHoo/y7/lhDWbU0kXyfswBbnIBb5KWrHYzRlkF -FbvLClSKrwFt9zoZIewlu7Cz+dAiB08XqTe20MQDM2pvsJN2Vzk515Pn+OY6TYnJ -wybLre8TeWo77497ySz3pVoSiAqza5679djDqzmFcyauu/2S1/nSheZkjdblax52 -5vsfmlc3VzSb84Jxpy/16h4H7aZRyzKNv9qfwYjOVzue/3tZKqhacaP1RdYjkuE= -=dwm3 +iQEcBAEBAgAGBQJO1CKXAAoJEC1LWXx4YDen6UMH/2r2Pkjvwku1F8n+ZSEK7x0R +4ab4twCyy034j2jfGDA0O6zE02HV6C1b8RHxwRtCDZgo6+DDxaQY4LXYpVfwqNz7 +fKd2odtU/P5HTRBNgZgRo7MKMuUoM3gh/HAytr9fHvYu75fpHDMxf2Dw5pH6xlEA +CnPEd4pQz4BZmgThKujfNNoykUy8RNcCQi5UxSfEVhXsmYG+O7nmAWltQqsXHbJ8 +rNsbn8W6aRtflJ4a4XogEfCOMwCKLEMOqDA4wU88ex5bgYO3uEcOJlcCTHjsBffF +sWhentWGb7don3kAtMwP0S2XQykrwSvb9D7WDnghCLwwrLrSYp7KQetQvd9W9/Q= +=eEUu -----END PGP SIGNATURE----- diff --git a/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch b/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch new file mode 100644 index 000000000000..254634d4ff96 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch @@ -0,0 +1,83 @@ +From 90b086b4daebf61756e3d6f8926cf8951a2fc96a Mon Sep 17 00:00:00 2001 +From: Vladimir V. Kamarzin +Date: Fri, 22 Oct 2010 17:47:01 +0600 +Subject: [PATCH 1/2] Fix linking with ldap libs + +Move "-lldap -llber" from LDAP_LDFLAGS to LDAP_LIBS and include them to +LIBS +--- + configure.in | 1 + + m4/ldap.m4 | 4 +++- + 2 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index d3d981b..b11b2ee 100644 +--- a/configure.in ++++ b/configure.in +@@ -1281,6 +1281,7 @@ if test "x$want_ldap" = "xyes"; then + fi + CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" + SERVER_LDFLAGS="${SERVER_LDFLAGS} ${LDAP_LDFLAGS}" ++LIBS="${LIBS} ${LDAP_LIBS}" + PROXY_LDFLAGS="${PROXY_LDFLAGS} ${LDAP_LDFLAGS}" + AGENT_LDFLAGS="${AGENT_LDFLAGS} ${LDAP_LDFLAGS}" + + found_iconv="no" + dnl Check for libiconv [by default - skip] +diff --git a/m4/ldap.m4 b/m4/ldap.m4 +index 29e97cd..885b3e0 100644 +--- a/m4/ldap.m4 ++++ b/m4/ldap.m4 +@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> + fi + + LDAP_CPPFLAGS=-I$LDAP_INCDIR +- LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS" ++ LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS" ++ LDAP_LIBS="-lldap -llber $LDAP_LIBS" + + found_ldap="yes" + AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.]) +@@ -92,6 +93,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> + + AC_SUBST(LDAP_CPPFLAGS) + AC_SUBST(LDAP_LDFLAGS) ++ AC_SUBST(LDAP_LIBS) + + unset _libldap_with + ])dnl +-- +1.7.3.1 + +From f6378e6aeb0bec1883a83c70c8cdfd1213f11f97 Mon Sep 17 00:00:00 2001 +From: Vladimir V. Kamarzin +Date: Fri, 22 Oct 2010 17:49:16 +0600 +Subject: [PATCH 2/2] m4/ax_lib_postgresql.m4: move -pq from POSTGRESQL_LDFLAGS to POSTGRESQL_LIBS + +--- + m4/ax_lib_postgresql.m4 | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 +index fe06f66..934d12c 100644 +--- a/m4/ax_lib_postgresql.m4 ++++ b/m4/ax_lib_postgresql.m4 +@@ -84,7 +84,8 @@ AC_DEFUN([AX_LIB_POSTGRESQL], + AC_MSG_CHECKING([for PostgreSQL libraries]) + + POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" +- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" ++ POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" ++ POSTGRESQL_LIBS="-lpq" + + POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` + +@@ -179,4 +180,5 @@ PQserverVersion(conn); + AC_SUBST([POSTGRESQL_VERSION]) + AC_SUBST([POSTGRESQL_CPPFLAGS]) + AC_SUBST([POSTGRESQL_LDFLAGS]) ++ AC_SUBST([POSTGRESQL_LIBS]) + ]) +-- +1.7.3.1 + diff --git a/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild new file mode 100644 index 000000000000..d20b574e9c17 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild,v 1.1 2011/11/29 00:08:44 mattm Exp $ + +EAPI="2" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit eutils flag-o-matic webapp depend.php autotools + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." +HOMEPAGE="http://www.zabbix.com/" +SRC_URI="http://prdownloads.sourceforge.net/zabbix/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite3" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( virtual/mysql ) + sqlite3? ( =dev-db/sqlite-3* ) + postgres? ( dev-db/postgresql-base ) + oracle? ( dev-db/oracle-instantclient-basic ) + jabber? ( dev-libs/iksemel ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping ) + server? ( net-analyzer/fping + app-admin/webapp-config ) + frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +use frontend && need_php_httpd + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.8.9-as-needed.patch" + eautoreconf +} + +pkg_setup() { + if use server || use proxy ; then + local dbnum dbtypes="mysql oracle postgres sqlite3" 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 need to configure your database for Zabbix." + elog + elog "Have a look at /usr/share/zabbix/database for" + elog "database creation and upgrades." + elog + elog "For more info read the Zabbix manual at" + elog "http://www.zabbix.com/documentation.php" + 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 " + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "Add these lines in the /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 + + # 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 \ + "${ROOT}"/var/run/zabbix + chmod 0750 \ + "${ROOT}"/etc/zabbix \ + "${ROOT}"/var/lib/zabbix \ + "${ROOT}"/var/lib/zabbix/home \ + "${ROOT}"/var/lib/zabbix/scripts \ + "${ROOT}"/var/log/zabbix \ + "${ROOT}"/var/run/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 + ebeep 3 + epause 5 + ;; + esac + fi +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with oracle) \ + $(use_with 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 \ + /var/run/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/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}/1.6.6"/init.d/zabbix-server + dosbin \ + src/zabbix_server/zabbix_server + dodir \ + /usr/share/zabbix/database + insinto /usr/share/zabbix/database + doins -r \ + upgrades \ + create + 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}/1.6.6"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_proxy.conf + dodir \ + /usr/share/zabbix/database + insinto /usr/share/zabbix/database + doins -r \ + upgrades \ + create + 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}/1.6.6"/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 \ + /var/run/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + dodoc README INSTALL NEWS ChangeLog + + 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 +} diff --git a/net-analyzer/zabbix/zabbix-1.8.9.ebuild b/net-analyzer/zabbix/zabbix-1.8.9.ebuild index 536c3b5781d9..c3cc7d5cb822 100644 --- a/net-analyzer/zabbix/zabbix-1.8.9.ebuild +++ b/net-analyzer/zabbix/zabbix-1.8.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.9.ebuild,v 1.1 2011/11/25 02:54:59 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.9.ebuild,v 1.2 2011/11/29 00:08:44 mattm Exp $ EAPI="2" @@ -14,7 +14,7 @@ SRC_URI="http://prdownloads.sourceforge.net/zabbix/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" +KEYWORDS="" IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite3" COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) -- 2.26.2