summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2013-01-18 23:58:34 +0000
committerMatthew Marlowe <mattm@gentoo.org>2013-01-18 23:58:34 +0000
commit06c1e520e984f855da151f8f0a78fe8c0a6f8267 (patch)
tree5c6f5663663ab7537fb7d729b384359acda6a553 /net-analyzer
parentKeyworded amd64-linux and x86-linux (diff)
downloadgentoo-2-06c1e520e984f855da151f8f0a78fe8c0a6f8267.tar.gz
gentoo-2-06c1e520e984f855da151f8f0a78fe8c0a6f8267.tar.bz2
gentoo-2-06c1e520e984f855da151f8f0a78fe8c0a6f8267.zip
Keyword change for 2.0.4-r1, ready for testing arches. Also, minor fix for 2.0 init files.
(Portage version: 2.1.11.43/cvs/Linux x86_64, signed Manifest commit with key 786037A7)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/zabbix/ChangeLog8
-rw-r--r--net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd6
-rw-r--r--net-analyzer/zabbix/files/2.0/init.d/zabbix-server6
-rw-r--r--net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild4
4 files changed, 15 insertions, 9 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 115dcb0efd40..17e19a76710e 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -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.112 2013/01/18 18:51:53 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.113 2013/01/18 23:58:34 mattm Exp $
+
+ 18 Jan 2013; Matthew Marlowe <mattm@gentoo.org>
+ files/2.0/init.d/zabbix-agentd, files/2.0/init.d/zabbix-server,
+ zabbix-2.0.4-r1.ebuild:
+ Keyword change for 2.0.4-r1, ready for testing arches. Also, minor fix for
+ 2.0 init files.
*zabbix-2.0.4-r1 (18 Jan 2013)
*zabbix-1.8.16 (18 Jan 2013)
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
index e9c967b959de..3ed764acc4ec 100644
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.4 2012/12/27 02:55:43 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.5 2013/01/18 23:58:34 mattm Exp $
pid_file="/var/run/zabbix/zabbix_agentd.pid"
@@ -12,7 +12,7 @@ depend() {
}
start_pre() {
- checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix
+ checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
}
start() {
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
index 4916214546ac..5f91941c545b 100644
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.3 2012/12/27 02:55:43 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.4 2013/01/18 23:58:34 mattm Exp $
pid_file="/var/run/zabbix/zabbix_server.pid"
@@ -10,7 +10,7 @@ depend() {
use mysql postgresql
}
start_pre() {
- checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix
+ checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
}
start() {
diff --git a/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild
index eba2839a9c38..a8f7f4d8c900 100644
--- a/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild
@@ -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.0.4-r1.ebuild,v 1.1 2013/01/18 18:51:53 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild,v 1.2 2013/01/18 23:58:34 mattm Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
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 )