From 3b112a55bb2ae45a6a321316c61db4e01a0da671 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 18 Mar 2025 19:55:05 +0100
Subject: [PATCH 1/2] zabbix50: 5.0.41 -> 5.0.46

Fixes CVE-2024-36460, CVE-2024-22123, CVE-2024-22122, CVE-2024-22121 and CVE-2024-22114.

Changes:
https://www.zabbix.com/rn/rn5.0.46
https://www.zabbix.com/rn/rn5.0.45
https://www.zabbix.com/rn/rn5.0.44
https://www.zabbix.com/rn/rn5.0.43
https://www.zabbix.com/rn/rn5.0.42
---
 pkgs/servers/monitoring/zabbix/versions.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 3c7622bf6587..36c8ff67ad31 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -16,8 +16,8 @@ generic: {
   };
 
   v50 = generic {
-    version = "5.0.41";
-    hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58=";
-    vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc=";
+    version = "5.0.46";
+    hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4=";
+    vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0=";
   };
 }

From 0fe9b39091252452f1d2160b4b0cc5f56d578f48 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 18 Mar 2025 20:01:06 +0100
Subject: [PATCH 2/2] zabbix50.server: fix the build with GCC14

---
 pkgs/servers/monitoring/zabbix/server.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index d3edb9d1b733..c68e1bb44a0e 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -91,6 +91,10 @@ import ./versions.nix (
       ++ optional postgresqlSupport "--with-postgresql"
       ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}";
 
+    env.NIX_CFLAGS_COMPILE = lib.optionalString (
+      lib.versions.major version <= "5"
+    ) "-Wno-error=incompatible-pointer-types";
+
     prePatch = ''
       find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +
     '';