zabbix62-*: Update to Zabbix 6.2.6

[Yuuki Enomoto <uki%e-yuuki.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yuuki Enomoto <uki%e-yuuki.org@localhost>
Pushed By:	e-yuuki
Date:		Sat Dec 17 16:00:31 2022 +0900
Changeset:	873850077c10368f1b1395b3a235812a6362b98c

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

Log Message:
zabbix62-*: Update to Zabbix 6.2.6

Release note: https://www.zabbix.com/rn/rn6.2.6

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

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

diffstat:
 zabbix62-agent/distinfo                            |  6 +++---
 zabbix62-frontend/PLIST                            |  1 -
 zabbix62-frontend/distinfo                         |  6 +++---
 zabbix62-java/distinfo                             |  6 +++---
 zabbix62-proxy/distinfo                            |  6 +++---
 zabbix62-server/Makefile.common                    |  2 +-
 zabbix62-server/distinfo                           |  7 ++++---
 .../patch-src_zabbix__server_lld_lld__host.c       | 22 ++++++++++++++++++++++
 8 files changed, 39 insertions(+), 17 deletions(-)

diffs:
diff --git a/zabbix62-agent/distinfo b/zabbix62-agent/distinfo
index 49bb6f6693..bfa9d39ebb 100644
--- a/zabbix62-agent/distinfo
+++ b/zabbix62-agent/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.2.4.tar.gz) = 3e826b2c7052d711ae4992e542e2dffe468870e65032b7b16fd8844159894e13
-SHA512 (zabbix-6.2.4.tar.gz) = 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-Size (zabbix-6.2.4.tar.gz) = 40299367 bytes
+BLAKE2s (zabbix-6.2.6.tar.gz) = 432869930e307b4314ed9bd9d8e83720161b648c0682905c27cb11f8f8f8a402
+SHA512 (zabbix-6.2.6.tar.gz) = 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
+Size (zabbix-6.2.6.tar.gz) = 41038757 bytes
 SHA1 (patch-configure) = 661087a4a5342bbce494b5eac45c294f3412318e
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
 SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86
diff --git a/zabbix62-frontend/PLIST b/zabbix62-frontend/PLIST
index 762d167025..8d8860eb4f 100644
--- a/zabbix62-frontend/PLIST
+++ b/zabbix62-frontend/PLIST
@@ -854,7 +854,6 @@ share/zabbix/include/classes/html/CSelect.php
 share/zabbix/include/classes/html/CSelectOption.php
 share/zabbix/include/classes/html/CSelectOptionGroup.php
 share/zabbix/include/classes/html/CSeverity.php
-share/zabbix/include/classes/html/CSeverityCheckBoxList.php
 share/zabbix/include/classes/html/CSimpleButton.php
 share/zabbix/include/classes/html/CSortable.php
 share/zabbix/include/classes/html/CSpan.php
diff --git a/zabbix62-frontend/distinfo b/zabbix62-frontend/distinfo
index aefd309056..98067ccea1 100644
--- a/zabbix62-frontend/distinfo
+++ b/zabbix62-frontend/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.2.4.tar.gz) = 3e826b2c7052d711ae4992e542e2dffe468870e65032b7b16fd8844159894e13
-SHA512 (zabbix-6.2.4.tar.gz) = 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-Size (zabbix-6.2.4.tar.gz) = 40299367 bytes
+BLAKE2s (zabbix-6.2.6.tar.gz) = 432869930e307b4314ed9bd9d8e83720161b648c0682905c27cb11f8f8f8a402
+SHA512 (zabbix-6.2.6.tar.gz) = 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
+Size (zabbix-6.2.6.tar.gz) = 41038757 bytes
diff --git a/zabbix62-java/distinfo b/zabbix62-java/distinfo
index dafebeb86f..dd41f39f43 100644
--- a/zabbix62-java/distinfo
+++ b/zabbix62-java/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.2.4.tar.gz) = 3e826b2c7052d711ae4992e542e2dffe468870e65032b7b16fd8844159894e13
-SHA512 (zabbix-6.2.4.tar.gz) = 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-Size (zabbix-6.2.4.tar.gz) = 40299367 bytes
+BLAKE2s (zabbix-6.2.6.tar.gz) = 432869930e307b4314ed9bd9d8e83720161b648c0682905c27cb11f8f8f8a402
+SHA512 (zabbix-6.2.6.tar.gz) = 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
+Size (zabbix-6.2.6.tar.gz) = 41038757 bytes
 SHA1 (patch-configure) = b9f58834d840d24e26ccd2a6b87000c401423c75
diff --git a/zabbix62-proxy/distinfo b/zabbix62-proxy/distinfo
index bdbf2209e0..7b67fef6ac 100644
--- a/zabbix62-proxy/distinfo
+++ b/zabbix62-proxy/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.2.4.tar.gz) = 3e826b2c7052d711ae4992e542e2dffe468870e65032b7b16fd8844159894e13
-SHA512 (zabbix-6.2.4.tar.gz) = 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-Size (zabbix-6.2.4.tar.gz) = 40299367 bytes
+BLAKE2s (zabbix-6.2.6.tar.gz) = 432869930e307b4314ed9bd9d8e83720161b648c0682905c27cb11f8f8f8a402
+SHA512 (zabbix-6.2.6.tar.gz) = 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
+Size (zabbix-6.2.6.tar.gz) = 41038757 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
diff --git a/zabbix62-server/Makefile.common b/zabbix62-server/Makefile.common
index adcfc5d50b..181c4a65a9 100644
--- a/zabbix62-server/Makefile.common
+++ b/zabbix62-server/Makefile.common
@@ -5,7 +5,7 @@
 # used by wip/zabbix62-frontend/Makefile
 # used by wip/zabbix62-java/Makefile
 
-DISTNAME=	zabbix-6.2.4
+DISTNAME=	zabbix-6.2.6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/6.2/
 
diff --git a/zabbix62-server/distinfo b/zabbix62-server/distinfo
index afa7223a07..1f5f11ff6a 100644
--- a/zabbix62-server/distinfo
+++ b/zabbix62-server/distinfo
@@ -1,9 +1,10 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.2.4.tar.gz) = 3e826b2c7052d711ae4992e542e2dffe468870e65032b7b16fd8844159894e13
-SHA512 (zabbix-6.2.4.tar.gz) = 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-Size (zabbix-6.2.4.tar.gz) = 40299367 bytes
+BLAKE2s (zabbix-6.2.6.tar.gz) = 432869930e307b4314ed9bd9d8e83720161b648c0682905c27cb11f8f8f8a402
+SHA512 (zabbix-6.2.6.tar.gz) = 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
+Size (zabbix-6.2.6.tar.gz) = 41038757 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 0371a5cafe00d01f293a847105f7c501f443616c
 SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67
+SHA1 (patch-src_zabbix__server_lld_lld__host.c) = 7539f33eaab5c6f2029a50730935155a125411ab
diff --git a/zabbix62-server/patches/patch-src_zabbix__server_lld_lld__host.c b/zabbix62-server/patches/patch-src_zabbix__server_lld_lld__host.c
new file mode 100644
index 0000000000..0fe041c266
--- /dev/null
+++ b/zabbix62-server/patches/patch-src_zabbix__server_lld_lld__host.c
@@ -0,0 +1,22 @@
+$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);
+ 		}