<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d08d0de98dd71a6ec78b404c794bcb64736d64f5">https://github.com/macports/macports-ports/commit/d08d0de98dd71a6ec78b404c794bcb64736d64f5</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 d08d0de98dd zabbix[45]: Update to latest; fix --nitpick (#11573)
</span>d08d0de98dd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d08d0de98dd71a6ec78b404c794bcb64736d64f5
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Mon Jul 12 14:40:20 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> zabbix[45]: Update to latest; fix --nitpick (#11573)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also adds setting of shared memory variables as part of 'load'
</span><span style='display:block; white-space:pre;color:#404040;'> process, rather than relying on /etc/sysctl.conf
</span>---
net/zabbix4/Portfile | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 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 79a51dee819..7b5c1908668 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;'>@@ -1,4 +1,5 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,13 +18,13 @@ long_description Zabbix is the ultimate open source availability and \
</span> performance monitoring solution. Zabbix offers advanced \
monitoring, alerting, and visualization features today \
which are missing in other monitoring systems, even some \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- of the best commercial ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of the best commercial ones.
</span>
array set VERSIONS {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 4.0.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 4.0.32
</span> 42 4.2.8
44 4.4.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5 5.0.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 5.0.13
</span> }
set zver [regsub -all {[^\d]} ${subport} {}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,15 +45,16 @@ dist_subdir zabbix${zver}
</span> if {$zver == 4} {
livecheck.regex "zabbix-(4\\.0\\.\[0-9\]+).tar.gz"
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 78b4813461538f198c71437b176288a78704a7e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 90fb0d8f0c18e8f49e047f01b7cca9692680bb8285df33fe2c44f01c5418089e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17599032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cc24cbcf0d70891ac2cc00c96d2f5baa3997be77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05ae28e5495e3465f7e33f4e50fe1d1d4d981fbfbff698e733fd65a29a28f6aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17606713
</span> }
if {$zver == 42 || $zver == 44} {
# REMOVE JANUARY 2022
revision 1
PortGroup obsolete 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> replaced_by zabbix5
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +62,9 @@ if {$zver == 42 || $zver == 44} {
</span> if {$zver == 5} {
livecheck.regex "zabbix-(5\\.0\\.\[0-9\]+).tar.gz"
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ea00037d52e23f74c2104755933eb35c34a4dabd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 caf1f53ce0abb252b4edc5462ee8a2b0acf9b755e9731dd4000983cc11053077 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20350104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cd68fd239c96100a0c4eb895cfdc07026a9976e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7cd2b4d423261b452054728048c49d5aaa0ff26033c67c3ee0423f1048055165 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21076927
</span> }
patchfiles log_and_pid_locations.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +167,7 @@ if {[isFlavor agent ${subport}]} {
</span> destroot {}
} else {
long_description-append "This port provides the central server component."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append zabbix zabbix2 zabbix3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append zabbix3
</span>
depends_lib-append port:curl \
port:OpenIPMI \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,6 +198,11 @@ if {[isFlavor agent ${subport}]} {
</span> startupitem.logfile ${prefix}/var/log/zabbix/zabbix_server.launch
startupitem.netchange yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This *increases* the values if needed, but otherwise leaves them alone.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.init \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {bump() { [ `sysctl -n $1` -lt $2 ] && sysctl $1=$2 ; } } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "bump kern.sysv.shmall 32768 && bump kern.sysv.shmmax 134217728"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.keepdirs \
${destroot}${prefix}/etc/zabbix${zver}/zabbix_server.conf.d \
${destroot}${prefix}/var/run/zabbix${zver} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,7 +353,7 @@ post-destroot {
</span> #file copy ${worksrcpath}/upgrades \
# ${destroot}${prefix}/share/zabbix/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set permissions for etc (protect passwords)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set permissions for etc (protect passwords)
</span> system "chmod ug+rwX,o-rwx ${destroot}${prefix}/etc/zabbix${zver}/*"
system "chown -R zabbix:zabbix ${destroot}${prefix}/etc/zabbix${zver}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -417,6 +424,11 @@ if {[isFlavor agent ${subport}]} {
</span> ####
#### Begin ZABBIX${zver} local server installation section ####
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ !! LOADING ZABBIX${zver} WILL *INCREASE* THESE sysctl VALUES TO BE AT LEAST:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kern.sysv.shmall=32768 kern.sysv.shmmax=134217728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This can be adjusted in the file below, but resets after an upgrade:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/LaunchDaemons/org.macports.zabbix${zver}-server/zabbix${zver}-server.wrapper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> (Installing with +full_server will add all of the dependants; configuration
will still be required.)
</pre><pre style='margin:0'>
</pre>