<!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>[127133] 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/127133">127133</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2014-10-21 14:02:05 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>zabbix2: Update to 2.4.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetzabbix2Portfile">trunk/dports/net/zabbix2/Portfile</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 (127132 => 127133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/zabbix2/Portfile        2014-10-21 20:27:34 UTC (rev 127132)
+++ trunk/dports/net/zabbix2/Portfile        2014-10-21 21:02:05 UTC (rev 127133)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name zabbix2
</span><del>-version 2.2.5
</del><ins>+version 2.4.1
</ins><span class="cx"> revision 0
</span><span class="cx"> categories net
</span><span class="cx"> maintainers eborisch openmaintainer
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> dist_subdir zabbix2
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 118474370cc1683205f2fb8f882a8a5e997b9656 \
- sha256 1e33f54d4accc5b6a0dccf4a308d27dc82de245567dffef823f9add9fa7d81b5
</del><ins>+ rmd160 29a8c317abd05a3b1bcc1f6392a604ce4e142e7b \
+ sha256 e47b328c2babcc7c37b27c96732b5f6ac28a935901acf8a3d340887ba64bece4
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -65,11 +65,12 @@
</span><span class="cx"> port:libssh2 \
</span><span class="cx"> port:net-snmp \
</span><span class="cx"> port:OpenIPMI \
</span><del>- port:php5 \
- port:php5-gd \
- port:php5-gettext \
- port:php5-mbstring \
- port:php5-sockets
</del><ins>+ port:php53 \
+ port:php53-apache2handler \
+ port:php53-gd \
+ port:php53-gettext \
+ port:php53-mbstring \
+ port:php53-sockets
</ins><span class="cx">
</span><span class="cx"> configure.args-append --enable-server \
</span><span class="cx"> --with-libcurl=${prefix}/bin/curl-config \
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx"> Adds dependencies a complete server are installed.
</span><span class="cx"> } {
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # Items are "display name" "port name" "config arg" "php interface"
</span><span class="cx"> array set DBLIST {
</span><span class="cx"> mysql5 {"MySQL 5.x" mysql5 \
</span><span class="lines">@@ -132,7 +133,7 @@
</span><span class="cx"> depends_lib-append port:[lindex ${prms} 1]
</span><span class="cx"> configure.args-append --with-[lindex ${prms} 2]
</span><span class="cx"> depends_run-append \
</span><del>- port:php5-[lindex ${prms} 3]
</del><ins>+ port:php53-[lindex ${prms} 3]
</ins><span class="cx">
</span><span class="cx"> if {[string compare ${dbitem} sqlite3] && \
</span><span class="cx"> [variant_isset full_server]} {
</span><span class="lines">@@ -154,7 +155,7 @@
</span><span class="cx"> ![variant_isset pgsql83] &&
</span><span class="cx"> ![variant_isset pgsql84] &&
</span><span class="cx"> ![variant_isset sqlite3]} {
</span><del>- default_variants +mysql5
</del><ins>+ default_variants +mysql5
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Notify anyone with +agent_only installed of new zabbix2-agent port
</span><span class="lines">@@ -301,7 +302,7 @@
</span><span class="cx"> 2) Setup the ZABBIX MySQL database
</span><span class="cx">
</span><span class="cx"> For other databases, follow documentation from
</span><del>- https://www.zabbix.com/documentation/2.0/manual/appendix/install/db_scripts
</del><ins>+ https://www.zabbix.com/documentation/2.4/manual/appendix/install/db_scripts
</ins><span class="cx">
</span><span class="cx"> -Create the ZABBIX database
</span><span class="cx"> mysql5 -u root -p (enter password at prompt)
</span></span></pre></div>
<a id="trunkdportsnetzabbix2fileszabbix_serverinitmysql"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql (127132 => 127133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql        2014-10-21 20:27:34 UTC (rev 127132)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init.mysql        2014-10-21 21:02:05 UTC (rev 127133)
</span><span class="lines">@@ -2,12 +2,12 @@
</span><span class="cx">
</span><span class="cx"> case "$1" in
</span><span class="cx"> start)
</span><ins>+ echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
</ins><span class="cx"> MAX_WAIT=120
</span><del>- echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
</del><span class="cx"> while [ ! -e __PREFIX__/var/run/__VER__/mysqld.sock ]; do
</span><span class="cx"> if [ ${MAX_WAIT} -le 0 ]; then
</span><del>- echo "Tired of waiting. Try again after starting __VER__."
- exit 1
</del><ins>+ echo "Tired of waiting. Try again after starting __VER__."
+ exit 1
</ins><span class="cx"> fi
</span><span class="cx"> sleep 5
</span><span class="cx"> let MAX_WAIT=MAX_WAIT-5
</span><span class="lines">@@ -20,8 +20,18 @@
</span><span class="cx">
</span><span class="cx"> stop)
</span><span class="cx"> echo "Shutting down zabbix_server"
</span><del>- pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
- /bin/kill $pid
</del><ins>+ pid=`ps -U zabbix | grep 'zabbix_server[^:]' | awk '{print $1}'`
+ bin/kill $pid
+ MAX_WAIT=10
+ while [ `netstat -an | grep -q '\.10051. *LISTEN' && echo 1 || echo 0` \
+ == "1" ]; do
+ if [ ${MAX_WAIT} -le 0 ]; then
+ echo "Warning: a process is still using port 10051??"
+ exit 1
+ fi
+ sleep 5
+ let MAX_WAIT=MAX_WAIT-5
+ done
</ins><span class="cx"> rm /tmp/zabbix_server.pid
</span><span class="cx"> ;;
</span><span class="cx"> restart)
</span></span></pre>
</div>
</div>
</body>
</html>