ok
On 01/07/19 10:19 +0200, Mark Patruck wrote:
> 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 */
> - #endif
> -
> --#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL /* for
> OpenSSL 1.0.1/1.0.2 (before 1.1.0) */
> -+/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (only
> OPENSSL_cleanup) */
> -+#if defined(HAVE_OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x1010000fL ||
> defined(LIBRESSL_VERSION_NUMBER))
> -
> - /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example
> in crypto/threads/mttest.c) */
> -
> -@@ -122,6 +123,7 @@ static void zbx_openssl_thread_cleanup(void)
> - }
> - #endif /* _WINDOWS */
> -
> -+#ifndef LIBRESSL_VERSION_NUMBER
> - #define OPENSSL_INIT_LOAD_SSL_STRINGS 0
> - #define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0
> - #define OPENSSL_VERSION SSLEAY_VERSION
> -@@ -144,6 +146,7 @@ static int OPENSSL_init_ssl(int opts, void
> *settings)
> - #endif
> - return 1;
> - }
> -+#endif /* !LIBRESSL_VERSION_NUMBER */
> -
> - static void OPENSSL_cleanup(void)
> - {
> -@@ -1419,6 +1422,7 @@ static unsigned int zbx_psk_client_cb(SSL *ssl,
> const
> - static unsigned int zbx_psk_server_cb(SSL *ssl, const char *identity,
> unsigned char *psk,
> - unsigned int max_psk_len)
> - {
> -+#ifndef OPENSSL_NO_PSK
> - const char *__function_name = "zbx_psk_server_cb";
> - char *psk_loc;
> - size_t psk_len = 0;
> -@@ -1481,7 +1485,7 @@ static unsigned int zbx_psk_server_cb(SSL *ssl,
> const
> -
> - return (unsigned int)psk_len; /* success */
> - }
> --
> -+#endif /* !OPENSSL_NO_PSK */
> - return 0; /* PSK not found */
> - }
> - #endif
> -@@ -3326,6 +3330,7 @@ void zbx_tls_init_child(void)
> - /* Load pre-shared key and identity to be used with the pre-shared
> key. */
> - if (NULL != CONFIG_TLS_PSK_FILE)
> - {
> -+#ifndef OPENSSL_NO_PSK
> - my_psk_identity = CONFIG_TLS_PSK_IDENTITY;
> - my_psk_identity_len = strlen(my_psk_identity);
> -
> -@@ -3337,6 +3342,10 @@ void zbx_tls_init_child(void)
> - zbx_read_psk_file();
> -
> - zabbix_log(LOG_LEVEL_DEBUG, "%s() loaded PSK from file \"%s\"",
> __function_name, CONFIG_TLS_PSK_FILE);
> -+#else
> -+ zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "PSK
> requested but Zabbix was built without PSK support");
> -+ goto out;
> -+#endif /* !OPENSSL_NO_PSK */
> - }
> -
> - /* set up PSK global variables for client callback if PSK comes only
> from configuration file or command line */
> -@@ -3387,6 +3396,7 @@ void zbx_tls_init_child(void)
> -
> - if (NULL != ctx_psk)
> - {
> -+#ifndef OPENSSL_NO_PSK
> - const char *ciphers;
> -
> - SSL_CTX_set_info_callback(ctx_psk, zbx_openssl_info_cb);
> -@@ -3417,6 +3427,7 @@ void zbx_tls_init_child(void)
> - }
> -
> - zbx_log_ciphersuites(__function_name, "PSK", ctx_psk);
> -+#endif /* !OPENSSL_NO_PSK */
> - }
> -
> - if (NULL != ctx_all)
> -@@ -3425,8 +3436,10 @@ void zbx_tls_init_child(void)
> -
> - SSL_CTX_set_info_callback(ctx_all, zbx_openssl_info_cb);
> -
> -+#ifndef OPENSSL_NO_PSK
> - if (0 != (program_type & (ZBX_PROGRAM_TYPE_SERVER |
> ZBX_PROGRAM_TYPE_PROXY | ZBX_PROGRAM_TYPE_AGENTD)))
> - SSL_CTX_set_psk_server_callback(ctx_all,
> zbx_psk_server_cb);
> -+#endif /* !OPENSSL_NO_PSK */
> -
> - SSL_CTX_set_mode(ctx_all, SSL_MODE_AUTO_RETRY);
> - SSL_CTX_set_options(ctx_all, SSL_OP_CIPHER_SERVER_PREFERENCE |
> SSL_OP_NO_TICKET);
> -@@ -5497,11 +5510,13 @@ int zbx_tls_get_attr_psk(const zbx_socket_t *s,
> zbx_tl
> - attr->psk_identity_len = strlen(attr->psk_identity);
> - else
> - return FAIL;
> --#elif defined(HAVE_OPENSSL)
> -+#elif defined(HAVE_OPENSSL) && !defined(OPENSSL_NO_PSK)
> - if (NULL != (attr->psk_identity =
> SSL_get_psk_identity(s->tls_ctx->ctx)))
> - attr->psk_identity_len = strlen(attr->psk_identity);
> - else
> - return FAIL;
> -+#elif defined(OPENSSL_NO_PSK)
> -+ return FAIL;
> - #endif
> -
> - return SUCCEED;
> Index: patches/patch-src_libs_zbxnix_daemon_c
> ===================================================================
> RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-src_libs_zbxnix_daemon_c
> --- patches/patch-src_libs_zbxnix_daemon_c 7 Jul 2016 18:47:33 -0000
> 1.12
> +++ patches/patch-src_libs_zbxnix_daemon_c 29 Jun 2019 12:10:14 -0000
> @@ -1,9 +1,10 @@
> $OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.12 2016/07/07 18:47:33 robert
> Exp $
> ---- src/libs/zbxnix/daemon.c.orig Wed May 18 14:59:36 2016
> -+++ src/libs/zbxnix/daemon.c Fri Jun 24 16:09:28 2016
> -@@ -307,7 +307,7 @@ int daemon_start(int allow_root, const char *user,
> uns
> - }
> -
> +Index: src/libs/zbxnix/daemon.c
> +--- src/libs/zbxnix/daemon.c.orig
> ++++ src/libs/zbxnix/daemon.c
> +@@ -301,7 +301,7 @@ int daemon_start(int allow_root, const char *user,
> uns
> + if (0 == allow_root && 0 == getuid()) /* running as root? */
> + {
> if (NULL == user)
> - user = "zabbix";
> + user = "_zabbix";
> Index: patches/patch-src_libs_zbxsysinfo_openbsd_net_c
> ===================================================================
> RCS file:
> /cvs/ports/net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_net_c,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-src_libs_zbxsysinfo_openbsd_net_c
> --- patches/patch-src_libs_zbxsysinfo_openbsd_net_c 26 Oct 2018 06:57:21
> -0000 1.8
> +++ patches/patch-src_libs_zbxsysinfo_openbsd_net_c 29 Jun 2019 12:10:14
> -0000
> @@ -5,15 +5,7 @@ Stop using struct ifnet and libkvm for i
> Index: src/libs/zbxsysinfo/openbsd/net.c
> --- src/libs/zbxsysinfo/openbsd/net.c.orig
> +++ src/libs/zbxsysinfo/openbsd/net.c
> -@@ -22,6 +22,7 @@
> - #include "zbxjson.h"
> - #include "log.h"
> -
> -+#include <sys/ioctl.h>
> - #include <sys/sockio.h>
> -
> - #if OpenBSD >= 201405 /* if OpenBSD 5.5 or newer */
> -@@ -35,7 +36,6 @@
> +@@ -36,7 +36,6 @@
>
> static struct nlist kernel_symbols[] =
> {
> @@ -21,7 +13,7 @@ Index: src/libs/zbxsysinfo/openbsd/net.c
> {"_tcbtable", N_UNDF, 0, 0, 0},
> {NULL, 0, 0, 0, 0}
> };
> -@@ -48,11 +48,6 @@ static int get_ifdata(const char *if_name,
> +@@ -49,11 +48,6 @@ static int get_ifdata(const char *if_name,
> zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t
> *terrors,
> zbx_uint64_t *icollisions, char **error)
> {
> @@ -33,7 +25,7 @@ Index: src/libs/zbxsysinfo/openbsd/net.c
> int ret = SYSINFO_RET_FAIL;
>
> if (NULL == if_name || '\0' == *if_name)
> -@@ -93,66 +88,7 @@ static int get_ifdata(const char *if_name,
> +@@ -94,66 +88,7 @@ static int get_ifdata(const char *if_name,
> if (icollisions)
> *icollisions = 0;
>
> Index: pkg/PLIST-web
> ===================================================================
> RCS file: /cvs/ports/net/zabbix/pkg/PLIST-web,v
> retrieving revision 1.35
> diff -u -p -r1.35 PLIST-web
> --- pkg/PLIST-web 26 Oct 2018 06:57:21 -0000 1.35
> +++ pkg/PLIST-web 29 Jun 2019 12:10:14 -0000
> @@ -47,6 +47,7 @@ zabbix/app/controllers/CControllerMediat
> zabbix/app/controllers/CControllerMediatypeEnable.php
> zabbix/app/controllers/CControllerMediatypeList.php
> zabbix/app/controllers/CControllerMediatypeUpdate.php
> +zabbix/app/controllers/CControllerMenuPopup.php
> zabbix/app/controllers/CControllerPopupGeneric.php
> zabbix/app/controllers/CControllerPopupHttpStep.php
> zabbix/app/controllers/CControllerPopupMedia.php
> @@ -153,7 +154,6 @@ zabbix/app/views/monitoring.widget.trigo
> zabbix/app/views/monitoring.widget.url.view.php
> zabbix/app/views/monitoring.widget.web.view.php
> zabbix/app/views/popup.generic.php
> -zabbix/app/views/popup.httpstep.js.php
> zabbix/app/views/popup.httpstep.php
> zabbix/app/views/popup.media.js.php
> zabbix/app/views/popup.media.php
> @@ -168,6 +168,23 @@ zabbix/app/views/report.services.php
> zabbix/app/views/report.status.php
> zabbix/app/views/system.warning.php
> zabbix/applications.php
> +zabbix/assets/
> +zabbix/assets/fonts/
> +zabbix/assets/fonts/DejaVuSans.ttf
> +zabbix/assets/img/
> +zabbix/assets/img/apple-touch-icon-120x120-precomposed.png
> +zabbix/assets/img/apple-touch-icon-152x152-precomposed.png
> +zabbix/assets/img/apple-touch-icon-180x180-precomposed.png
> +zabbix/assets/img/apple-touch-icon-76x76-precomposed.png
> +zabbix/assets/img/browser-sprite.png
> +zabbix/assets/img/icon-sprite.svg
> +zabbix/assets/img/ms-tile-144x144.png
> +zabbix/assets/img/touch-icon-192x192.png
> +zabbix/assets/styles/
> +zabbix/assets/styles/blue-theme.css
> +zabbix/assets/styles/dark-theme.css
> +zabbix/assets/styles/hc-dark.css
> +zabbix/assets/styles/hc-light.css
> zabbix/audio/
> zabbix/audio/alarm_average.wav
> zabbix/audio/alarm_disaster.wav
> @@ -203,8 +220,6 @@ zabbix/correlation.php
> zabbix/disc_prototypes.php
> zabbix/discoveryconf.php
> zabbix/favicon.ico
> -zabbix/fonts/
> -zabbix/fonts/DejaVuSans.ttf
> zabbix/graphs.php
> zabbix/history.php
> zabbix/host_discovery.php
> @@ -217,26 +232,6 @@ zabbix/hosts.php
> zabbix/httpconf.php
> zabbix/httpdetails.php
> zabbix/image.php
> -zabbix/images/
> -zabbix/images/general/
> -zabbix/images/general/arrow_down.png
> -zabbix/images/general/arrow_up.png
> -zabbix/images/general/no_icon.png
> -zabbix/images/general/tr_space.gif
> -zabbix/images/general/tr_top_bottom.gif
> -zabbix/images/general/tr_top_right.gif
> -zabbix/images/general/tr_top_right_bottom.gif
> -zabbix/images/general/tree/
> -zabbix/images/general/tree/zero.gif
> -zabbix/img/
> -zabbix/img/apple-touch-icon-120x120-precomposed.png
> -zabbix/img/apple-touch-icon-152x152-precomposed.png
> -zabbix/img/apple-touch-icon-180x180-precomposed.png
> -zabbix/img/apple-touch-icon-76x76-precomposed.png
> -zabbix/img/browser-sprite.png
> -zabbix/img/icon-sprite.svg
> -zabbix/img/ms-tile-144x144.png
> -zabbix/img/touch-icon-192x192.png
> zabbix/imgstore.php
> zabbix/include/
> zabbix/include/.htaccess
> @@ -257,8 +252,14 @@ zabbix/include/classes/api/clients/CApiC
> zabbix/include/classes/api/clients/CLocalApiClient.php
> zabbix/include/classes/api/managers/
> zabbix/include/classes/api/managers/CApplicationManager.php
> +zabbix/include/classes/api/managers/CGraphManager.php
> +zabbix/include/classes/api/managers/CGraphPrototypeManager.php
> zabbix/include/classes/api/managers/CHistoryManager.php
> zabbix/include/classes/api/managers/CHttpTestManager.php
> +zabbix/include/classes/api/managers/CItemManager.php
> +zabbix/include/classes/api/managers/CItemPrototypeManager.php
> +zabbix/include/classes/api/managers/CTriggerManager.php
> +zabbix/include/classes/api/managers/CTriggerPrototypeManager.php
> zabbix/include/classes/api/services/
> zabbix/include/classes/api/services/CAPIInfo.php
> zabbix/include/classes/api/services/CAction.php
> @@ -440,6 +441,7 @@ zabbix/include/classes/html/svg/CSvgGrap
> zabbix/include/classes/html/svg/CSvgGraphGrid.php
> zabbix/include/classes/html/svg/CSvgGraphLegend.php
> zabbix/include/classes/html/svg/CSvgGraphLine.php
> +zabbix/include/classes/html/svg/CSvgGraphLineGroup.php
> zabbix/include/classes/html/svg/CSvgGraphPoints.php
> zabbix/include/classes/html/svg/CSvgGroup.php
> zabbix/include/classes/html/svg/CSvgLine.php
> @@ -631,6 +633,7 @@ zabbix/include/classes/widgets/CWidgetCo
> zabbix/include/classes/widgets/CWidgetHelper.php
> zabbix/include/classes/widgets/fields/
> zabbix/include/classes/widgets/fields/CWidgetField.php
> +zabbix/include/classes/widgets/fields/CWidgetFieldApplication.php
> zabbix/include/classes/widgets/fields/CWidgetFieldCheckBox.php
> zabbix/include/classes/widgets/fields/CWidgetFieldComboBox.php
> zabbix/include/classes/widgets/fields/CWidgetFieldDatePicker.php
> @@ -812,6 +815,7 @@ zabbix/include/views/js/common.init.js.p
> zabbix/include/views/js/common.item.edit.js.php
> zabbix/include/views/js/conf.import.js.php
> zabbix/include/views/js/configuration.action.edit.js.php
> +zabbix/include/views/js/configuration.copy.elements.js.php
> zabbix/include/views/js/configuration.correlation.edit.js.php
> zabbix/include/views/js/configuration.discovery.edit.js.php
> zabbix/include/views/js/configuration.graph.edit.js.php
> @@ -1068,11 +1072,6 @@ zabbix/setup.php
> zabbix/slideconf.php
> zabbix/slides.php
> zabbix/srv_status.php
> -zabbix/styles/
> -zabbix/styles/blue-theme.css
> -zabbix/styles/dark-theme.css
> -zabbix/styles/hc-dark.css
> -zabbix/styles/hc-light.css
> zabbix/sysmap.php
> zabbix/sysmaps.php
> zabbix/templates.php
>
>
> --
> Mark Patruck ( mark at wrapped.cx )
> GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
>
> https://www.wrapped.cx
>
