net/zabbix 4.0.10

Again, new update to net/zabbix 4.0.10

Release notes: https://www.zabbix.com/rn/rn4.0.10

Running fine on amd64 (server, client)


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.157
diff -u -p -r1.157 Makefile
--- Makefile 25 Jun 2019 20:25:21 -0000 1.157
+++ Makefile 29 Jun 2019 12:10:14 -0000
@@ -5,7 +5,7 @@ COMMENT-server = network and application
COMMENT-proxy = network and application monitoring - proxy
COMMENT-web = network and application monitoring - web frontend

-VERSION = 4.0.0
+VERSION = 4.0.10
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -15,8 +15,6 @@ FULLPKGPATH-proxy = net/zabbix,-proxy
FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
-REVISION-main = 1
-REVISION-web = 1

MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

Index: distinfo
===================================================================
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo 26 Oct 2018 06:57:21 -0000 1.45
+++ distinfo 29 Jun 2019 12:10:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zabbix-4.0.0.tar.gz) = VnPhBhVhAq/4xngaiQ2mzt/Jdc8T2W2HSbTHEm9Ca8c=
-SIZE (zabbix-4.0.0.tar.gz) = 17984379
+SHA256 (zabbix-4.0.10.tar.gz) = ji1eJfoguz1KDuUrG/ffn9dhgNA3cKP8KdrYP/OoFtQ=
+SIZE (zabbix-4.0.10.tar.gz) = 17140053
Index: patches/patch-conf_zabbix_server_conf
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_server_conf,v
retrieving revision 1.10
diff -u -p -r1.10 patch-conf_zabbix_server_conf
--- patches/patch-conf_zabbix_server_conf 26 Oct 2018 06:57:21 -0000 1.10
+++ patches/patch-conf_zabbix_server_conf 29 Jun 2019 12:10:14 -0000
@@ -12,15 +12,15 @@ Index: conf/zabbix_server.conf

### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -124,6 +124,7 @@ DBUser=zabbix
+@@ -123,6 +123,7 @@ DBUser=zabbix
# Mandatory: no
# Default:
# DBSocket=
+DBSocket=/var/www/var/run/mysql/mysql.sock

### Option: DBPort
- # Database port when not using local socket. Ignored for SQLite.
-@@ -506,6 +507,7 @@ Timeout=4
+ # Database port when not using local socket.
+@@ -504,6 +505,7 @@ Timeout=4
# Mandatory: no
# Default:
# AlertScriptsPath=${datadir}/zabbix/alertscripts
@@ -28,7 +28,7 @@ Index: conf/zabbix_server.conf

### Option: ExternalScripts
# Full path to location of external scripts.
-@@ -523,6 +525,7 @@ Timeout=4
+@@ -521,6 +523,7 @@ Timeout=4
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@@ -36,7 +36,7 @@ Index: conf/zabbix_server.conf

### Option: Fping6Location
# Location of fping6.
-@@ -532,6 +535,7 @@ Timeout=4
+@@ -530,6 +533,7 @@ Timeout=4
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-configure,v
retrieving revision 1.23
diff -u -p -r1.23 patch-configure
--- patches/patch-configure 26 Oct 2018 06:57:21 -0000 1.23
+++ patches/patch-configure 29 Jun 2019 12:10:14 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.23 2018/10
Index: configure
--- configure.orig
+++ configure
-@@ -6326,6 +6326,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6527,6 +6527,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

#include <stdlib.h>
#include <sys/queue.h>
@@ -10,7 +10,7 @@ Index: configure
#include <sys/sensors.h>
int
main ()
-@@ -9244,7 +9245,7 @@ $as_echo "yes" >&6; }
+@@ -9455,7 +9456,7 @@ $as_echo "yes" >&6; }

JABBER_INCDIR="$IKSEMEL_CPPFLAGS"
JABBER_LIBDIR="$IKSEMEL_LDFLAGS"
@@ -19,7 +19,7 @@ Index: configure

fi
else
-@@ -9254,7 +9255,7 @@ $as_echo_n "checking for iksemel support... " >&6; }
+@@ -9465,7 +9466,7 @@ $as_echo_n "checking for iksemel support... " >&6; }
if test -f $_libiksemel_with/include/iksemel.h; then
JABBER_INCDIR="-I$_libiksemel_with/include"
JABBER_LIBDIR="-L$_libiksemel_with/lib"
@@ -28,7 +28,7 @@ Index: configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
-@@ -12500,12 +12501,12 @@ LIBS="$LIBS $ICONV_LIBS"
+@@ -12782,12 +12783,12 @@ LIBS="$LIBS $ICONV_LIBS"
RANLIB="ranlib"


Index: patches/patch-src_libs_zbxcrypto_tls_c
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxcrypto_tls_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libs_zbxcrypto_tls_c
--- patches/patch-src_libs_zbxcrypto_tls_c 12 Aug 2018 13:25:53 -0000 1.1
+++ patches/patch-src_libs_zbxcrypto_tls_c 29 Jun 2019 12:10:14 -0000
@@ -1,116 +0,0 @@
-$OpenBSD: patch-src_libs_zbxcrypto_tls_c,v 1.1 2018/08/12 13:25:53 jasper Exp $
-
-Fix build with LibreSSL:
-- prevent multiple definitions for various defines, but do use the
- provided OPENSSL_cleanup() function
-- LibreSSL doesn't support PSK, sprinkle OPENSSL_NO_PSK accordingly
-
-Based on https://support.zabbix.com/browse/ZBX-11803
-
-Index: src/libs/zbxcrypto/tls.c
---- src/libs/zbxcrypto/tls.c.orig
-+++ src/libs/zbxcrypto/tls.c
-@@ -57,7 +57,8 @@
- # define ZBX_TLS_CIPHERSUITE_ALL 2 /* select ciphersuites with certificate and PSK */
-