From: Wolfram Schlich Date: Mon, 16 Apr 2007 16:27:09 +0000 (+0000) Subject: version bump wrt bug #173074 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fbf22a440bc2e5c9747d10cd3a79cb79b99e485;p=gentoo.git version bump wrt bug #173074 Package-Manager: portage-2.1.2.3 --- diff --git a/net-analyzer/zabbix-server/ChangeLog b/net-analyzer/zabbix-server/ChangeLog index 6cdfdfa6a75c..dd7d8ba6d914 100644 --- a/net-analyzer/zabbix-server/ChangeLog +++ b/net-analyzer/zabbix-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/zabbix-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.13 2007/02/13 22:04:03 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.14 2007/04/16 16:27:09 wschlich Exp $ + +*zabbix-server-1.1.7 (16 Apr 2007) + + 16 Apr 2007; Wolfram Schlich + +files/1.1.7/init.d/zabbix-server, +files/1.1.7/zabbix_server.conf, + +zabbix-server-1.1.7.ebuild: + version bump wrt bug #173074 13 Feb 2007; Wolfram Schlich zabbix-server-1.1.6.ebuild: diff --git a/net-analyzer/zabbix-server/Manifest b/net-analyzer/zabbix-server/Manifest index e90480687f59..b63e38b0316c 100644 --- a/net-analyzer/zabbix-server/Manifest +++ b/net-analyzer/zabbix-server/Manifest @@ -34,6 +34,14 @@ AUX 1.1.6/zabbix_server.conf 2443 RMD160 01b2f8d48375abf01d22fa7bca82f55fe615105 MD5 ce48345e4edfa73592e122c2a960e51a files/1.1.6/zabbix_server.conf 2443 RMD160 01b2f8d48375abf01d22fa7bca82f55fe6151059 files/1.1.6/zabbix_server.conf 2443 SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4 files/1.1.6/zabbix_server.conf 2443 +AUX 1.1.7/init.d/zabbix-server 571 RMD160 4a804aa36803e7c03fe909dfd250753a91815526 SHA1 65a168b91ec1f697efab4e7b0557457cb6ffa033 SHA256 ef3597426760414fb70a5b56275b3d27fcd1fe4e177f10aeab6c5d02ec764961 +MD5 08bc27c4b61a0ce522a7efe5b560c05e files/1.1.7/init.d/zabbix-server 571 +RMD160 4a804aa36803e7c03fe909dfd250753a91815526 files/1.1.7/init.d/zabbix-server 571 +SHA256 ef3597426760414fb70a5b56275b3d27fcd1fe4e177f10aeab6c5d02ec764961 files/1.1.7/init.d/zabbix-server 571 +AUX 1.1.7/zabbix_server.conf 2443 RMD160 01b2f8d48375abf01d22fa7bca82f55fe6151059 SHA1 888914b480f3f3fedbdf66356baf7cf9b0ee063b SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4 +MD5 ce48345e4edfa73592e122c2a960e51a files/1.1.7/zabbix_server.conf 2443 +RMD160 01b2f8d48375abf01d22fa7bca82f55fe6151059 files/1.1.7/zabbix_server.conf 2443 +SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4 files/1.1.7/zabbix_server.conf 2443 AUX 1.1/init.d/zabbix-server 569 RMD160 7fd0ec8870f94769815017659a73e1bddaed4973 SHA1 3ed7f9640c25e955b03734321051631a30d3809b SHA256 c4581d0251866cfc23cad9d7038c299cc38a410e46c89809d47367418e193e0f MD5 2d0614aa4306e4621d65564824734ee2 files/1.1/init.d/zabbix-server 569 RMD160 7fd0ec8870f94769815017659a73e1bddaed4973 files/1.1/init.d/zabbix-server 569 @@ -64,6 +72,7 @@ RMD160 b90a6c61ffe5206f9f155979845f82e4ee71de26 files/1.1_alpha7/zabbix_trapper. SHA256 3ae307895c9a7189e29c4ebf7479ce08d4c3bbe1a7f0a3554828170dac417bab files/1.1_alpha7/zabbix_trapper.conf 762 DIST zabbix-1.0.tar.gz 1847471 RMD160 b09b509a05adf1962449356e6a24a9b36a7c914b SHA1 5faf38086f581583953853d9c659b3ac2a37e342 SHA256 3368a2bd825fdc32075b469779037e556b3d02b64bcf8412cd3b8988cafb5e2e DIST zabbix-1.1.6.tar.gz 1541835 RMD160 93694315a710811631591554807d571de25922c6 SHA1 5756723736d44dad5614a22bead34fb3015fd344 SHA256 348b395df68a808c25cb96287bbb0460e531e46049b6be1bd5be236365022281 +DIST zabbix-1.1.7.tar.gz 1515333 RMD160 f09833ec59639dce6d83a7739f7a626ec6f8df0b SHA1 1d9344954ee5b372fa1c0b5ce7e65375d91cd378 SHA256 6354cd7ab311212f027e71ca78ff607f50b6323fe044d50ec1b76dc6b2878f20 DIST zabbix-1.1.tar.gz 1110644 RMD160 4ef49a92117ef4aa9a2369d49008582f7db14b5f SHA1 9ec25938086615a4d00ce745425d0b49d2a94796 SHA256 c544e8b1ba9e3fc62ed283bab058ad753cf3e9ed39ab2aee97c75d483ddfcfa5 DIST zabbix-1.1alpha7.tar.gz 654347 RMD160 2d888d1b22c44d8acd0feb41b51fc14f1c5da357 SHA1 eec928217bd0414181925155636b6003ad16eba4 SHA256 31509e7106c2ff6f197a298b5c8256e24d9b0c9dd9d1d7fe1d81c49393ea471d EBUILD zabbix-server-1.0.ebuild 3101 RMD160 bf1495f65400a85fdeab52e557655459dd35903e SHA1 fc57e608b72fca3b670c5ae6c798479076cf6c9e SHA256 658f8c88a5b1876fe6eda135fc68670614dfd610692f09fb36d535524d8831c5 @@ -74,6 +83,10 @@ EBUILD zabbix-server-1.1.6.ebuild 5183 RMD160 149fa9fde379adf0e759b846e62838aaf6 MD5 0aeff6237cf5470e3cc87be32f2544f6 zabbix-server-1.1.6.ebuild 5183 RMD160 149fa9fde379adf0e759b846e62838aaf68e961a zabbix-server-1.1.6.ebuild 5183 SHA256 b1654164ca54906d350c4cde1bdd367fb3ecb03bb0dc39f5a50ee9a83f884f01 zabbix-server-1.1.6.ebuild 5183 +EBUILD zabbix-server-1.1.7.ebuild 5183 RMD160 e8c5ab3aec1289d546851236e8c1c3b3834fb0e9 SHA1 026b31daf5c9edfa0f1d5e985ca355aaa3229cb2 SHA256 7243d51fd5a590de694fc83ff193738b138750f597978e34c1ddaff6819a2333 +MD5 992f86485265aa86cd49dd178abebb8e zabbix-server-1.1.7.ebuild 5183 +RMD160 e8c5ab3aec1289d546851236e8c1c3b3834fb0e9 zabbix-server-1.1.7.ebuild 5183 +SHA256 7243d51fd5a590de694fc83ff193738b138750f597978e34c1ddaff6819a2333 zabbix-server-1.1.7.ebuild 5183 EBUILD zabbix-server-1.1.ebuild 4499 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e SHA1 b8311cfe429043879439bf34d46775f8c6981bb9 SHA256 cbd584bec998673259a49e69949bf7dd4f9c11f1951a066a7218192255af27e0 MD5 9d40eb55431a65d836c3db2aea3e2618 zabbix-server-1.1.ebuild 4499 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e zabbix-server-1.1.ebuild 4499 @@ -82,10 +95,10 @@ EBUILD zabbix-server-1.1_alpha7.ebuild 2922 RMD160 743cccb3d05540c6d2d7620b7fbde MD5 bf4b03ca87fddbd33e7d244948040483 zabbix-server-1.1_alpha7.ebuild 2922 RMD160 743cccb3d05540c6d2d7620b7fbde6aaf37678cc zabbix-server-1.1_alpha7.ebuild 2922 SHA256 6557acf7a2d9c46279568fb300b6007b3380bcfafca88cf857a1b797755148f2 zabbix-server-1.1_alpha7.ebuild 2922 -MISC ChangeLog 4236 RMD160 b07e443aee20b16e85b2e7fcf80a7ab85b6b0bab SHA1 323b2825c262a2b2bea09262c82f549eb3d8a8e5 SHA256 8e40f28a27e5018f4051258acc431649f1fb69fac906764adfb2f57d9b85ffbd -MD5 692c37d4cf26ab81b688655ac46ead33 ChangeLog 4236 -RMD160 b07e443aee20b16e85b2e7fcf80a7ab85b6b0bab ChangeLog 4236 -SHA256 8e40f28a27e5018f4051258acc431649f1fb69fac906764adfb2f57d9b85ffbd ChangeLog 4236 +MISC ChangeLog 4458 RMD160 56effcce51ef27e40693940bf89555a85c40ad93 SHA1 c9aec73386d49df7cc504059cc17f69dd810ca7c SHA256 dc446405814b33c30110a53d5a3d7a85c1f1065cde71cd1b1fc2ba96a0ecd327 +MD5 f9305182a24d518ee573d3506ddd122b ChangeLog 4458 +RMD160 56effcce51ef27e40693940bf89555a85c40ad93 ChangeLog 4458 +SHA256 dc446405814b33c30110a53d5a3d7a85c1f1065cde71cd1b1fc2ba96a0ecd327 ChangeLog 4458 MISC metadata.xml 630 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c SHA1 88bffe8fc9f05440edecef1fdc65f4c6dbb6f735 SHA256 770d0897320974215ae8d520cc2f56761e9b53dfa85e9e3081bff1427d8aa03c MD5 d86acab58212886771ef2bf837a2e8b9 metadata.xml 630 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c metadata.xml 630 @@ -99,6 +112,9 @@ SHA256 0da858ef9c249d9fe814beefe60ef90c8012f70f022b2f575e6d716d2736971a files/di MD5 a1d0f58cac49c5da094531e5fb68dc63 files/digest-zabbix-server-1.1.6 241 RMD160 4db2dcb67da46b927c769925ad5b586c560640d8 files/digest-zabbix-server-1.1.6 241 SHA256 701463cc9616bad36a48d8c41e6c6df6550247feb98d30f43c78d265f575c87b files/digest-zabbix-server-1.1.6 241 +MD5 a2e7e970e0e0a45832348ef0165a2a85 files/digest-zabbix-server-1.1.7 241 +RMD160 532a36f6d2aef3f587a4fe53c2a7c7ab0954ae53 files/digest-zabbix-server-1.1.7 241 +SHA256 d7a1ed6f251467f2d81365f7aa93084348a22d2be59a7b1cfd03daccbb001017 files/digest-zabbix-server-1.1.7 241 MD5 f080085af8be8617c2127c13020f434f files/digest-zabbix-server-1.1_alpha7 250 RMD160 0e1d1cc3a6a8372bcb03234e4d86e8dca54a9e71 files/digest-zabbix-server-1.1_alpha7 250 SHA256 860ee7a38728bba5a07f32aad43c100948075272e4d527aae150f59fa06785ca files/digest-zabbix-server-1.1_alpha7 250 diff --git a/net-analyzer/zabbix-server/files/1.1.7/init.d/zabbix-server b/net-analyzer/zabbix-server/files/1.1.7/init.d/zabbix-server new file mode 100644 index 000000000000..c277757a6f55 --- /dev/null +++ b/net-analyzer/zabbix-server/files/1.1.7/init.d/zabbix-server @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.1.7/init.d/zabbix-server,v 1.1 2007/04/16 16:27:09 wschlich Exp $ + +depend() { + need net + use mysql postgresql +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid + eend $? +} diff --git a/net-analyzer/zabbix-server/files/1.1.7/zabbix_server.conf b/net-analyzer/zabbix-server/files/1.1.7/zabbix_server.conf new file mode 100644 index 000000000000..12490f881130 --- /dev/null +++ b/net-analyzer/zabbix-server/files/1.1.7/zabbix_server.conf @@ -0,0 +1,98 @@ +# This is config file for ZABBIX server process +# To get more information about ZABBIX, +# go http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +# This defines which server this is. +# Default value 1 +# This parameter must be between 1 and 255 +Server=1 + +# Number of pre-forked instances of pollers +# Default value is 6 +# This parameter must be between 6 and 255 +StartPollers=6 + +# Number of pre-forked instances of trappers +# Default value is 5 +# This parameter must be between 2 and 255 +StartTrappers=5 + +# Listen interface for trapper. Trapper will listen all network interfaces +# if this parameter is missing. +ListenIP=127.0.0.1 + +# Listen port for trapping. Default port number is 10051. This parameter +# must be between 1024 and 32767 +ListenPort=10051 + +# How often ZABBIX will perform housekeeping procedure +# (in hours) +# Default value is 1 hour +# Housekeeping is removing unnecessary information from +# tables history, alert, and alarms +# This parameter must be between 1 and 24 +HousekeepingFrequency=1 + +# How often ZABBIX will try to send unsent alerts +# (in seconds) +# Default value is 30 seconds +SenderFrequency=30 + +# Uncomment this line to disable housekeeping procedure +#DisableHousekeeping=1 + +# Specifies debug level +# 0 - debug is not created +# 1 - critical information +# 2 - error information +# 3 - warnings (default) +# 4 - for debugging (produces lots of information) +DebugLevel=3 + +# Specifies how long we wait for agent (in sec) +# Must be between 1 and 30 +Timeout=5 + +# After how many seconds of unreachability treat a host as unavailable +UnreachablePeriod=45 + +# How ofter check host for availability during the unreachability period +UnavailableDelay=15 + +# How ofter check host for availability during the unavailability period +UnavailableDelay=60 + +# Name of PID file +PidFile=/var/run/zabbix/zabbix_server.pid + +# Name of log file +# If not set, syslog is used +LogFile=/var/log/zabbix/zabbix_server.log + +#Location for custom alert scripts +AlertScriptsPath=/var/lib/zabbix/scripts + +#Location of 'fping. Default is /usr/sbin/fping +FpingLocation=/usr/sbin/fping + +# Frequency of ICMP pings. Defauls is 30 second. +PingerFrequency=30 + +# Database host name +# Default is localhost +DBHost=localhost + +# Database name +DBName=zabbix + +# Database user +DBUser=zabbix + +# Database password +# Comment this line if no password used +DBPassword=zabbix + +# Connect to MySQL using Unix socket? +#DBSocket=/var/run/mysqld/mysqld.sock diff --git a/net-analyzer/zabbix-server/files/digest-zabbix-server-1.1.7 b/net-analyzer/zabbix-server/files/digest-zabbix-server-1.1.7 new file mode 100644 index 000000000000..2926f2e1c561 --- /dev/null +++ b/net-analyzer/zabbix-server/files/digest-zabbix-server-1.1.7 @@ -0,0 +1,3 @@ +MD5 ac24ab58ef1a985c1e2a5217386d5dba zabbix-1.1.7.tar.gz 1515333 +RMD160 f09833ec59639dce6d83a7739f7a626ec6f8df0b zabbix-1.1.7.tar.gz 1515333 +SHA256 6354cd7ab311212f027e71ca78ff607f50b6323fe044d50ec1b76dc6b2878f20 zabbix-1.1.7.tar.gz 1515333 diff --git a/net-analyzer/zabbix-server/zabbix-server-1.1.7.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.1.7.ebuild new file mode 100644 index 000000000000..7d8b2bf4faff --- /dev/null +++ b/net-analyzer/zabbix-server/zabbix-server-1.1.7.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1.7.ebuild,v 1.1 2007/04/16 16:27:09 wschlich Exp $ + +inherit eutils + +MY_P=${PN//-server/} +MY_PV=${PV//_/} +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers. Server part." +HOMEPAGE="http://www.zabbix.com/" +SRC_URI="mirror://sourceforge/zabbix/${MY_P}-${MY_PV}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="ldap mysql oracle postgres snmp" +DEPEND="virtual/libc + snmp? ( net-analyzer/net-snmp ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/libpq )" +RDEPEND="${RDEPEND} net-analyzer/fping" + +S=${WORKDIR}/${MY_P}-${MY_PV} + +pkg_setup() { + local dbnum dbtypes="mysql postgres oracle" dbtype + declare -i dbnum=0 + for dbtype in ${dbtypes}; do + useq ${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 useq 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 + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +pkg_postinst() { + einfo + einfo "You need to configure your database for Zabbix." + einfo + einfo "Have a look at /usr/share/zabbix/database for" + einfo "database creation and upgrades." + einfo + einfo "For more info read the Zabbix manual at" + einfo "http://www.zabbix.com/manual/v1.1/" + einfo + + zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )" + 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 + + # repeat fowners/fperms functionality from src_install() + # here to catch wrong permissions on existing files in + # the live filesystem (yeah, that sucks). + chown zabbix:zabbix \ + ${ROOT}etc/zabbix \ + ${ROOT}etc/zabbix/zabbix_server.conf \ + ${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_server.conf + 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 + + # 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 +} + +src_compile() { + econf \ + --enable-server \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with oracle) \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix \ + /usr/share/zabbix/database + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + insinto /etc/zabbix + doins ${FILESDIR}/${PV}/zabbix_server.conf + + doinitd ${FILESDIR}/${PV}/init.d/zabbix-server + + fowners zabbix:zabbix \ + /etc/zabbix \ + /etc/zabbix/zabbix_server.conf \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + fperms 0640 \ + /etc/zabbix/zabbix_server.conf + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix/database + doins -r upgrades create + + dodoc README INSTALL NEWS ChangeLog +}