From ee08271a71585171d772620f5bb63f673367349c Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Mon, 3 Feb 2025 11:53:44 +0100 Subject: [PATCH] upstream zabbix is now able to cope with 2.17 timescaledb. --- glicid/packages/monitoring.scm | 4 +++- .../patches/glicid-zabbix-timescaledb-2.17.patch | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch diff --git a/glicid/packages/monitoring.scm b/glicid/packages/monitoring.scm index b6c503d..c2d1f9b 100644 --- a/glicid/packages/monitoring.scm +++ b/glicid/packages/monitoring.scm @@ -17,7 +17,9 @@ (method url-fetch) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 (base32 %zabbix-hash)) - (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch")) +;; YD upstream now able to cope with 2.17 timescaledb +;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch")) +;; (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") diff --git a/glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch b/glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch deleted file mode 100644 index 09071ee..0000000 --- a/glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/zbx_dbversion_constants.h b/include/zbx_dbversion_constants.h -index 9cfb80f..35145ae 100644 ---- a/include/zbx_dbversion_constants.h -+++ b/include/zbx_dbversion_constants.h -@@ -64,8 +64,8 @@ - #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001 - #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_STR "2.0.1" - #define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000 --#define ZBX_TIMESCALE_MAX_VERSION 21699 --#define ZBX_TIMESCALE_MAX_VERSION_STR "2.16" -+#define ZBX_TIMESCALE_MAX_VERSION 21799 -+#define ZBX_TIMESCALE_MAX_VERSION_STR "2.17" - #define ZBX_TIMESCALE_LICENSE_APACHE "apache" - #define ZBX_TIMESCALE_LICENSE_APACHE_STR "TimescaleDB Apache 2 Edition" - #define ZBX_TIMESCALE_LICENSE_COMMUNITY "timescale"