2.0 is out of support and has broken deps, move to 2.2

http://www.zabbix.com/life_cycle_and_release_policy

.gitignore

@@ -1 +0,0 @@
-/zabbix-2.0.3-free.tar.gz

dead.package

@@ -0,0 +1 @@
+2.0 is out of support and has broken deps, move to 2.2

sources

@@ -1 +0,0 @@
-10c50c7ff5f605139590e1e03c40026d  zabbix-2.0.3-free.tar.gz

zabbix-1.8.12-fping3.patch

@@ -1,39 +0,0 @@
-diff -up zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c
---- zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3	2012-04-24 16:31:36.000000000 +0200
-+++ zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c	2012-04-24 16:32:31.000000000 +0200
-@@ -42,34 +42,7 @@ static const char	*source_ip6_option = N
- 
- static void	get_source_ip_option(const char *fping, const char **option, unsigned char *checked)
- {
--	FILE	*f;
--	char	*p, tmp[MAX_STRING_LEN];
--
--	zbx_snprintf(tmp, sizeof(tmp), "%s -h 2>&1", fping);
--
--	if (NULL == (f = popen(tmp, "r")))
--		return;
--
--	while (NULL != fgets(tmp, sizeof(tmp), f))
--	{
--		for (p = tmp; isspace(*p); p++)
--			;
--
--		if ('-' == p[0] && 'I' == p[1] && isspace(p[2]))
--		{
--			*option = "-I";
--			break;
--		}
--
--		if ('-' == p[0] && 'S' == p[1] && isspace(p[2]))
--		{
--			*option = "-S";
--			break;
--		}
--	}
--
--	pclose(f);
--
-+	*option = "-S";
- 	*checked = 1;
- }
- 

zabbix-2.0.1-no-flash.patch

