GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

zabbix 6.0.35

Browse source
This commit is contained in:
Jean-François GUILLAUME 2024-11-06 11:43:41 +00:00
parent 77e8a91102
commit 9eebd3e0e0
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
glicid/packages/monitoring.scm
View file

@ -5,16 +5,19 @@
#:use-module ((gnu packages monitoring) #:prefix gnu:) #:use-module ((gnu packages monitoring) #:prefix gnu:)
#:use-module (guix download)) #:use-module (guix download))
(define %zabbix-version "6.0.35")
(define %zabbix-hash "0fw9s4gqmlqdv1b2xhdca91yb3k5nga9wqn2pnzm23c4fpky8nwk")
(define-public zabbix-agentd (define-public zabbix-agentd
(package (package
(inherit gnu:zabbix-agentd) (inherit gnu:zabbix-agentd)
(version "6.0.18") (version %zabbix-version)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "17mx8wp5l4dm3fjdnr8zmbrjgwx66b21jfjs7047g9a9glsqmr76")) (sha256 (base32 %zabbix-hash))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.11.patch")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
@ -24,13 +27,13 @@
(define-public zabbix-agent2 (define-public zabbix-agent2
(package (package
(inherit gnu:zabbix-agent2) (inherit gnu:zabbix-agent2)
(version "6.0.18") (version %zabbix-version)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "17mx8wp5l4dm3fjdnr8zmbrjgwx66b21jfjs7047g9a9glsqmr76")) (sha256 (base32 %zabbix-hash))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.11.patch")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
@ -40,15 +43,14 @@
(define-public zabbix-server (define-public zabbix-server
(package (package
(inherit gnu:zabbix-server) (inherit gnu:zabbix-server)
(version "6.0.18") (version %zabbix-version)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "17mx8wp5l4dm3fjdnr8zmbrjgwx66b21jfjs7047g9a9glsqmr76")) (sha256 (base32 %zabbix-hash))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.11.patch")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
(("/usr/sbin/fping6?") "/run/setuid-programs/fping"))))))) (("/usr/sbin/fping6?") "/run/setuid-programs/fping")))))))

15
glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch Normal file
View file

@ -0,0 +1,15 @@
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"