<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/920fb6496dca62f14bcb3eb72f9c9e2a0da95cf6">https://github.com/macports/macports-ports/commit/920fb6496dca62f14bcb3eb72f9c9e2a0da95cf6</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 920fb64 zabbix4: update to 4.0.8
</span>920fb64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 920fb6496dca62f14bcb3eb72f9c9e2a0da95cf6
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Wed May 29 15:32:31 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> zabbix4: update to 4.0.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add latest php variants.
</span>---
net/zabbix4/Portfile | 29 ++++++++++++++++++++---------
net/zabbix4/files/ZBX-15935.patch | 13 -------------
2 files changed, 20 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix4/Portfile b/net/zabbix4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de8536d..e8d8c6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name zabbix4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0.8
</span> revision 0
categories net
maintainers {eborisch @eborisch} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,12 +32,11 @@ master_sites \
</span> dist_subdir zabbix4
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6fa1b9eb6e4294f40c26348c9dd9ab8aa3296d79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c2eadece82865f281015dcd51fda8534d98ff3d80ded76b81368e528b87309e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17175571
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b54bb10e2baf3b319f397f4f6be1ca616494152e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 922e78eb56311908ca650d144cbfbe500fc2259c47fef828727d6de0616dea0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17125633
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles log_and_pid_locations.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZBX-15935.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles log_and_pid_locations.patch
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +88,7 @@ if { ${subport} eq "zabbix4-agent" } {
</span> variant nls description "Include translation files." {
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach php {php56 php70 php71} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach php {php56 php70 php71 php72 php73} {
</span> variant ${php} description "Use ${php}" "
depends_run-append port:${php} \
port:${php}-apache2handler \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,8 +100,10 @@ if { ${subport} eq "zabbix4-agent" } {
</span> }
if {![variant_isset php56] && ![variant_isset php70]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![variant_isset php71]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset php71]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset php72]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset php73]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +php73
</span> }
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,6 +216,16 @@ if { ${subport} ne "zabbix4-agent" } {
</span> depends_run-append \
port:php71-[lindex ${prms} 3]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset php72]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:php72-[lindex ${prms} 3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset php73]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:php73-[lindex ${prms} 3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
depends_lib-append port:[lindex ${prms} 1]
require_active_variants port:zabbix4-agent ${dbitem}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix4/files/ZBX-15935.patch b/net/zabbix4/files/ZBX-15935.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c015834..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix4/files/ZBX-15935.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/zabbix_server/ipmi/checks_ipmi.c.orig 2019-04-19 09:57:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/zabbix_server/ipmi/checks_ipmi.c 2019-04-19 09:58:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -783,6 +783,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start_time = zbx_time();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Newer OpenIPMI updates tv with remaining timeout, but this code relies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // on it *not* doing this. Get the same effect by re-setting the timeout.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tv.tv_sec = timeout;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tv.tv_usec = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res = os_hnd->perform_one_op(os_hnd, &tv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* perform_one_op() returns 0 on success, errno on failure (timeout means success) */
</span></pre><pre style='margin:0'>
</pre>