@@ -1,11 +0,0 @@
-diff -up zabbix-2.0.1/frontends/php/include/screens.inc.php.orig zabbix-2.0.1/frontends/php/include/screens.inc.php
---- zabbix-2.0.1/frontends/php/include/screens.inc.php.orig	2012-06-27 23:03:03.000000000 +0200
-+++ zabbix-2.0.1/frontends/php/include/screens.inc.php	2012-07-12 16:29:02.000000000 +0200
-@@ -25,7 +25,6 @@ require_once dirname(__FILE__).'/js.inc.
- 
- function screen_resources($resource = null) {
- 	$resources = array(
--		SCREEN_RESOURCE_CLOCK => _('Clock'),
- 		SCREEN_RESOURCE_DATA_OVERVIEW => _('Data overview'),
- 		SCREEN_RESOURCE_GRAPH => _('Graph'),
- 		SCREEN_RESOURCE_ACTIONS => _('History of actions'),

zabbix-2.0.2-config.patch

@@ -1,22 +0,0 @@
-diff -Nur zabbix-2.0.2/frontends/php/include/config.inc.php zabbix-2.0.2-conf/frontends/php/include/config.inc.php
---- zabbix-2.0.2/frontends/php/include/config.inc.php	2012-07-31 11:16:47.000000000 +0200
-+++ zabbix-2.0.2-conf/frontends/php/include/config.inc.php	2012-09-04 00:07:03.217816413 +0200
-@@ -31,7 +31,7 @@
- CProfiler::getInstance()->start();
- 
- require_once dirname(__FILE__).'/profiles.inc.php';
--require_once dirname(__FILE__).'/../conf/maintenance.inc.php';
-+require_once '/etc/zabbix/web/maintenance.inc.php';
- 
- // abc sorting
- require_once dirname(__FILE__).'/acknow.inc.php';
-@@ -64,8 +64,7 @@
- $USER_RIGHTS = array();
- $ZBX_LOCALNODEID = 0;
- $ZBX_LOCMASTERID = 0;
--$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
--$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).DIRECTORY_SEPARATOR.basename($ZBX_CONFIGURATION_FILE);
-+$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
- 
- // include tactical overview modules
- require_once dirname(__FILE__).'/locales.inc.php';

zabbix-2.0.3-fonts-config.patch

@@ -1,12 +0,0 @@
-diff -Nur zabbix-2.0.3/frontends/php/include/defines.inc.php zabbix-2.0.3-fonts/frontends/php/include/defines.inc.php
---- zabbix-2.0.3/frontends/php/include/defines.inc.php	2012-10-03 16:41:36.000000000 +0200
-+++ zabbix-2.0.3-fonts/frontends/php/include/defines.inc.php	2012-10-05 23:47:17.341790748 +0200
-@@ -34,7 +34,7 @@
- 
- define('ZBX_WIDGET_ROWS', 20);
- 
--define('ZBX_FONTPATH',				realpath('fonts')); // where to search for font (GD > 2.0.18)
-+define('ZBX_FONTPATH',				'/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18)
- define('ZBX_GRAPH_FONT_NAME',		'DejaVuSans'); // font file name
- define('ZBX_GRAPH_LEGEND_HEIGHT',	120); // when graph height is less then this value, some legend will not show up
- 

zabbix-agent.init

@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 86 14
-# description: Zabbix agent daemon
-# processname: zabbix_agentd
-# config: /etc/zabbix/zabbix_agentd.conf
-#
-
-### BEGIN INIT INFO
-# Provides: zabbix-agent
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
-# Should-Start: zabbix zabbix-proxy
-# Should-Stop: zabbix zabbix-proxy
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: Start and stop Zabbix agent
-# Description: Zabbix agent
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec=/usr/sbin/zabbix_agentd
-prog=${exec##*/}
-syscf=zabbix-agent
-lockfile=/var/lock/subsys/zabbix-agent
-[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
-
-start()
-{
-    echo -n $"Starting Zabbix agent: "
-    daemon --user zabbix $exec
-    rv=$?
-    echo
-    [ $rv -eq 0 ] && touch $lockfile
-    return $rv
-}
-
-stop()
-{
-    echo -n $"Shutting down Zabbix agent: "
-    killproc $prog
-    rv=$?
-    echo
-    [ $rv -eq 0 ] && rm -f $lockfile
-    return $rv
-}
-
-restart()
-{
-    stop
-    start
-}
-
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    force-reload)
-        restart
-        ;;
-    status)
-        status $prog
-        ;;
-    try-restart|condrestart)
-        if status $prog >/dev/null ; then
-            restart
-        fi
-        ;;
-    reload)
-        action $"Service ${0##*/} does not support the reload action: " /bin/false
-        exit 3
-        ;;
-    *)
-	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
-	exit 2
-	;;
-esac
-

zabbix-agent.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Zabbix Monitor Agent
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/zabbix_agentd
-RemainAfterExit=yes
-User=zabbix
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target

zabbix-fedora.README

