<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121475] trunk/dports/net/zabbix2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121475">121475</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2014-06-26 09:03:36 -0700 (Thu, 26 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>zabbix2[-agent]: Upgrade to 2.2.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetzabbix2Portfile">trunk/dports/net/zabbix2/Portfile</a></li>
<li><a href="#trunkdportsnetzabbix2fileszabbix_serverinit">trunk/dports/net/zabbix2/files/zabbix_server.init</a></li>
<li><a href="#trunkdportsnetzabbix2fileszabbix_serverinitmysql">trunk/dports/net/zabbix2/files/zabbix_server.init.mysql</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetzabbix2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix2/Portfile (121474 => 121475)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name zabbix2
</span><del>-version 2.2.1
</del><ins>+version 2.2.4
</ins><span class="cx"> revision 0
</span><span class="cx"> categories net
</span><del>-maintainers nomaintainer
</del><ins>+maintainers eborisch, openmaintainer
</ins><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> license GPL-2
</span><span class="lines">@@ -27,21 +27,18 @@
</span><span class="cx"> master_sites \
</span><span class="cx"> sourceforge:project/zabbix/ZABBIX%20Latest%20Stable/${version} \
</span><span class="cx"> sourceforge:project/zabbix/ZABBIX%20Release%20Candidates/${version}
</span><ins>+dist_subdir zabbix2
</ins><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 24cfecc6825245b8a3ae15c23ffe38236cd37cd4 \
- sha256 29c9e4cefb527bf929797b26a5a1d8a07c55675bfe6a86ff9ef8e46bd792c7fb
</del><ins>+ rmd160 fc6043a63975ecb3ba7757e3de52ba82f1978e3a \
+ sha256 33654ed8a74280a38ff89b9deba400e1305086bdf75815f8b76dd6129a9ec781
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-depends_lib port:OpenIPMI
-
</del><span class="cx"> conflicts zabbix
</span><span class="cx">
</span><del>-dist_subdir zabbix2
</del><ins>+subport zabbix2-agent {}
</ins><span class="cx">
</span><del>-subport zabbix2-agent {}
-
</del><span class="cx"> configure.args --bindir=${prefix}/bin/zabbix \
</span><span class="cx"> --sbindir=${prefix}/sbin/zabbix \
</span><span class="cx"> --libexecdir=${prefix}/libexec/zabbix \
</span><span class="lines">@@ -49,8 +46,6 @@
</span><span class="cx"> --sysconfdir=${prefix}/etc/zabbix \
</span><span class="cx"> --localstatedir=${prefix}/var/zabbix
</span><span class="cx">
</span><del>-configure.args-append --with-openipmi=${prefix}
-
</del><span class="cx"> configure.ldflags-append -lresolv
</span><span class="cx">
</span><span class="cx"> startupitem.create yes
</span><span class="lines">@@ -64,9 +59,12 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append --enable-agent
</span><span class="cx"> } else {
</span><del>- depends_lib-append port:fping \
</del><ins>+ depends_lib-append port:apache2 \
</ins><span class="cx"> port:curl \
</span><del>- port:apache2 \
</del><ins>+ port:fping \
+ port:libssh2 \
+ port:net-snmp \
+ port:OpenIPMI \
</ins><span class="cx"> port:php5 \
</span><span class="cx"> port:php5-gd \
</span><span class="cx"> port:php5-gettext \
</span><span class="lines">@@ -75,7 +73,9 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append --enable-server \
</span><span class="cx"> --with-libcurl=${prefix}/bin/curl-config \
</span><del>- --with-net-snmp
</del><ins>+ --with-net-snmp \
+ --with-openipmi=${prefix} \
+ --with-ssh2=${prefix}
</ins><span class="cx">
</span><span class="cx"> startupitem.name zabbix2-server
</span><span class="cx"> startupitem.start "${prefix}/share/zabbix/zabbix_server.init start"
</span><span class="lines">@@ -111,7 +111,9 @@
</span><span class="cx"> sqlite3 {"SQLite 3.x" sqlite3 \
</span><span class="cx"> sqlite3=${prefix} sqlite}
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> set DBLIST_KEYS [lsort [array names DBLIST]]
</span><ins>+
</ins><span class="cx"> foreach dbitem $DBLIST_KEYS {
</span><span class="cx"> set this_key [lsearch -exact $DBLIST_KEYS $dbitem]
</span><span class="cx"> set conf_list [lreplace $DBLIST_KEYS $this_key $this_key]
</span><span class="lines">@@ -165,7 +167,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant date_slash description {
</span><del>- Draw date/month rather than date.month on line graphs.
</del><ins>+ Draw month/day rather than day.month on line graphs.
</ins><span class="cx"> } {}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -179,7 +181,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset date_slash]} {
</span><del>- reinplace -E {s|[[:<:]]d\.m[[:>:]]|d/m|g} \
</del><ins>+ reinplace -E {s|[[:<:]]d\.m[[:>:]]|m/d|g} \
</ins><span class="cx"> frontends/php/include/classes/graphdraw/CLineGraphDraw.php
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -365,22 +367,22 @@
</span><span class="cx"> #### ####
</span><span class="cx">
</span><span class="cx">
</span><del>-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! 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 !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</del><ins>+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! 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 !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</ins><span class="cx"> "
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsnetzabbix2fileszabbix_serverinit"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix2/files/zabbix_server.init (121474 => 121475)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> ;;
</span><span class="cx">
</span><span class="cx"> stop)
</span><del>- echo -n "Shutting down zabbix_server"
</del><ins>+ echo "Shutting down zabbix_server"
</ins><span class="cx"> pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
</span><span class="cx"> /bin/kill $pid
</span><span class="cx"> rm /tmp/zabbix_server.pid
</span></span></pre></div>
<a id="trunkdportsnetzabbix2fileszabbix_serverinitmysql"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql (121474 => 121475)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,14 +2,24 @@
</span><span class="cx">
</span><span class="cx"> case "$1" in
</span><span class="cx"> start)
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> ;;
</span><span class="cx">
</span><span class="cx"> stop)
</span><del>- echo -n "Shutting down zabbix_server"
</del><ins>+ echo "Shutting down zabbix_server"
</ins><span class="cx"> pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
</span><span class="cx"> /bin/kill $pid
</span><span class="cx"> rm /tmp/zabbix_server.pid
</span></span></pre>
</div>
</div>
</body>
</html>