<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6713e30c3d3ef0263a025c289cf796470c2524b5">https://github.com/macports/macports-ports/commit/6713e30c3d3ef0263a025c289cf796470c2524b5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6713e30 zabbix3[-agent]: Update to latest
</span>6713e30 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6713e30c3d3ef0263a025c289cf796470c2524b5
</span>Author: Eric A. Borisch <borisch.eric@mayo.edu>
AuthorDate: Thu Sep 13 14:21:57 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> zabbix3[-agent]: Update to latest
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also improve zabbix3 shutdown wrapper.
</span>---
net/zabbix3/Portfile | 46 +++++++++++++++----------
net/zabbix3/files/log_and_pid_locations.patch | 13 ++++---
net/zabbix3/files/zabbix_server.init | 27 ---------------
net/zabbix3/files/zabbix_server.init.mysql | 49 ---------------------------
4 files changed, 34 insertions(+), 101 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/Portfile b/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f694ce..a58cda5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span> PortSystem 1.0
name zabbix3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.13
</span> revision 0
categories net
maintainers {eborisch @eborisch} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ dist_subdir zabbix3
</span> conflicts zabbix zabbix2
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2c4ea60efa8645f0d8fa479b266fe7ca85931a21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17300622
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bb250db84163a34093328147447c9dc75c95d04b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 115b70acc78954aac4da0a91012645a216ee4296a7b538b60c2198cc04b905bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17507365
</span>
patchfiles log_and_pid_locations.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ configure.args --bindir=${prefix}/bin/zabbix \
</span> --sbindir=${prefix}/sbin/zabbix \
--libexecdir=${prefix}/libexec/zabbix \
--datadir=${prefix}/share/zabbix \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --sysconfdir=${prefix}/etc/zabbix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sysconfdir=${prefix}/etc/zabbix3 \
</span> --localstatedir=${prefix}/var/zabbix \
--with-gnutls=${prefix} \
--enable-ipv6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +71,11 @@ if { ${name} ne ${subport} } {
</span> startupitem.logfile ${prefix}/var/log/zabbix/zabbix_agentd.launch
configure.args-append --enable-agent
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/zabbix3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/zabbix3
</span> } else {
depends_lib-append port:curl \
port:libssh2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,11 +94,19 @@ if { ${name} ne ${subport} } {
</span> --with-libxml2=${prefix}/bin/xml2-config
startupitem.name zabbix3-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.executable \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/sbin/zabbix/zabbix_server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -c ${prefix}/etc/zabbix3/zabbix_server.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.pidfile auto ${prefix}/var/run/zabbix/zabbix_server.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.logfile ${prefix}/var/log/zabbix/zabbix_agentd.launch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.start ${prefix}/sbin/zabbix/zabbix_server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pidfile ${prefix}/var/run/zabbix/zabbix_server.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Gracefully wait up to two minutes for zabbix to shut down / clean up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.stop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "let x=120; while /usr/bin/pkill -u zabbix -F ${pidfile}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do sleep 1; let x--; \[ \$x -le 0 \] && break; done"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.logfile ${prefix}/var/log/zabbix/zabbix_server.launch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.netchange yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/zabbix3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/zabbix3
</span>
foreach php {php56 php70 php71} {
variant ${php} description "Use ${php}" "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,7 +237,8 @@ post-destroot {
</span> if { ${name} ne ${subport} } {
####### AGENT #######
# Copy sample agent .conf files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/etc/zabbix ${destroot}${prefix}/etc/zabbix3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.d
</span> xinstall -m 755 ${worksrcpath}/conf/zabbix_agentd.conf \
${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.sample
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,15 +247,12 @@ post-destroot {
</span> } else {
####### SERVER #######
# Copy sample server and agent .conf files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/etc/zabbix ${destroot}${prefix}/etc/zabbix3
</span> xinstall -m 755 -d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/zabbix3/zabbix_server.conf.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/conf/zabbix_server.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.d
</span>
# Don't overwrite user settings on each install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.sample
</span>
# Copy database data and schemas
xinstall -m 755 -d ${destroot}${prefix}/share/zabbix/scripts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,7 +282,6 @@ post-destroot {
</span> foreach dname {run log} {
xinstall -d -m 755 ${destroot}${prefix}/var/${dname}/zabbix
system "chown -R zabbix:zabbix ${destroot}${prefix}/var/${dname}/zabbix"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- touch ${destroot}${prefix}/var/${dname}/zabbix/.dropping.${subport}
</span> }
system "chown -R zabbix:zabbix ${destroot}${prefix}/etc/zabbix3"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/files/log_and_pid_locations.patch b/net/zabbix3/files/log_and_pid_locations.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d12ee5..f30be0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/files/log_and_pid_locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix3/files/log_and_pid_locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,24 +22,23 @@
</span> # Maximum size of log file in MB.
--- conf/zabbix_server.conf.orig 2016-02-16 14:04:00.000000000 -0600
+++ conf/zabbix_server.conf 2016-02-16 14:08:34.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span> # Default:
# LogFile=
-LogFile=/tmp/zabbix_server.log
+LogFile=%%PREFIX%%/var/log/zabbix/zabbix_server.log
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# END MACPORTS CONFIG
</span>
### Option: LogFileSize
# Maximum size of log file in MB.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,6 +68,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,6 +67,10 @@
</span> # Default:
# PidFile=/tmp/zabbix_server.pid
+# MACPORTS CONFIG. PLEASE ONLY EDIT IF YOU KNOW WHAT YOU ARE DOING
+PidFile=%%PREFIX%%/var/run/zabbix/zabbix_server.pid
+# END MACPORTS CONFIG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### Option: DBHost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Database host name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If set to localhost, socket is used for MySQL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Option: SocketDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # IPC socket directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Directory to store IPC sockets used by internal Zabbix services.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/files/zabbix_server.init b/net/zabbix3/files/zabbix_server.init
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0775a79..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/files/zabbix_server.init
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case "$1" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "Starting zabbix_server - 60s start delay for SQL server to load during boot"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sleep 60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server -c __PREFIX__/etc/zabbix/zabbix_server.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stop)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Shutting down zabbix_server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/kill $pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm /tmp/zabbix_server.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- restart)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $0 stop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $0 start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/ps -ax |/usr/bin/grep zabbix_server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Usage: $0 {start|stop|restart|status}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/files/zabbix_server.init.mysql b/net/zabbix3/files/zabbix_server.init.mysql
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 06477e7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/files/zabbix_server.init.mysql
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case "$1" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# #### Wait for mysql server to start.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# MAX_WAIT=120
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# while [ ! -e __PREFIX__/var/run/__VER__/mysqld.sock ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# if [ ${MAX_WAIT} -le 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# echo "Tired of waiting. Try again after starting __VER__."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# sleep 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# let MAX_WAIT=MAX_WAIT-5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# echo .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#%# echo "SQL server online; starting zabbix_server."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -c __PREFIX__/etc/zabbix/zabbix_server.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stop)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Shutting down zabbix_server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pid=`ps -U zabbix | grep 'zabbix_server[^:]' | awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/kill $pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAX_WAIT=10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while [ `netstat -an | grep -q '\.10051. *LISTEN' && echo 1 || echo 0` \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- == "1" ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ${MAX_WAIT} -le 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Warning: a process is still using port 10051??"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sleep 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let MAX_WAIT=MAX_WAIT-5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm /tmp/zabbix_server.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- restart)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $0 stop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $0 start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/ps -ax |/usr/bin/grep zabbix_server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Usage: $0 {start|stop|restart|status}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>