@@ -1,115 +0,0 @@
-=Custom in Fedora=
-
-_Web configuration_
-
-Web configuration resides in /etc/zabbix/web.
-
-
-_Log files_
-
-Log files are located in /var/log/zabbix.
-
-
-_Where's my Flash watch?_
-
-It's not included in Fedora! Fedora's policy does not allow to include blobs.
-
-
-_No htaccess files_
-
-Fedora ships an Apache configuration file instead. This solutions performs
-better and is easier to maintain.
-
-
-=Additional changes from 1.8 to 2.0 in Fedora=
-
-_Zabbix 2.0 packages conflict Zabbix 1.8_
-
-This measure was taken because this major version introduces various database
-schema changes. A silent update would render Zabbix inoperational and possibly
-break the database. Besides that, Zabbix 2.0 server only works with other 2.0
-servers and proxies. Distributed setups must therefore be updated at the same
-time.
-
-http://www.zabbix.com/documentation/2.0/manual/appendix/compatibility
-
-
-_Two users_
-
-There's a certain security risk involved, running agent and proxy/server as the
-same user. This package therefore introduces an additional zabbixsrv user, used
-for proxy and server. Please check the permissions of your scripts and group
-memberships, if necessary.
-
-
-_Using the Alternatives system instead of conflicting sub-packages_
-
-You can now install Zabbix proxies or servers compiled for different database
-backends on the same system. While this is not intended to happily switch back
-and forth, it allows you to:
-
-- Stop the daemon
-- "Run alternatives --config zabbix-server" or "alternatives --config
-  zabbix-proxy"
-- Make your choice
-- If you're using systemd, run systemctl reload
-- Adjust the configuration file
-- Start the daemon
-#TODO: Why does it need "restart" in cases?
-
-Alternatives considers the first installed implementation of server or proxy as
-default respectively.
-
-Don't forget to reconfigure the frontend when you switch the server to a
-different DB implementation!
-
-
-_Configuration changes_
-
-Zabbix 2.0 places configuration files directly in /etc and a couple of
-sub-directories. Symlinks preserve compatibility. maintenance.inc.php also moved
-to /etc/zabbix/web.  #TODO: Didn't install *.conf.d directories
-
-
-_Alert and media scripts_
-
-The Alert and media script directories have moved to /var/lib/zabbixsrv.
-Symlinks preserver compatibility.
-
-/var/lib/zabbix is now intended for scripts run by the agent. Please move your
-server or proxy scripts to /var/lib/zabbixsrv. Be sure to check permissions and
-ownership.
-
-
-_No Java bridge_
-
-The Zabbix Java bridge can not be included now, due to legal issue with one of
-the modules (json).
-
-
-_No Sqlite frontend or server implementation_
-
-Sadly it doesn't work with how Fedora's/EPEL's PHP is compiled.
-
-
---------------------------------------------------------------------------------
-
-_Guide for updating to 2.0_
-
-http://www.zabbix.com/documentation/2.0/manual/installation/upgrade_notes
-
-Picking the relevant steps from
-http://www.zabbix.com/documentation/2.0/manual/installation/upgrade
-
-- Stop the Zabbix server/proxy
-TODO: Did it already stop when uninstalling 1.8? 
-- Back up the Zabbix database (really!)
-- Make sure the database user has sufficing permissions.
-- Run the fitting database update script/s
-- The scripts can run very long, depending on the content of your database and
-  your hardware; A case running 90 hours was reported. 2.0.3 should improve the
-  situation a lot.
-- Review all rpmnew and rpmsave files; merge where necessary
-- Review permissions, ownerships and group memberships for zabbixsrv
-
-Volker Fröhlich volker27@gmx.at Sep 15 2012

zabbix-logrotate.in

@@ -1,7 +0,0 @@
-/var/log/zabbix/zabbix_COMPONENT.log {
-	missingok
-	monthly
-	notifempty
-	compress
-	create 0664 zabbix zabbix
-}

zabbix-proxy-mysql.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Zabbix MySQL Proxy Agent
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/zabbix_proxy
-RemainAfterExit=yes
-User=zabbixsrv
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target

zabbix-proxy-pgsql.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Zabbix PostgreSQL Proxy Agent
-After=syslog.target network.target postgresql.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/zabbix_proxy
-RemainAfterExit=yes
-User=zabbixsrv
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target

zabbix-proxy-sqlite3.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Zabbix SQLite3 Proxy Agent
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/zabbix_proxy
-RemainAfterExit=yes
-User=zabbixsrv
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target

zabbix-proxy.init

