[121475] trunk/dports/net/zabbix2

26 Jun 2014

Revision: 121475
          https://trac.macports.org/changeset/121475
Author:   eborisch@macports.org
Date:     2014-06-26 09:03:36 -0700 (Thu, 26 Jun 2014)
Log Message:
-----------
zabbix2[-agent]: Upgrade to 2.2.4

Modified Paths:
--------------
    trunk/dports/net/zabbix2/Portfile
    trunk/dports/net/zabbix2/files/zabbix_server.init
    trunk/dports/net/zabbix2/files/zabbix_server.init.mysql

Modified: trunk/dports/net/zabbix2/Portfile
===================================================================

--- trunk/dports/net/zabbix2/Portfile	2014-06-26 15:55:32 UTC (rev 121474)
+++ trunk/dports/net/zabbix2/Portfile	2014-06-26 16:03:36 UTC (rev 121475)
@@ -4,10 +4,10 @@
 PortSystem          1.0
 
 name                zabbix2
-version             2.2.1
+version             2.2.4
 revision            0
 categories          net
-maintainers         nomaintainer
+maintainers         eborisch, openmaintainer
 platforms           darwin
 
 license             GPL-2
@@ -27,21 +27,18 @@
 master_sites \
     sourceforge:project/zabbix/ZABBIX%20Latest%20Stable/${version} \
     sourceforge:project/zabbix/ZABBIX%20Release%20Candidates/${version}
+dist_subdir         zabbix2
 
 checksums \
-    rmd160  24cfecc6825245b8a3ae15c23ffe38236cd37cd4 \
-    sha256  29c9e4cefb527bf929797b26a5a1d8a07c55675bfe6a86ff9ef8e46bd792c7fb
+    rmd160  fc6043a63975ecb3ba7757e3de52ba82f1978e3a \
+    sha256  33654ed8a74280a38ff89b9deba400e1305086bdf75815f8b76dd6129a9ec781
 
 universal_variant   no
 
-depends_lib         port:OpenIPMI
-
 conflicts           zabbix
 
-dist_subdir         zabbix2
+subport             zabbix2-agent {}
 
-subport zabbix2-agent {}
-
 configure.args      --bindir=${prefix}/bin/zabbix \
                     --sbindir=${prefix}/sbin/zabbix \
                     --libexecdir=${prefix}/libexec/zabbix \
@@ -49,8 +46,6 @@
                     --sysconfdir=${prefix}/etc/zabbix \
                     --localstatedir=${prefix}/var/zabbix
 
-configure.args-append       --with-openipmi=${prefix}
-
 configure.ldflags-append    -lresolv
 
 startupitem.create      yes
@@ -64,9 +59,12 @@
 
     configure.args-append   --enable-agent
 } else {
-    depends_lib-append      port:fping \
+    depends_lib-append      port:apache2 \
                             port:curl \
-                            port:apache2 \
+                            port:fping \
+                            port:libssh2 \
+                            port:net-snmp \
+                            port:OpenIPMI \
                             port:php5 \
                             port:php5-gd \
                             port:php5-gettext \
@@ -75,7 +73,9 @@
 
     configure.args-append   --enable-server \
                             --with-libcurl=${prefix}/bin/curl-config \
-                            --with-net-snmp
+                            --with-net-snmp \
+                            --with-openipmi=${prefix} \
+                            --with-ssh2=${prefix}
 
     startupitem.name        zabbix2-server
     startupitem.start       "${prefix}/share/zabbix/zabbix_server.init start"
@@ -111,7 +111,9 @@
         sqlite3 {"SQLite 3.x"           sqlite3 \
                  sqlite3=${prefix} sqlite}
     }
+
     set DBLIST_KEYS [lsort [array names DBLIST]]
+    
     foreach dbitem $DBLIST_KEYS {
         set this_key [lsearch -exact $DBLIST_KEYS $dbitem]
         set conf_list [lreplace $DBLIST_KEYS $this_key $this_key]
@@ -165,7 +167,7 @@
     }
 
     variant date_slash description {
-        Draw date/month rather than date.month on line graphs.
+        Draw month/day rather than day.month on line graphs.
     } {}
 }
 
