1 files changed, 358 insertions, 149 deletions
diff --git a/net-mgmt/zabbix/pkg-plist b/net-mgmt/zabbix/pkg-plist
index c2c4ab66dfa5..c5f4f7cc7f36 100644
--- a/net-mgmt/zabbix/pkg-plist
+++ b/net-mgmt/zabbix/pkg-plist
@@ -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 @@ bin/zabbix_trapperd
 %%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 @@ bin/zabbix_trapperd
 %%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