The following diff updates zabbix to 4.0.4.
Release notes: https://www.zabbix.com/rn/rn4.0.4
I'm running this for few days now w/o any issues (amd64).
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile 12 Dec 2018 13:34:31 -0000 1.156
+++ Makefile 7 Feb 2019 09:14:10 -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.4
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 = 0
-REVISION-web = 0
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 7 Feb 2019 09:14:10 -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.4.tar.gz) = +OUFWeJQ3C5zKRmptS1ikibStELOm+k9OrIIbdJvPBk=
+SIZE (zabbix-4.0.4.tar.gz) = 18045463
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 7 Feb 2019 09:14:10 -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 7 Feb 2019 09:14:10 -0000
@@ -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"
+@@ -12512,12 +12513,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 7 Feb 2019 09:14:10 -0000
@@ -36,7 +36,17 @@ Index: src/libs/zbxcrypto/tls.c
static void OPENSSL_cleanup(void)
{
-@@ -1419,6 +1422,7 @@ static unsigned int zbx_psk_client_cb(SSL *ssl,
const
+@@ -229,7 +232,9 @@ ZBX_THREAD_LOCAL static size_t
psk_len_for_cb = 0;
+ static int init_done = 0;
+ /* variables for capturing PSK identity from server callback function */
+ ZBX_THREAD_LOCAL static int incoming_connection_has_psk = 0;
++#ifndef OPENSSL_NO_PSK
+ ZBX_THREAD_LOCAL static char
incoming_connection_psk_id[PSK_MAX_IDENTITY_LEN + 1];
++#endif
+ /* buffer for messages produced by zbx_openssl_info_cb() */
+ ZBX_THREAD_LOCAL char info_buf[256];
+ #endif
+@@ -1442,6 +1447,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)
{
@@ -44,16 +54,15 @@ Index: src/libs/zbxcrypto/tls.c
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 */
+@@ -1509,6 +1515,7 @@ static unsigned int zbx_psk_server_cb(SSL *ssl,
const
}
--
+ fail:
+ incoming_connection_psk_id[0] = '\0';
+#endif /* !OPENSSL_NO_PSK */
return 0; /* PSK not found */
}
#endif
-@@ -3326,6 +3330,7 @@ void zbx_tls_init_child(void)
+@@ -3359,6 +3366,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)
{
@@ -61,7 +70,7 @@ Index: src/libs/zbxcrypto/tls.c
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)
+@@ -3370,6 +3378,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);
@@ -72,7 +81,7 @@ Index: src/libs/zbxcrypto/tls.c
}
/* 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)
+@@ -3420,6 +3432,7 @@ void zbx_tls_init_child(void)
if (NULL != ctx_psk)
{
@@ -80,7 +89,7 @@ Index: src/libs/zbxcrypto/tls.c
const char *ciphers;
SSL_CTX_set_info_callback(ctx_psk, zbx_openssl_info_cb);
-@@ -3417,6 +3427,7 @@ void zbx_tls_init_child(void)
+@@ -3458,6 +3471,7 @@ void zbx_tls_init_child(void)
}
zbx_log_ciphersuites(__function_name, "PSK", ctx_psk);
@@ -88,7 +97,7 @@ Index: src/libs/zbxcrypto/tls.c
}
if (NULL != ctx_all)
-@@ -3425,8 +3436,10 @@ void zbx_tls_init_child(void)
+@@ -3466,8 +3480,10 @@ void zbx_tls_init_child(void)
SSL_CTX_set_info_callback(ctx_all, zbx_openssl_info_cb);
@@ -99,14 +108,17 @@ Index: src/libs/zbxcrypto/tls.c
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
+@@ -5549,7 +5565,7 @@ 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);
+ ZBX_UNUSED(s);
+
+ /* SSL_get_psk_identity() is not used here. It works with TLS 1.2, */
+@@ -5561,6 +5577,8 @@ int zbx_tls_get_attr_psk(const zbx_socket_t *s,
zbx_tl
+ }
else
return FAIL;
+#elif defined(OPENSSL_NO_PSK)
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 7 Feb 2019 09:14:10 -0000
@@ -257,8 +257,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 +446,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
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
https://www.wrapped.cx
