summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2012-05-15 23:09:58 +0000
committerMatthew Marlowe <mattm@gentoo.org>2012-05-15 23:09:58 +0000
commit8c543e9edbd9c1f2ea39056c40ef2887462fd1f5 (patch)
tree3e1abd8b7e50615b4fbb3bec4069c499700409ae
parentBug #415427: PBXT build was broken entirely in 5.1.62, and not actually runni... (diff)
downloadgentoo-2-8c543e9edbd9c1f2ea39056c40ef2887462fd1f5.tar.gz
gentoo-2-8c543e9edbd9c1f2ea39056c40ef2887462fd1f5.tar.bz2
gentoo-2-8c543e9edbd9c1f2ea39056c40ef2887462fd1f5.zip
Revert non-maintainer commit relating to agentd init script. Bug 415941.
(Portage version: 2.1.10.59/cvs/Linux x86_64)
-rw-r--r--net-analyzer/zabbix/ChangeLog8
-rw-r--r--net-analyzer/zabbix/zabbix-1.8.13-r1.ebuild (renamed from net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild)4
2 files changed, 9 insertions, 3 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 24a03f58900c..d670681d7ca7 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/zabbix
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.91 2012/05/13 21:42:17 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.92 2012/05/15 23:09:58 mattm Exp $
+
+*zabbix-1.8.13-r1 (15 May 2012)
+
+ 15 May 2012; Matthew Marlowe <mattm@gentoo.org> -zabbix-1.8.12-r1.ebuild,
+ +zabbix-1.8.13-r1.ebuild:
+ Revert non-maintainer commit relating to agentd init script. Bug 415941.
*zabbix-2.0.0_rc4 (12 May 2012)
*zabbix-1.8.13 (12 May 2012)
diff --git a/net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.13-r1.ebuild
index 3c58137717ff..e2d1f934a361 100644
--- a/net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild,v 1.1 2012/05/11 14:57:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.13-r1.ebuild,v 1.1 2012/05/15 23:09:58 mattm Exp $
EAPI="2"
@@ -291,7 +291,7 @@ src_install() {
"${FILESDIR}/1.6.6"/zabbix_agent.conf \
"${FILESDIR}/1.6.6"/zabbix_agentd.conf
doinitd \
- "${FILESDIR}/1.6.6"/init.d/zabbix-agentd-r1
+ "${FILESDIR}/1.6.6"/init.d/zabbix-agentd
dosbin \
src/zabbix_agent/zabbix_agent \
src/zabbix_agent/zabbix_agentd