pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix64-*: Update Zabbix to 6.4.3



Module Name:	pkgsrc-wip
Committed By:	Yuuki Enomoto <uki%e-yuuki.org@localhost>
Pushed By:	e-yuuki
Date:		Mon Jun 5 21:20:20 2023 +0900
Changeset:	5185ceb328d681cb049d3ad7b6452c17e360205e

Modified Files:
	zabbix64-agent/distinfo
	zabbix64-frontend/PLIST
	zabbix64-frontend/distinfo
	zabbix64-java/distinfo
	zabbix64-proxy/distinfo
	zabbix64-server/Makefile.common
	zabbix64-server/distinfo
Removed Files:
	zabbix64-server/patches/patch-src_zabbix__server_lld_lld__host.c

Log Message:
zabbix64-*: Update Zabbix to 6.4.3

Release Note: https://www.zabbix.com/rn/rn6.4.3

patch-src_zabbix__server_lld_lld__host.c has been removed because fixed in
https://support.zabbix.com/browse/ZBX-22713.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5185ceb328d681cb049d3ad7b6452c17e360205e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zabbix64-agent/distinfo                            |  6 +++---
 zabbix64-frontend/PLIST                            |  3 +--
 zabbix64-frontend/distinfo                         |  6 +++---
 zabbix64-java/distinfo                             |  6 +++---
 zabbix64-proxy/distinfo                            |  6 +++---
 zabbix64-server/Makefile.common                    |  2 +-
 zabbix64-server/distinfo                           |  9 ++++-----
 .../patch-src_zabbix__server_lld_lld__host.c       | 22 ----------------------
 8 files changed, 18 insertions(+), 42 deletions(-)

diffs:
diff --git a/zabbix64-agent/distinfo b/zabbix64-agent/distinfo
index eb08a0152d..431551db0b 100644
--- a/zabbix64-agent/distinfo
+++ b/zabbix64-agent/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.4.1.tar.gz) = 0ce1f7e9ad426b28f123b40cdd85e79b11255c77ca6090f344a1b02168a7b304
-SHA512 (zabbix-6.4.1.tar.gz) = 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
-Size (zabbix-6.4.1.tar.gz) = 43014634 bytes
+BLAKE2s (zabbix-6.4.3.tar.gz) = db39079eac938da2693e978a285a48771a67021111ebf3a658d65cc22e5e7453
+SHA512 (zabbix-6.4.3.tar.gz) = ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
+Size (zabbix-6.4.3.tar.gz) = 43369742 bytes
 SHA1 (patch-configure) = 269a0db811c184e687456db66aea6b34acecf441
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 6716568e78746c77c66e6a946c8b762037485752
 SHA1 (patch-src_libs_zbxsysinfo_simple_simple.c) = e7ac52ae48fca74112af81b20cf57249d61cec59
diff --git a/zabbix64-frontend/PLIST b/zabbix64-frontend/PLIST
index 58f9e42c10..bbf818eb7b 100644
--- a/zabbix64-frontend/PLIST
+++ b/zabbix64-frontend/PLIST
@@ -791,7 +791,6 @@ share/zabbix/include/classes/helpers/CElasticsearchHelper.php
 share/zabbix/include/classes/helpers/CEncryptHelper.php
 share/zabbix/include/classes/helpers/CHintBoxHelper.php
 share/zabbix/include/classes/helpers/CHousekeepingHelper.php
-share/zabbix/include/classes/helpers/CHtml.php
 share/zabbix/include/classes/helpers/CMaintenanceHelper.php
 share/zabbix/include/classes/helpers/CMapHelper.php
 share/zabbix/include/classes/helpers/CMathHelper.php
@@ -842,6 +841,7 @@ share/zabbix/include/classes/html/CFormGrid.php
 share/zabbix/include/classes/html/CFormList.php
 share/zabbix/include/classes/html/CHorList.php
 share/zabbix/include/classes/html/CHostAvailability.php
+share/zabbix/include/classes/html/CHtmlEntity.php
 share/zabbix/include/classes/html/CHtmlPage.php
 share/zabbix/include/classes/html/CHtmlPageHeader.php
 share/zabbix/include/classes/html/CIFrame.php
@@ -1274,7 +1274,6 @@ share/zabbix/items.php
 share/zabbix/js/browsers.js
 share/zabbix/js/chkbxrange.js
 share/zabbix/js/class.base-component.js
-share/zabbix/js/class.bbcode.js
 share/zabbix/js/class.browsertab.js
 share/zabbix/js/class.calendar.js
 share/zabbix/js/class.cdate.js