@@ -179,7 +181,7 @@
         }
 
         if {[variant_isset date_slash]} {
-            reinplace -E {s|[[:<:]]d\.m[[:>:]]|d/m|g} \
+            reinplace -E {s|[[:<:]]d\.m[[:>:]]|m/d|g} \
                 frontends/php/include/classes/graphdraw/CLineGraphDraw.php
         }
     }
@@ -365,22 +367,22 @@
 ####                                                 ####
 
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! ZABBIX -> ZABBIX2 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!  0) BACK UP YOUR DATABASE                                                !!
-!!                                                                          !!
-!!  1) Be sure to use 'sudo port unload zabbix' to stop the background      !!
-!!     server before deactivating zabbix, and then use                      !!
-!!     'sudo port load zabbix2' **AFTER UPGRADING THE DATABASE** as         !!
-!!     described below.                                                     !!
-!!                                                                          !!
-!!  2) For upgrading from 1.8 (zabbix -> zabbix2), upgrade scripts are      !!
-!!     located in ${prefix}/share/zabbix/upgrades                          !!
-!!                                                                          !!
-!!  For upgrade procedure, please see                                       !!
-!!    http://www.zabbix.com/documentation/2.0/manual/installation/upgrade   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! ZABBIX -> ZABBIX2 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!  0) BACK UP YOUR DATABASE                                              !!
+!!                                                                        !!
+!!  1) Be sure to use 'sudo port unload zabbix' to stop the background    !!
+!!     server before deactivating zabbix, and then use                    !!
+!!     'sudo port load zabbix2' **AFTER UPGRADING THE DATABASE** as       !!
+!!     described below.                                                   !!
+!!                                                                        !!
+!!  2) For upgrading from 1.8 (zabbix -> zabbix2), upgrade scripts are    !!
+!!     located in ${prefix}/share/zabbix/upgrades                        !!
+!!                                                                        !!
+!!  For upgrade procedure, please see                                     !!
+!!    http://www.zabbix.com/documentation/2.0/manual/installation/upgrade !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 "
 }

Modified: trunk/dports/net/zabbix2/files/zabbix_server.init
===================================================================
--- trunk/dports/net/zabbix2/files/zabbix_server.init	2014-06-26 15:55:32 UTC (rev 121474)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init	2014-06-26 16:03:36 UTC (rev 121475)
@@ -8,7 +8,7 @@
         ;;
 
     stop)
-        echo -n "Shutting down zabbix_server"
+        echo "Shutting down zabbix_server"
         pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
         /bin/kill $pid
         rm /tmp/zabbix_server.pid

Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql
===================================================================
--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql	2014-06-26 15:55:32 UTC (rev 121474)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init.mysql	2014-06-26 16:03:36 UTC (rev 121475)
@@ -2,14 +2,24 @@
 
 case "$1" in
     start)
-        echo -n "Zabbix_server - waiting for SQL server to start."
-        while [ ! -e __PREFIX__/var/run/__VER__/mysqld.sock ]; do sleep 5; echo -n .; done
-        echo " SQL server online; starting zabbix_server."
-        sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server -c __PREFIX__/etc/zabbix/zabbix_server.conf
+        MAX_WAIT=120
+        echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
+        while [ ! -e __PREFIX__/var/run/__VER__/mysqld.sock ]; do
+            if [ ${MAX_WAIT} -le 0 ]; then
+              echo "Tired of waiting. Try again after starting __VER__."
+              exit 1
+            fi
+            sleep 5
+            let MAX_WAIT=MAX_WAIT-5
+            echo .
+        done
+        echo "SQL server online; starting zabbix_server."
+        sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server \
+             -c __PREFIX__/etc/zabbix/zabbix_server.conf
         ;;
 
     stop)
-        echo -n "Shutting down zabbix_server"
+        echo "Shutting down zabbix_server"
         pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
         /bin/kill $pid
         rm /tmp/zabbix_server.pid

    

eborisch＠macports.org

tags

participants (1)