@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 85 15
-# description: Zabbix proxy daemon
-# config: /etc/zabbix/zabbix_proxy.conf
-#
-
-### BEGIN INIT INFO
-# Provides: zabbix-proxy
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: Start and stop Zabbix proxy
-# Description: Zabbix proxy
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec=zabbix_proxy
-prog=${exec##*/}
-lockfile=/var/lock/subsys/zabbix-proxy
-conf=
-syscf=zabbix-proxy
-[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
-
-start()
-{
-    echo -n $"Starting Zabbix proxy: "
-    daemon --user zabbixsrv $exec
-    rv=$?
-    echo
-    [ $rv -eq 0 ] && touch $lockfile
-    return $rv
-}
-
-stop()
-{
-    echo -n $"Shutting down Zabbix proxy: "
-    killproc $prog
-    rv=$?
-    echo
-    [ $rv -eq 0 ] && rm -f $lockfile
-    return $rv
-}
-
-restart()
-{
-    stop
-    start
-}
-
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    force-reload)
-        restart
-        ;;
-    status)
-        status $prog
-        ;;
-    try-restart|condrestart)
-        if status $prog >/dev/null ; then
-            restart
-        fi
-        ;;
-    reload)
-        action $"Service ${0##*/} does not support the reload action: " /bin/false
-        exit 3
-        ;;
-    *)
-	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
-	exit 2
-	;;
-esac
-

zabbix-server-mysql.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Zabbix Server with MySQL DB
-After=syslog.target network.target mysqld.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/zabbix_server
-RemainAfterExit=yes
-User=zabbixsrv
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target

zabbix-server-pgsql.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Zabbix Server with PostgreSQL DB
-After=syslog.target network.target postgresql.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/zabbix_server
-RemainAfterExit=yes
-User=zabbixsrv
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target

zabbix-server.init

@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 85 15
-# description: Zabbix server daemon
-# config: /etc/zabbix/zabbix_server.conf
-#
-
-### BEGIN INIT INFO
-# Provides: zabbix
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: Start and stop Zabbix server
-# Description: Zabbix server
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec=zabbix_server
-prog=${exec##*/}
-lockfile=/var/lock/subsys/zabbix
-syscf=zabbix-server
-[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
-
-start()
-{
-    echo -n $"Starting Zabbix server: "
-    daemon --user zabbixsrv $exec
-    rv=$?
-    echo
-    [ $rv -eq 0 ] && touch $lockfile
-    return $rv
-}
-
-stop()
-{
-    echo -n $"Shutting down Zabbix server: "
-    killproc $prog
-    rv=$?
-    echo
-    [ $rv -eq 0 ] && rm -f $lockfile
-    return $rv
-}
-
-restart()
-{
-    stop
-    start
-}
-
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    force-reload)
-        restart
-        ;;
-    status)
-        status $prog
-        ;;
-    try-restart|condrestart)
-        if status $prog >/dev/null ; then
-            restart
-        fi
-        ;;
-    reload)
-        action $"Service ${0##*/} does not support the reload action: " /bin/false
-        exit 3
-        ;;
-    *)
-	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
-	exit 2
-	;;
-esac
-

zabbix-tmpfiles.conf

@@ -1 +0,0 @@
-D /var/run/zabbix 0755 zabbix zabbix -

zabbix-web.conf

@@ -1,48 +0,0 @@
-#
-# Zabbix monitoring system php web frontend
-#
-
-Alias /zabbix /usr/share/zabbix
-
-<Directory "/usr/share/zabbix">
-    Options FollowSymLinks
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-<Directory "/usr/share/zabbix/conf">
-    Order deny,allow
-    Deny from all
-    <files *.php>
-        Order deny,allow
-        Deny from all
-    </files>
-</Directory>
-
-<Directory "/usr/share/zabbix/api">
-    Order deny,allow
-    Deny from all
-    <files *.php>
-        Order deny,allow
-        Deny from all
-    </files>
-</Directory>
-
-<Directory "/usr/share/zabbix/include">
-    Order deny,allow
-    Deny from all
-    <files *.php>
-        Order deny,allow
-        Deny from all
-    </files>
-</Directory>
-
-<Directory "/usr/share/zabbix/include/classes">
-    Order deny,allow
-    Deny from all
-    <files *.php>
-        Order deny,allow
-        Deny from all
-    </files>
-</Directory>