Date: Wed, 26 Jul 2006 00:31:11 +0100 (WEST) From: Rui Lopes <rgl@ruilopes.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: asa@gascom.ru Subject: ports/100843: Update port: net-mgmt/zabbix to 1.1.1 Message-ID: <20060725233111.3C4F445071@firebird.clustercube.com> Resent-Message-ID: <200607252340.k6PNeEfc021979@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100843
>Category: ports
>Synopsis: Update port: net-mgmt/zabbix to 1.1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 25 23:40:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rui Lopes
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
>Description:
* Update to 1.1.1
Maybe there should be a ports/UPDATING entry alerting users to the rc.d
rename from zabbix_agent to zabbix_agentd
>How-To-Repeat:
>Fix:
--- update_zabbix_to_1.1.1.patch begins here ---
# Update to 1.1.1
#
# * patch-src-zabbix_sucker-zabbix_sucker.c move to patch-src-zabbix_server-server.c
# * move zabbix_suckerd.sh.in to zabbix_server.sh.in
# * XXX why is the file called zabbix_agent.sh.in instead of zabbix_agentd.sh.in?
# anyways, I've renamed it.
# * move files/zabbix_agent.sh.in to files/zabbix_agentd.sh.in
# * no more /etc/zabbix symlink, because the source files are patched to look for
# the configuration files inside %PREFIX% tree.
# * get rid of the warning:
# ./zabbix_agentd: WARNING: $zabbix_agentd_enable is not set properly - see rc.conf(5).
# * automate pkg-plist creation; usage:
#
# export ROOT=$PWD/ROOT
# mkdir $ROOT
# make PREFIX=$ROOT install x-generate-plist
# mv temp-pkg-plist pkg-plist
# make PREFIX=$ROOT deinstall
#
# make PREFIX=$ROOT -DZABBIX_AGENT_ONLY install x-generate-plist
# mv temp-pkg-plist pkg-plist.agent
# make PREFIX=$ROOT -DZABBIX_AGENT_ONLY deinstall
#
# -- Rui Lopes (rgl ruilopes com)
diff -ruN zabbix.orig/Makefile zabbix/Makefile
--- zabbix.orig/Makefile Thu May 11 23:49:44 2006
+++ zabbix/Makefile Tue Jul 25 20:17:57 2006
@@ -6,8 +6,7 @@
#
PORTNAME= zabbix
-PORTVERSION= 1.0
-PORTREVISION= 4
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES?= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -22,10 +21,14 @@
FPING "Use fping for pinging hosts" on
.endif
+USE_GMAKE= yes
+CONFIGURE_ARGS+=--enable-agent
.ifdef(ZABBIX_AGENT_ONLY)
PKGNAMESUFFIX= -agent
PLIST= ${MASTERDIR}/pkg-plist.agent
.else # ZABBIX_AGENT_ONLY
+CONFIGURE_ARGS+=--enable-server
+# TODO add snmp knob
LIB_DEPENDS= netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
USE_PHP= gd snmp sockets
SUB_FILES= pkg-message
@@ -50,32 +53,36 @@
.endif
.ifndef(WITHOUT_MYSQL)
USE_MYSQL= yes
-CONFIGURE_ARGS= --with-mysql
+CONFIGURE_ARGS+=--with-mysql
.endif
CONFIGURE_ARGS+=--with-net-snmp
.endif # ZABBIX_AGENT_ONLY
-USE_RC_SUBR= zabbix_agent.sh
+USE_RC_SUBR= zabbix_agentd.sh
.if !defined(ZABBIX_AGENT_ONLY)
-USE_RC_SUBR+= zabbix_suckerd.sh
+USE_RC_SUBR+= zabbix_server.sh
.endif
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include
-ZABBIX_BINARIES= zabbix_agent zabbix_agentd zabbix_sender
+ZABBIX_BINARIES= zabbix_agent/zabbix_agent \
+ zabbix_agent/zabbix_agentd \
+ zabbix_get/zabbix_get \
+ zabbix_sender/zabbix_sender
ZABBIX_CONFIGS= zabbix_agent.conf zabbix_agentd.conf
.ifndef(ZABBIX_AGENT_ONLY)
-ZABBIX_BINARIES+= zabbix_suckerd zabbix_trapper zabbix_trapperd
-ZABBIX_CONFIGS+= zabbix_suckerd.conf zabbix_trapper.conf zabbix_trapperd.conf
+ZABBIX_BINARIES+= zabbix_server/zabbix_server
+ZABBIX_CONFIGS+= zabbix_server.conf
.endif
-pre-patch:
.ifndef(ZABBIX_AGENT_ONLY)
post-patch:
- @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c
+ @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c
+ @${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agent.c
+ @${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c
.ifdef WITHOUT_FPING
- @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf
+ @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
.endif
.endif # ZABBIX_AGENT_ONLY
@@ -86,10 +93,9 @@
do-install:
.for FILE in ${ZABBIX_BINARIES}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${PREFIX}/bin
.endfor
${MKDIR} ${PREFIX}/etc/zabbix
- ${LN} -sf ${PREFIX}/etc/zabbix /etc/zabbix
.for FILE in ${ZABBIX_CONFIGS}
${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \
${PREFIX}/etc/zabbix/${FILE}.sample
@@ -107,5 +113,15 @@
.ifndef(ZABBIX_AGENT_ONLY)
@${CAT} ${PKGMESSAGE}
.endif
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,.*/rc.d/.+,,g \
+ ;s,@dirrm share/man(/.*)?$$,,g \
+ ;s,share/zabbix,%%DATADIR%%,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.post.mk>
diff -ruN zabbix.orig/distinfo zabbix/distinfo
--- zabbix.orig/distinfo Mon Jan 23 23:46:06 2006
+++ zabbix/distinfo Tue Jul 25 20:31:53 2006
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.0.tar.gz) = e83a3b92f13942081ed2f3fe3f3084d8
-SHA256 (zabbix-1.0.tar.gz) = 3368a2bd825fdc32075b469779037e556b3d02b64bcf8412cd3b8988cafb5e2e
-SIZE (zabbix-1.0.tar.gz) = 1847471
+MD5 (zabbix-1.1.1.tar.gz) = f46016b55a8450515eb6a797d43781c4
+SHA256 (zabbix-1.1.1.tar.gz) = 2878debb5688a4ff29a530d3bee9b8560aadf07fed40874b96a27e7ed9824206
+SIZE (zabbix-1.1.1.tar.gz) = 1113411
diff -ruN zabbix.orig/files/patch-src-zabbix_agent-zabbix_agent.c zabbix/files/patch-src-zabbix_agent-zabbix_agent.c
--- zabbix.orig/files/patch-src-zabbix_agent-zabbix_agent.c Thu Jan 1 01:00:00 1970
+++ zabbix/files/patch-src-zabbix_agent-zabbix_agent.c Tue Jul 25 19:54:06 2006
@@ -0,0 +1,11 @@
+--- src/zabbix_agent/zabbix_agent.c.orig Tue Jul 25 19:51:28 2006
++++ src/zabbix_agent/zabbix_agent.c Tue Jul 25 19:51:42 2006
+@@ -108,7 +108,7 @@
+
+ if(CONFIG_FILE == NULL)
+ {
+- CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
++ CONFIG_FILE = strdup("%PREFIX%/etc/zabbix/zabbix_agentd.conf");
+ }
+
+ parse_cfg_file(CONFIG_FILE,cfg);
diff -ruN zabbix.orig/files/patch-src-zabbix_agent-zabbix_agentd.c zabbix/files/patch-src-zabbix_agent-zabbix_agentd.c
--- zabbix.orig/files/patch-src-zabbix_agent-zabbix_agentd.c Thu Jan 1 01:00:00 1970
+++ zabbix/files/patch-src-zabbix_agent-zabbix_agentd.c Tue Jul 25 19:54:12 2006
@@ -0,0 +1,11 @@
+--- src/zabbix_agent/zabbix_agentd.c.orig Tue Jul 25 19:51:53 2006
++++ src/zabbix_agent/zabbix_agentd.c Tue Jul 25 19:52:01 2006
+@@ -298,7 +298,7 @@
+
+ if(CONFIG_FILE == NULL)
+ {
+- CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
++ CONFIG_FILE = strdup("%PREFIX%/etc/zabbix/zabbix_agentd.conf");
+ }
+
+ parse_cfg_file(CONFIG_FILE,cfg);
diff -ruN zabbix.orig/files/patch-src-zabbix_server-server.c zabbix/files/patch-src-zabbix_server-server.c
--- zabbix.orig/files/patch-src-zabbix_server-server.c Thu Jan 1 01:00:00 1970
+++ zabbix/files/patch-src-zabbix_server-server.c Tue Jul 25 19:53:28 2006
@@ -0,0 +1,20 @@
+--- src/zabbix_server/server.c.orig Tue Jul 25 17:53:16 2006
++++ src/zabbix_server/server.c Tue Jul 25 17:53:22 2006
+@@ -361,7 +361,7 @@
+
+ if(CONFIG_FILE == NULL)
+ {
+- CONFIG_FILE=strdup("/etc/zabbix/zabbix_server.conf");
++ CONFIG_FILE=strdup("%PREFIX%/etc/zabbix/zabbix_server.conf");
+ }
+
+ parse_cfg_file(CONFIG_FILE,cfg);
+@@ -381,7 +381,7 @@
+ }
+ if(CONFIG_FPING_LOCATION == NULL)
+ {
+- CONFIG_FPING_LOCATION=strdup("/usr/sbin/fping");
++ CONFIG_FPING_LOCATION=strdup("%LOCALBASE%/fping");
+ }
+
+ }
diff -ruN zabbix.orig/files/patch-src-zabbix_sucker-Makefile.in zabbix/files/patch-src-zabbix_sucker-Makefile.in
--- zabbix.orig/files/patch-src-zabbix_sucker-Makefile.in Tue Sep 2 05:55:09 2003
+++ zabbix/files/patch-src-zabbix_sucker-Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
---- src/zabbix_sucker/Makefile.in.orig Mon Sep 1 21:34:12 2003
-+++ src/zabbix_sucker/Makefile.in Mon Sep 1 21:34:37 2003
-@@ -1,7 +1,7 @@
- # Build rules
-
--INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@
--LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@
-+INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@ -I$(LOCALBASE)/include
-+LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@ -L$(LOCALBASE)/lib
-
- all:
-
diff -ruN zabbix.orig/files/patch-src-zabbix_sucker-zabbix_sucker.c zabbix/files/patch-src-zabbix_sucker-zabbix_sucker.c
--- zabbix.orig/files/patch-src-zabbix_sucker-zabbix_sucker.c Wed Jan 14 09:50:37 2004
+++ zabbix/files/patch-src-zabbix_sucker-zabbix_sucker.c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/zabbix_sucker/zabbix_sucker.c.orig Wed Jan 14 07:43:02 2004
-+++ src/zabbix_sucker/zabbix_sucker.c Wed Jan 14 07:43:21 2004
-@@ -254,7 +254,7 @@
- }
- if(CONFIG_FPING_LOCATION == NULL)
- {
-- CONFIG_FPING_LOCATION=strdup("/usr/sbin/fping");
-+ CONFIG_FPING_LOCATION=strdup("%LOCALBASE%/sbin/fping");
- }
- }
-
diff -ruN zabbix.orig/files/zabbix_agent.sh.in zabbix/files/zabbix_agent.sh.in
--- zabbix.orig/files/zabbix_agent.sh.in Tue Nov 1 22:08:04 2005
+++ zabbix/files/zabbix_agent.sh.in Thu Jan 1 01:00:00 1970
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. %%RC_SUBR%%
-
-name="zabbix_agentd"
-rcvar=`set_rcvar`
-command="${prefix}/bin/${name}"
-required_files="/etc/zabbix/${name}.conf"
-
-run_rc_command "$1"
diff -ruN zabbix.orig/files/zabbix_agentd.sh.in zabbix/files/zabbix_agentd.sh.in
--- zabbix.orig/files/zabbix_agentd.sh.in Thu Jan 1 01:00:00 1970
+++ zabbix/files/zabbix_agentd.sh.in Tue Jul 25 19:46:30 2006
@@ -0,0 +1,15 @@
+#!/bin/sh
+# PROVIDE: zabbix_agentd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+. %%RC_SUBR%%
+
+name="zabbix_agentd"
+rcvar=${name}_enable
+load_rc_config $name
+
+command="%%PREFIX%%/bin/${name}"
+required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
+
+run_rc_command "$1"
diff -ruN zabbix.orig/files/zabbix_server.sh.in zabbix/files/zabbix_server.sh.in
--- zabbix.orig/files/zabbix_server.sh.in Thu Jan 1 01:00:00 1970
+++ zabbix/files/zabbix_server.sh.in Tue Jul 25 19:47:59 2006
@@ -0,0 +1,15 @@
+#!/bin/sh
+# PROVIDE: zabbix_server
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+. %%RC_SUBR%%
+
+name="zabbix_server"
+rcvar=${name}_enable
+load_rc_config $name
+
+command="%%PREFIX%%/bin/${name}"
+required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
+
+run_rc_command "$1"
diff -ruN zabbix.orig/files/zabbix_suckerd.sh.in zabbix/files/zabbix_suckerd.sh.in
--- zabbix.orig/files/zabbix_suckerd.sh.in Tue Nov 1 22:08:04 2005
+++ zabbix/files/zabbix_suckerd.sh.in Thu Jan 1 01:00:00 1970
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. %%RC_SUBR%%
-
-name="zabbix_suckerd"
-rcvar=`set_rcvar`
-command="${prefix}/bin/${name}"
-required_files="/etc/zabbix/${name}.conf"
-
-run_rc_command "$1"
diff -ruN zabbix.orig/pkg-plist zabbix/pkg-plist
--- zabbix.orig/pkg-plist Tue Nov 1 22:08:03 2005
+++ zabbix/pkg-plist Tue Jul 25 19:10:04 2006
@@ -1,87 +1,38 @@
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-etc/zabbix/zabbix_suckerd.conf.sample
-etc/zabbix/zabbix_trapper.conf.sample
-etc/zabbix/zabbix_trapperd.conf.sample
bin/zabbix_agent
bin/zabbix_agentd
+bin/zabbix_get
bin/zabbix_sender
-bin/zabbix_suckerd
-bin/zabbix_trapper
-bin/zabbix_trapperd
-%%DATADIR%%/php/audio/disaster_on.wav
-%%DATADIR%%/php/audio/warning_off.wav
-%%DATADIR%%/php/audio/warning_on.wav
-%%DATADIR%%/php/about.php
-%%DATADIR%%/php/actions.php
-%%DATADIR%%/php/alarms.php
-%%DATADIR%%/php/alerts.php
-%%DATADIR%%/php/chart.php
-%%DATADIR%%/php/chart2.php
-%%DATADIR%%/php/chart3.php
-%%DATADIR%%/php/chart4.php
-%%DATADIR%%/php/chart5.php
-%%DATADIR%%/php/chart_diff.php
-%%DATADIR%%/php/chart_sla.php
-%%DATADIR%%/php/charts.php
-%%DATADIR%%/php/compare.php
-%%DATADIR%%/php/config.php
-%%DATADIR%%/php/css.css
-%%DATADIR%%/php/graph.php
-%%DATADIR%%/php/graphs.php
-%%DATADIR%%/php/helpdesk.php
-%%DATADIR%%/php/history.php
-%%DATADIR%%/php/hosts.php
-%%DATADIR%%/php/index.php
-%%DATADIR%%/php/items.php
-%%DATADIR%%/php/latest.php
-%%DATADIR%%/php/latestalarms.php
-%%DATADIR%%/php/map.php
-%%DATADIR%%/php/maps.php
-%%DATADIR%%/php/media.php
-%%DATADIR%%/php/queue.php
-%%DATADIR%%/php/report1.php
-%%DATADIR%%/php/report2.php
-%%DATADIR%%/php/report3.php
-%%DATADIR%%/php/screenconf.php
-%%DATADIR%%/php/screenedit.php
-%%DATADIR%%/php/screens.php
-%%DATADIR%%/php/services.php
-%%DATADIR%%/php/srv_status.php
-%%DATADIR%%/php/sysmap.php
-%%DATADIR%%/php/sysmaps.php
-%%DATADIR%%/php/tr_comments.php
-%%DATADIR%%/php/tr_status.php
-%%DATADIR%%/php/trend.php
-%%DATADIR%%/php/trends.php
-%%DATADIR%%/php/triggers.php
-%%DATADIR%%/php/users.php
-%%DATADIR%%/php/images/sysmaps/old/Notebook.png
-%%DATADIR%%/php/images/sysmaps/old/Hub.png
-%%DATADIR%%/php/images/sysmaps/old/Printer.png
-%%DATADIR%%/php/images/sysmaps/old/Router.png
-%%DATADIR%%/php/images/sysmaps/old/Server.png
-%%DATADIR%%/php/images/sysmaps/old/Workstation.png
-%%DATADIR%%/php/images/sysmaps/UPS.png
-%%DATADIR%%/php/images/sysmaps/Notebook.png
-%%DATADIR%%/php/images/sysmaps/Hub.png
-%%DATADIR%%/php/images/sysmaps/Printer.png
-%%DATADIR%%/php/images/sysmaps/Router.png
-%%DATADIR%%/php/images/sysmaps/Server.png
-%%DATADIR%%/php/images/sysmaps/Workstation.png
-%%DATADIR%%/php/images/sysmaps/README
-%%DATADIR%%/php/images/sysmaps/Phone.png
-%%DATADIR%%/php/images/sysmaps/Network.png
-%%DATADIR%%/php/images/sysmaps/Satellite.png
-%%DATADIR%%/php/include/.htaccess
-%%DATADIR%%/php/include/classes.inc.php
-%%DATADIR%%/php/include/config.inc.php
-%%DATADIR%%/php/include/db.inc.php
-%%DATADIR%%/php/include/defines.inc.php
+bin/zabbix_server
+etc/zabbix/zabbix_agent.conf.sample
+etc/zabbix/zabbix_agentd.conf.sample
+etc/zabbix/zabbix_server.conf.sample
%%DATADIR%%/create/data/data.sql
+%%DATADIR%%/create/dbsetup.sh
%%DATADIR%%/create/mysql/schema.sql
+%%DATADIR%%/create/oracle/schema.sql
%%DATADIR%%/create/postgresql/schema.sql
-%%DATADIR%%/create/dbsetup.sh
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Hub.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Hub_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Network.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Network_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Notebook.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Notebook_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Phone.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Phone_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Printer.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Printer_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Router.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Router_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Satellite.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Satellite_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Server.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Server_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/UPS.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/UPS_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Workstation.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/Workstation_small.png
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0_to_1.1alpha1/postgresql/patch.sql
%%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql
%%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql
%%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql
@@ -100,6 +51,12 @@
%%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql
%%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql
%%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql/patch.sql
%%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
%%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
%%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql
@@ -116,84 +73,336 @@
%%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql
%%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql
%%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql/patch.sql
-@dirrm etc/zabbix
-@dirrm %%DATADIR%%/php/audio
+%%DATADIR%%/dbpatches/1.1alpha10_to_1.1alpha11/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha10_to_1.1alpha11/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha11_to_1.1alpha12/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha11_to_1.1alpha12/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha12_to_1.1beta1/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha12_to_1.1beta1/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha2_to_1.1alpha3/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha2_to_1.1alpha3/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha3_to_1.1alpha4/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha3_to_1.1alpha4/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha4_to_1.1alpha5/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha4_to_1.1alpha5/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha8_to_1.1alpha9/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha8_to_1.1alpha9/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha9_to_1.1alpha10/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1alpha9_to_1.1alpha10/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12/oracle/patch.sql
+%%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta12_to_1.1/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta12_to_1.1/oracle/patch.sql
+%%DATADIR%%/dbpatches/1.1beta12_to_1.1/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta1_to_1.1beta2/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta1_to_1.1beta2/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta2_to_1.1beta3/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta2_to_1.1beta3/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta4_to_1.1beta5/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta4_to_1.1beta5/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta5_to_1.1beta6/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta5_to_1.1beta6/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta6_to_1.1beta7/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta6_to_1.1beta7/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta7_to_1.1beta8/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta7_to_1.1beta8/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta8_to_1.1beta9/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta8_to_1.1beta9/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta9_to_1.1beta10/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.1beta9_to_1.1beta10/postgresql/patch.sql
+%%DATADIR%%/php/acknow.php
+%%DATADIR%%/php/actionconf.php
+%%DATADIR%%/php/actions.php
+%%DATADIR%%/php/alarms.php
+%%DATADIR%%/php/audio/disaster_on.wav
+%%DATADIR%%/php/audio/warning_off.wav
+%%DATADIR%%/php/audio/warning_on.wav
+%%DATADIR%%/php/audit.php
+%%DATADIR%%/php/bulkloader.php
+%%DATADIR%%/php/chart.php
+%%DATADIR%%/php/chart2.php
+%%DATADIR%%/php/chart4.php
+%%DATADIR%%/php/chart5.php
+%%DATADIR%%/php/chart_sla.php
+%%DATADIR%%/php/charts.php
+%%DATADIR%%/php/config.php
+%%DATADIR%%/php/css.css
+%%DATADIR%%/php/events.php
+%%DATADIR%%/php/graph.php
+%%DATADIR%%/php/graphs.php
+%%DATADIR%%/php/history.php
+%%DATADIR%%/php/hostprofiles.php
+%%DATADIR%%/php/hosts.php
+%%DATADIR%%/php/image.php
+%%DATADIR%%/php/images/flash/zbxclock.swf
+%%DATADIR%%/php/images/general/closed.gif
+%%DATADIR%%/php/images/general/help.gif
+%%DATADIR%%/php/images/general/opened.gif
+%%DATADIR%%/php/images/general/sortdown.gif
+%%DATADIR%%/php/images/general/sortdown_off.gif
+%%DATADIR%%/php/images/general/sortup.gif
+%%DATADIR%%/php/images/general/sortup_off.gif
+%%DATADIR%%/php/images/general/zabbix.png
+%%DATADIR%%/php/images/gradients/blink1.gif
+%%DATADIR%%/php/images/gradients/blink2.gif
+%%DATADIR%%/php/images/gradients/button.gif
+%%DATADIR%%/php/images/gradients/menu_not_active.gif
+%%DATADIR%%/php/images/gradients/table_head.gif
+%%DATADIR%%/php/images/gradients/table_head2.gif
+%%DATADIR%%/php/images/sysmaps/Hub.png
+%%DATADIR%%/php/images/sysmaps/Hub_small.png
+%%DATADIR%%/php/images/sysmaps/Network.png
+%%DATADIR%%/php/images/sysmaps/Network_small.png
+%%DATADIR%%/php/images/sysmaps/Notebook.png
+%%DATADIR%%/php/images/sysmaps/Notebook_small.png
+%%DATADIR%%/php/images/sysmaps/Phone.png
+%%DATADIR%%/php/images/sysmaps/Phone_small.png
+%%DATADIR%%/php/images/sysmaps/Printer.png
+%%DATADIR%%/php/images/sysmaps/Printer_small.png
+%%DATADIR%%/php/images/sysmaps/README
+%%DATADIR%%/php/images/sysmaps/Router.png
+%%DATADIR%%/php/images/sysmaps/Router_small.png
+%%DATADIR%%/php/images/sysmaps/Satellite.png
+%%DATADIR%%/php/images/sysmaps/Satellite_small.png
+%%DATADIR%%/php/images/sysmaps/Server.png
+%%DATADIR%%/php/images/sysmaps/Server_small.png
+%%DATADIR%%/php/images/sysmaps/UPS.png
+%%DATADIR%%/php/images/sysmaps/UPS_small.png
+%%DATADIR%%/php/images/sysmaps/Workstation.png
+%%DATADIR%%/php/images/sysmaps/Workstation_small.png
+%%DATADIR%%/php/images/sysmaps/old/Hub.png
+%%DATADIR%%/php/images/sysmaps/old/Notebook.png
+%%DATADIR%%/php/images/sysmaps/old/Printer.png
+%%DATADIR%%/php/images/sysmaps/old/Router.png
+%%DATADIR%%/php/images/sysmaps/old/Server.png
+%%DATADIR%%/php/images/sysmaps/old/Workstation.png
+%%DATADIR%%/php/include/.htaccess
+%%DATADIR%%/php/include/acknow.inc.php
+%%DATADIR%%/php/include/actions.inc.php
+%%DATADIR%%/php/include/audit.inc.php
+%%DATADIR%%/php/include/autoregistration.inc.php
+%%DATADIR%%/php/include/bulkloader.inc.php
+%%DATADIR%%/php/include/classes/.htaccess
+%%DATADIR%%/php/include/classes/cbutton.inc.php
+%%DATADIR%%/php/include/classes/ccheckbox.inc.php
+%%DATADIR%%/php/include/classes/ccombobox.inc.php
+%%DATADIR%%/php/include/classes/cfile.inc.php
+%%DATADIR%%/php/include/classes/cflash.inc.php
+%%DATADIR%%/php/include/classes/cflashclock.mod.php
+%%DATADIR%%/php/include/classes/cform.inc.php
+%%DATADIR%%/php/include/classes/cformtable.inc.php
+%%DATADIR%%/php/include/classes/chelp.inc.php
+%%DATADIR%%/php/include/classes/chostsinfo.mod.php
+%%DATADIR%%/php/include/classes/ciframe.inc.php
+%%DATADIR%%/php/include/classes/cimg.inc.php
+%%DATADIR%%/php/include/classes/clink.inc.php
+%%DATADIR%%/php/include/classes/clistbox.inc.php
+%%DATADIR%%/php/include/classes/cmap.inc.php
+%%DATADIR%%/php/include/classes/cpassbox.inc.php
+%%DATADIR%%/php/include/classes/cserverinfo.mod.php
+%%DATADIR%%/php/include/classes/cspan.inc.php
+%%DATADIR%%/php/include/classes/ctable.inc.php
+%%DATADIR%%/php/include/classes/ctableinfo.inc.php
+%%DATADIR%%/php/include/classes/ctag.inc.php
+%%DATADIR%%/php/include/classes/ctextarea.inc.php
+%%DATADIR%%/php/include/classes/ctextbox.inc.php
+%%DATADIR%%/php/include/classes/ctriggerinfo.mod.php
+%%DATADIR%%/php/include/classes/cvar.inc.php
+%%DATADIR%%/php/include/classes/graph.inc.php
+%%DATADIR%%/php/include/classes/table.inc.php
+%%DATADIR%%/php/include/config.inc.php
+%%DATADIR%%/php/include/copt.lib.php
+%%DATADIR%%/php/include/db.inc.php
+%%DATADIR%%/php/include/defines.inc.php
+%%DATADIR%%/php/include/escalations.inc.php
+%%DATADIR%%/php/include/events.inc.php
+%%DATADIR%%/php/include/forms.inc.php
+%%DATADIR%%/php/include/graphs.inc.php
+%%DATADIR%%/php/include/hosts.inc.php
+%%DATADIR%%/php/include/html.inc.php
+%%DATADIR%%/php/include/items.inc.php
+%%DATADIR%%/php/include/locales.inc.php
+%%DATADIR%%/php/include/locales/cn_zh.inc.php
+%%DATADIR%%/php/include/locales/de_de.inc.php
+%%DATADIR%%/php/include/locales/en_gb.inc.php
+%%DATADIR%%/php/include/locales/fr_fr.inc.php
+%%DATADIR%%/php/include/locales/it_it.inc.php
+%%DATADIR%%/php/include/locales/ja_jp.inc.php
+%%DATADIR%%/php/include/locales/lv_lv.inc.php
+%%DATADIR%%/php/include/locales/ru_ru.inc.php
+%%DATADIR%%/php/include/locales/sp_sp.inc.php
+%%DATADIR%%/php/include/maps.inc.php
+%%DATADIR%%/php/include/media.inc.php
+%%DATADIR%%/php/include/perm.inc.php
+%%DATADIR%%/php/include/profiles.inc.php
+%%DATADIR%%/php/include/screens.inc.php
+%%DATADIR%%/php/include/services.inc.php
+%%DATADIR%%/php/include/triggers.inc.php
+%%DATADIR%%/php/include/users.inc.php
+%%DATADIR%%/php/include/validate.inc.php
+%%DATADIR%%/php/index.php
+%%DATADIR%%/php/items.php
+%%DATADIR%%/php/latest.php
+%%DATADIR%%/php/map.php
+%%DATADIR%%/php/maps.php
+%%DATADIR%%/php/media.php
+%%DATADIR%%/php/overview.php
+%%DATADIR%%/php/popup.php
+%%DATADIR%%/php/profile.php
+%%DATADIR%%/php/queue.php
+%%DATADIR%%/php/report1.php
+%%DATADIR%%/php/report2.php
+%%DATADIR%%/php/report3.php
+%%DATADIR%%/php/report4.php
+%%DATADIR%%/php/report5.php
+%%DATADIR%%/php/screenconf.php
+%%DATADIR%%/php/screenedit.php
+%%DATADIR%%/php/screens.php
+%%DATADIR%%/php/services.php
+%%DATADIR%%/php/srv_status.php
+%%DATADIR%%/php/sysmap.php
+%%DATADIR%%/php/sysmaps.php
+%%DATADIR%%/php/tr_comments.php
+%%DATADIR%%/php/tr_status.php
+%%DATADIR%%/php/triggers.php
+%%DATADIR%%/php/users.php
+%%DATADIR%%/php/vtext.php
+@dirrm %%DATADIR%%/php/include/locales
+@dirrm %%DATADIR%%/php/include/classes
+@dirrm %%DATADIR%%/php/include
@dirrm %%DATADIR%%/php/images/sysmaps/old
@dirrm %%DATADIR%%/php/images/sysmaps
+@dirrm %%DATADIR%%/php/images/gradients
+@dirrm %%DATADIR%%/php/images/general
+@dirrm %%DATADIR%%/php/images/flash
@dirrm %%DATADIR%%/php/images
-@dirrm %%DATADIR%%/php/include
+@dirrm %%DATADIR%%/php/audio
@dirrm %%DATADIR%%/php
-@dirrm %%DATADIR%%/create/data
-@dirrm %%DATADIR%%/create/mysql
-@dirrm %%DATADIR%%/create/postgresql
-@dirrm %%DATADIR%%/create
-@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11
-@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12
-@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1
-@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4
-@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5
-@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7
-@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8
-@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9
-@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10
-@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3
-@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4
-@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5
-@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6
-@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7
-@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8
-@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9
-@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta9_to_1.1beta10/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta9_to_1.1beta10/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta9_to_1.1beta10
+@dirrm %%DATADIR%%/dbpatches/1.1beta8_to_1.1beta9/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta8_to_1.1beta9/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta8_to_1.1beta9
+@dirrm %%DATADIR%%/dbpatches/1.1beta7_to_1.1beta8/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta7_to_1.1beta8/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta7_to_1.1beta8
+@dirrm %%DATADIR%%/dbpatches/1.1beta6_to_1.1beta7/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta6_to_1.1beta7/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta6_to_1.1beta7
+@dirrm %%DATADIR%%/dbpatches/1.1beta5_to_1.1beta6/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta5_to_1.1beta6/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta5_to_1.1beta6
+@dirrm %%DATADIR%%/dbpatches/1.1beta4_to_1.1beta5/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta4_to_1.1beta5/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta4_to_1.1beta5
+@dirrm %%DATADIR%%/dbpatches/1.1beta2_to_1.1beta3/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta2_to_1.1beta3/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta2_to_1.1beta3
+@dirrm %%DATADIR%%/dbpatches/1.1beta1_to_1.1beta2/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta1_to_1.1beta2/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta1_to_1.1beta2
+@dirrm %%DATADIR%%/dbpatches/1.1beta12_to_1.1/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta12_to_1.1/oracle
+@dirrm %%DATADIR%%/dbpatches/1.1beta12_to_1.1/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta12_to_1.1
+@dirrm %%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12/oracle
+@dirrm %%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1beta11_to_1.1beta12
+@dirrm %%DATADIR%%/dbpatches/1.1alpha9_to_1.1alpha10/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha9_to_1.1alpha10/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha9_to_1.1alpha10
+@dirrm %%DATADIR%%/dbpatches/1.1alpha8_to_1.1alpha9/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha8_to_1.1alpha9/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha8_to_1.1alpha9
+@dirrm %%DATADIR%%/dbpatches/1.1alpha4_to_1.1alpha5/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha4_to_1.1alpha5/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha4_to_1.1alpha5
+@dirrm %%DATADIR%%/dbpatches/1.1alpha3_to_1.1alpha4/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha3_to_1.1alpha4/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha3_to_1.1alpha4
+@dirrm %%DATADIR%%/dbpatches/1.1alpha2_to_1.1alpha3/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha2_to_1.1alpha3/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha2_to_1.1alpha3
+@dirrm %%DATADIR%%/dbpatches/1.1alpha12_to_1.1beta1/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha12_to_1.1beta1/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha12_to_1.1beta1
+@dirrm %%DATADIR%%/dbpatches/1.1alpha11_to_1.1alpha12/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha11_to_1.1alpha12/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha11_to_1.1alpha12
+@dirrm %%DATADIR%%/dbpatches/1.1alpha10_to_1.1alpha11/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha10_to_1.1alpha11/mysql
+@dirrm %%DATADIR%%/dbpatches/1.1alpha10_to_1.1alpha11
@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql
@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10
-@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11
-@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13
-@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9
+@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8
+@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7
+@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6
+@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5
+@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4
+@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3
@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql
@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13
+@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11
+@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10
+@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9
+@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8
+@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7
+@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5
+@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4
+@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1
+@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12
+@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11
+@dirrm %%DATADIR%%/dbpatches/1.0_to_1.1alpha1/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0_to_1.1alpha1/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0_to_1.1alpha1
@dirrm %%DATADIR%%/dbpatches
+@dirrm %%DATADIR%%/create/postgresql
+@dirrm %%DATADIR%%/create/oracle
+@dirrm %%DATADIR%%/create/mysql
+@dirrm %%DATADIR%%/create/data
+@dirrm %%DATADIR%%/create
@dirrm %%DATADIR%%
-@exec ln -sf %D/etc/zabbix /etc/zabbix
-@unexec rm /etc/zabbix
+@dirrm etc/zabbix
diff -ruN zabbix.orig/pkg-plist.agent zabbix/pkg-plist.agent
--- zabbix.orig/pkg-plist.agent Sun Oct 26 00:36:31 2003
+++ zabbix/pkg-plist.agent Tue Jul 25 19:09:41 2006
@@ -1,8 +1,7 @@
bin/zabbix_agent
bin/zabbix_agentd
+bin/zabbix_get
bin/zabbix_sender
etc/zabbix/zabbix_agent.conf.sample
etc/zabbix/zabbix_agentd.conf.sample
@dirrm etc/zabbix
-@exec ln -sf %D/etc/zabbix /etc/zabbix
-@unexec rm /etc/zabbix
--- update_zabbix_to_1.1.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060725233111.3C4F445071>