pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix60-*: Update to Zabbix 6.0.12

Module Name:	pkgsrc-wip
Committed By:	Yuuki Enomoto <uki%e-yuuki.org@localhost>
Pushed By:	e-yuuki
Date:		Sat Dec 17 15:59:57 2022 +0900
Changeset:	7bfba618f53beacee9ea08aee6d8b370993c6d3f

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

Log Message:
zabbix60-*: Update to Zabbix 6.0.12

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

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

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

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

diffs:
diff --git a/zabbix60-agent/distinfo b/zabbix60-agent/distinfo
index ee14ea52de..a2b3f3a971 100644
--- a/zabbix60-agent/distinfo
+++ b/zabbix60-agent/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.10.tar.gz) = e7c17905201fa60059cd43b2c6126a80135f1a5358c51f7b4b3261ab4851c9ba
-SHA512 (zabbix-6.0.10.tar.gz) = 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-Size (zabbix-6.0.10.tar.gz) = 39516402 bytes
+BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
+SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+Size (zabbix-6.0.12.tar.gz) = 40419443 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/zabbix60-frontend/PLIST b/zabbix60-frontend/PLIST
index 4eb282622f..a04758429f 100644
--- a/zabbix60-frontend/PLIST
+++ b/zabbix60-frontend/PLIST
@@ -818,7 +818,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/zabbix60-frontend/distinfo b/zabbix60-frontend/distinfo
index d14e4b6c6e..f01371ee07 100644
--- a/zabbix60-frontend/distinfo
+++ b/zabbix60-frontend/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.10.tar.gz) = e7c17905201fa60059cd43b2c6126a80135f1a5358c51f7b4b3261ab4851c9ba
-SHA512 (zabbix-6.0.10.tar.gz) = 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-Size (zabbix-6.0.10.tar.gz) = 39516402 bytes
+BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
+SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
diff --git a/zabbix60-java/distinfo b/zabbix60-java/distinfo
index 9801e72587..5061fccdfd 100644
--- a/zabbix60-java/distinfo
+++ b/zabbix60-java/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.10.tar.gz) = e7c17905201fa60059cd43b2c6126a80135f1a5358c51f7b4b3261ab4851c9ba
-SHA512 (zabbix-6.0.10.tar.gz) = 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-Size (zabbix-6.0.10.tar.gz) = 39516402 bytes
+BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
+SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+Size (zabbix-6.0.12.tar.gz) = 40419443 bytes
 SHA1 (patch-configure) = b9f58834d840d24e26ccd2a6b87000c401423c75
diff --git a/zabbix60-proxy/distinfo b/zabbix60-proxy/distinfo
index 542e78153f..224791aa4d 100644
--- a/zabbix60-proxy/distinfo
+++ b/zabbix60-proxy/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.10.tar.gz) = e7c17905201fa60059cd43b2c6126a80135f1a5358c51f7b4b3261ab4851c9ba
-SHA512 (zabbix-6.0.10.tar.gz) = 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-Size (zabbix-6.0.10.tar.gz) = 39516402 bytes
+BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
+SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+Size (zabbix-6.0.12.tar.gz) = 40419443 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/zabbix60-server/Makefile.common b/zabbix60-server/Makefile.common
index 6a2075770f..d7ec5dbdab 100644
--- a/zabbix60-server/Makefile.common
+++ b/zabbix60-server/Makefile.common
@@ -5,7 +5,7 @@
 # used by wip/zabbix60-frontend/Makefile
 # used by wip/zabbix60-java/Makefile
 
-DISTNAME=	zabbix-6.0.10
+DISTNAME=	zabbix-6.0.12
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/6.0/
 
diff --git a/zabbix60-server/distinfo b/zabbix60-server/distinfo
index 801eae6e0d..9980aa16fa 100644
--- a/zabbix60-server/distinfo
+++ b/zabbix60-server/distinfo
@@ -1,9 +1,10 @@
 $NetBSD$
 
-BLAKE2s (zabbix-6.0.10.tar.gz) = e7c17905201fa60059cd43b2c6126a80135f1a5358c51f7b4b3261ab4851c9ba
-SHA512 (zabbix-6.0.10.tar.gz) = 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-Size (zabbix-6.0.10.tar.gz) = 39516402 bytes
+BLAKE2s (zabbix-6.0.12.tar.gz) = 378fdca9d53532f64404d46043ac6a35761b9a7feb021b37fcfee4a7da465bac
+SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+Size (zabbix-6.0.12.tar.gz) = 40419443 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) = 60be1e1ab3128dcfb6d4ecdd63c9097a68aa8912
diff --git a/zabbix60-server/patches/patch-src_zabbix__server_lld_lld__host.c b/zabbix60-server/patches/patch-src_zabbix__server_lld_lld__host.c
new file mode 100644
index 0000000000..7cd207c21e
--- /dev/null
+++ b/zabbix60-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-17 06:40:38.036946574 +0000
++++ src/zabbix_server/lld/lld_host.c
+@@ -3882,7 +3882,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));
+@@ -3985,7 +3985,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