diff --git a/zabbix64-frontend/distinfo b/zabbix64-frontend/distinfo
index b40edda851..1864d4fbec 100644
--- a/zabbix64-frontend/distinfo
+++ b/zabbix64-frontend/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.4.1.tar.gz) = 0ce1f7e9ad426b28f123b40cdd85e79b11255c77ca6090f344a1b02168a7b304
-SHA512 (zabbix-6.4.1.tar.gz) = 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
-Size (zabbix-6.4.1.tar.gz) = 43014634 bytes
+BLAKE2s (zabbix-6.4.3.tar.gz) = db39079eac938da2693e978a285a48771a67021111ebf3a658d65cc22e5e7453
+SHA512 (zabbix-6.4.3.tar.gz) = ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
+Size (zabbix-6.4.3.tar.gz) = 43369742 bytes
diff --git a/zabbix64-java/distinfo b/zabbix64-java/distinfo
index 7e9d5e642c..dfb8277c0c 100644
--- a/zabbix64-java/distinfo
+++ b/zabbix64-java/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.4.1.tar.gz) = 0ce1f7e9ad426b28f123b40cdd85e79b11255c77ca6090f344a1b02168a7b304
-SHA512 (zabbix-6.4.1.tar.gz) = 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
-Size (zabbix-6.4.1.tar.gz) = 43014634 bytes
+BLAKE2s (zabbix-6.4.3.tar.gz) = db39079eac938da2693e978a285a48771a67021111ebf3a658d65cc22e5e7453
+SHA512 (zabbix-6.4.3.tar.gz) = ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
+Size (zabbix-6.4.3.tar.gz) = 43369742 bytes
 SHA1 (patch-configure) = b9f58834d840d24e26ccd2a6b87000c401423c75
diff --git a/zabbix64-proxy/distinfo b/zabbix64-proxy/distinfo
index 0cedab9d36..694e79521d 100644
--- a/zabbix64-proxy/distinfo
+++ b/zabbix64-proxy/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.4.1.tar.gz) = 0ce1f7e9ad426b28f123b40cdd85e79b11255c77ca6090f344a1b02168a7b304
-SHA512 (zabbix-6.4.1.tar.gz) = 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
-Size (zabbix-6.4.1.tar.gz) = 43014634 bytes
+BLAKE2s (zabbix-6.4.3.tar.gz) = db39079eac938da2693e978a285a48771a67021111ebf3a658d65cc22e5e7453
+SHA512 (zabbix-6.4.3.tar.gz) = ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
+Size (zabbix-6.4.3.tar.gz) = 43369742 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 6716568e78746c77c66e6a946c8b762037485752
diff --git a/zabbix64-server/Makefile.common b/zabbix64-server/Makefile.common
index 987d18cea2..d5b6a0037c 100644
--- a/zabbix64-server/Makefile.common
+++ b/zabbix64-server/Makefile.common
@@ -5,7 +5,7 @@
 # used by wip/zabbix64-frontend/Makefile
 # used by wip/zabbix64-java/Makefile
 
-DISTNAME=	zabbix-6.4.1
+DISTNAME=	zabbix-6.4.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/6.4/
 
diff --git a/zabbix64-server/distinfo b/zabbix64-server/distinfo
index bf69d8ecc2..dc48ee3097 100644
--- a/zabbix64-server/distinfo
+++ b/zabbix64-server/distinfo
@@ -1,10 +1,9 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.4.1.tar.gz) = 0ce1f7e9ad426b28f123b40cdd85e79b11255c77ca6090f344a1b02168a7b304
-SHA512 (zabbix-6.4.1.tar.gz) = 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
-Size (zabbix-6.4.1.tar.gz) = 43014634 bytes
+BLAKE2s (zabbix-6.4.3.tar.gz) = db39079eac938da2693e978a285a48771a67021111ebf3a658d65cc22e5e7453
+SHA512 (zabbix-6.4.3.tar.gz) = ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
+Size (zabbix-6.4.3.tar.gz) = 43369742 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
-SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 1ea7200307a95ae1dbc98db2ceacda5dcfe08828
+SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 6716568e78746c77c66e6a946c8b762037485752
 SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67
-SHA1 (patch-src_zabbix__server_lld_lld__host.c) = 7539f33eaab5c6f2029a50730935155a125411ab
diff --git a/zabbix64-server/patches/patch-src_zabbix__server_lld_lld__host.c b/zabbix64-server/patches/patch-src_zabbix__server_lld_lld__host.c
deleted file mode 100644
index 0fe041c266..0000000000
--- a/zabbix64-server/patches/patch-src_zabbix__server_lld_lld__host.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/zabbix_server/lld/lld_host.c.orig	2022-12-05 08:13:54.084488574 +0000
-+++ src/zabbix_server/lld/lld_host.c
-@@ -3899,7 +3899,7 @@ static int	lld_if_update_compare(const v
- 	return u1->diff_num - u2->diff_num;
- }
- 
--static zbx_uint64_t	popcount64(zbx_uint64_t mask)
-+static zbx_uint64_t	zbx_popcount64(zbx_uint64_t mask)
- {
- 	mask -= (mask >> 1) & __UINT64_C(0x5555555555555555);
- 	mask = (mask & __UINT64_C(0x3333333333333333)) + (mask >> 2 & __UINT64_C(0x3333333333333333));
-@@ -4002,7 +4002,7 @@ static void	lld_host_interfaces_make(zbx
- 			update->ifnew = ifnew;
- 			update->ifold = interfaces->values[j];
- 			update->flags = lld_interface_compare(update->ifold, update->ifnew);
--			update->diff_num = popcount64(update->flags);
-+			update->diff_num = zbx_popcount64(update->flags);
- 
- 			zbx_vector_if_update_append(&updates, update);
- 		}


Home | Main Index | Thread Index | Old Index